diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-03-10 21:14:14 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-03-10 21:14:14 +0000 |
| commit | 393039dbf092579847f43821fb694ac5789c56fb (patch) | |
| tree | b6929307abb63fd85af0ef92f6ae51d2feeefc62 /m4/dvdnav.m4 | |
| parent | 8c0b202a58fbce2a96ce3d02eea24b0e1e786e7a (diff) | |
| download | xine-lib-393039dbf092579847f43821fb694ac5789c56fb.tar.gz xine-lib-393039dbf092579847f43821fb694ac5789c56fb.tar.bz2 | |
Make buildable with current (external) libdvdnav & libdvdread.
Diffstat (limited to 'm4/dvdnav.m4')
| -rw-r--r-- | m4/dvdnav.m4 | 8 |
1 files changed, 5 insertions, 3 deletions
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" |