summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-06-12 10:59:57 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-06-12 10:59:57 +0000
commit08a2ed3be025b3bc2524bde30d39a745b08e2ae1 (patch)
tree7acb342bf6dd2477e7d55bb4dbdd086e6135bcec
parentff6de28f39796eabe1eb145539184ecb0d101d34 (diff)
fix #133002
Original commit message from CVS: fix #133002
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac23
2 files changed, 19 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 97e692c09..0f9fab833 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-12 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * configure.ac:
+ add a header check for a dvdread header in dvdnav. Fixes #133002
+
2004-06-12 Zaheer Abbas Merali <zaheerabbas@merali.org>
* gst/tcp/gsttcpclientsink.c: (gst_tcpclientsink_init_send):
diff --git a/configure.ac b/configure.ac
index ccb301b5f..b9f4c6560 100644
--- a/configure.ac
+++ b/configure.ac
@@ -884,8 +884,13 @@ GST_CHECK_FEATURE(DVDNAV, [dvdnav library], dvdnavsrc, [
[[ "$DVDNAV_MICRO" -lt "7" ]]; then
AC_MSG_WARN([libdvdnav >= 0.1.7 is required, you have $DVDNAV_VERSION])
HAVE_DVDNAV="no"
- fi
fi
+ fi
+ dnl now check for dvdread/nav_print.h - see #133002
+ AC_CHECK_HEADER(dvdread/nav_print.h, , [
+ AC_MSG_WARN([header dvdread/nav_print.h from dvdread missing])
+ HAVE_DVDNAV="no"
+ ])
AS_SCRUB_INCLUDE(DVDNAV_CFLAGS)
])
@@ -1162,6 +1167,14 @@ GST_CHECK_FEATURE(LAME, [lame mp3 encoder library], lame, [
])
AC_SUBST(LAME_LIBS)
+dnl *** libcaca ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_LIBCACA, true)
+GST_CHECK_FEATURE(LIBCACA, [libcaca], libcaca, [
+ GST_CHECK_CONFIGPROG(LIBCACA, caca-config)
+ AC_SUBST(LIBCACA_CFLAGS)
+ AC_SUBST(LIBCACA_LIBS)
+])
+
dnl *** libcolorspace ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LCS, true)
GST_CHECK_FEATURE(LCS, Lcs, lcs, [
@@ -1178,14 +1191,6 @@ GST_CHECK_FEATURE(LIBDV, [libdv DV/video decoder], dvdec, [
AC_SUBST(LIBDV_LIBS)
])
-dnl *** libcaca ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_LIBCACA, true)
-GST_CHECK_FEATURE(LIBCACA, [libcaca], libcaca, [
- GST_CHECK_CONFIGPROG(LIBCACA, caca-config)
- AC_SUBST(LIBCACA_CFLAGS)
- AC_SUBST(LIBCACA_LIBS)
-])
-
dnl *** libfame ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBFAME, true)
GST_CHECK_FEATURE(LIBFAME, [libfame MPEG1/4 encoder], libfame, [