From 393039dbf092579847f43821fb694ac5789c56fb Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Wed, 10 Mar 2010 21:14:14 +0000
Subject: Make buildable with current (external) libdvdnav & libdvdread.

---
 m4/dvdnav.m4 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'm4')

diff --git a/m4/dvdnav.m4 b/m4/dvdnav.m4
index c15404168..a7f354b63 100644
--- a/m4/dvdnav.m4
+++ b/m4/dvdnav.m4
@@ -84,7 +84,7 @@ dnl checks the results of dvdnav-config to some extent
 dnl
       rm -f conf.dvdnavtest
       AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <dvdnav.h>
+#include <dvdnav/dvdnav.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -129,7 +129,7 @@ main ()
 ]])],[],[no_dvdnav=yes],[no_dvdnav=cc])
        if test "x$no_dvdnav" = xcc; then
          AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-#include <dvdnav.h>
+#include <dvdnav/dvdnav.h>
 #include <stdio.h>
 ]], [[ return 0; ]])],[no_dvdnav=''],[no_dvdnav=yes])
        fi
@@ -140,6 +140,8 @@ main ()
     if test "x$no_dvdnav" = x ; then
        AC_MSG_RESULT(yes)
        ifelse([$2], , :, [$2])
+       dnl nav_*.h seem to have been moved from dvdnav at some point?
+       AC_CHECK_HEADERS([dvdread/nav_types.h])
     else
       AC_MSG_RESULT(no)
       if test "$DVDNAV_CONFIG" = "no" ; then
@@ -155,7 +157,7 @@ main ()
           CFLAGS="$CFLAGS $DVDNAV_CFLAGS"
           LIBS="$LIBS $DVDNAV_LIBS"
           AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-#include <dvdnav.h>
+#include <dvdnav/dvdnav.h>
 #include <stdio.h>
 ]], [[ return 0; ]])],
         [ echo "*** The test program compiled, but did not run. This usually means"
-- 
cgit v1.2.3


From 841473467fd19e4fa4e255d9e17af526ecee5ac8 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sun, 14 Mar 2010 15:06:02 +0000
Subject: Silence use of xine-config when invoked from AM_PATH_XINE.

---
 m4/xine.m4 | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'm4')

diff --git a/m4/xine.m4 b/m4/xine.m4
index 6c8d980b6..a92fb54e9 100644
--- a/m4/xine.m4
+++ b/m4/xine.m4
@@ -65,19 +65,20 @@ AC_ARG_ENABLE(xinetest,
     if test "$XINE_CONFIG" = "no" ; then
       no_xine=yes
     else
-      XINE_CFLAGS=`$XINE_CONFIG $xine_config_args --cflags`
-      XINE_LIBS=`$XINE_CONFIG $xine_config_args --libs`
-      XINE_ACFLAGS=`$XINE_CONFIG $xine_config_args --acflags`
-      xine_config_major_version=`$XINE_CONFIG $xine_config_args --version | \
+      XINE_CFLAGS=`$XINE_CONFIG $xine_config_args --cflags 2>/dev/null`
+      XINE_LIBS=`$XINE_CONFIG $xine_config_args --libs 2>/dev/null`
+      XINE_ACFLAGS=`$XINE_CONFIG $xine_config_args --acflags 2>/dev/null`
+      xine_version=`$XINE_CONFIG $xine_config_args --version 2>/dev/null`
+      xine_config_major_version=`echo "$xine_version" | \
              sed -n 's/^\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*$/\1/p'`
-      xine_config_minor_version=`$XINE_CONFIG $xine_config_args --version | \
+      xine_config_minor_version=`echo "$xine_version" | \
              sed -n 's/^\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*$/\2/p'`
-      xine_config_sub_version=`$XINE_CONFIG $xine_config_args --version | \
+      xine_config_sub_version=`echo "$xine_version" | \
              sed -n 's/^\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*$/\3/p'`
-      xine_data_dir=`$XINE_CONFIG $xine_config_args --datadir`
-      xine_script_dir=`$XINE_CONFIG $xine_config_args --scriptdir`
-      xine_plugin_dir=`$XINE_CONFIG $xine_config_args --plugindir`
-      xine_locale_dir=`$XINE_CONFIG $xine_config_args --localedir`
+      xine_data_dir=`$XINE_CONFIG $xine_config_args --datadir 2>/dev/null`
+      xine_script_dir=`$XINE_CONFIG $xine_config_args --scriptdir 2>/dev/null`
+      xine_plugin_dir=`$XINE_CONFIG $xine_config_args --plugindir 2>/dev/null`
+      xine_locale_dir=`$XINE_CONFIG $xine_config_args --localedir 2>/dev/null`
       dnl    if test "x$enable_xinetest" = "xyes" ; then
       ac_save_CFLAGS="$CFLAGS"
       ac_save_LIBS="$LIBS"
-- 
cgit v1.2.3