fix #133002

Original commit message from CVS:
fix #133002

diff --git a/ChangeLog b/ChangeLog
index 97e692c..0f9fab8 100644 (file)
--- 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 ccb301b..b9f4c65 100644 (file)
--- 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, [