diff options
| -rw-r--r-- | acconfig.h | 3 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rwxr-xr-x | cvscompile.sh | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/acconfig.h b/acconfig.h index ae6db58ca..f9e7d654a 100644 --- a/acconfig.h +++ b/acconfig.h @@ -101,6 +101,9 @@ /* Define this if you have CDROM ioctls */ #undef HAVE_CDROM_IOCTLS +/* Define this if you have a suitable version of libdvdnav */ +#undef HAVE_DVDNAV + /* Define this if you have ip_mreqn in netinet/in.h */ #undef HAVE_IP_MREQN diff --git a/configure.in b/configure.in index cd1e6e4e7..e1655accf 100644 --- a/configure.in +++ b/configure.in @@ -605,6 +605,14 @@ AM_CHECK_CDROM_IOCTLS([AC_DEFINE([HAVE_CDROM_IOCTLS])], [AC_MSG_RESULT([*** DVD and (S)VCD support will be disabled ***])]) AM_CONDITIONAL(HAVE_CDROM_IOCTLS, [test x"$have_cdrom_ioctls" = "xyes"]) +dnl +dnl check for a usable version of libdvdnav +dnl +AM_PATH_DVDNAV(0.1.3, + AC_DEFINE(HAVE_DVDNAV), + [AC_MSG_RESULT([*** no usable version of libdvdnav found, using internal copy ***])]) +AM_CONDITIONAL(HAVE_DVDNAV, [test x"$no_dvdnav" != "xyes"]) + dnl dnl ASF build can be optional diff --git a/cvscompile.sh b/cvscompile.sh index eef2c960e..2740d531c 100755 --- a/cvscompile.sh +++ b/cvscompile.sh @@ -16,7 +16,7 @@ rm -f config.cache srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -m4_files="_xine.m4 arts.m4 esd.m4 iconv.m4 lcmessage.m4 vorbis.m4 aa.m4 gettext.m4 irixal.m4 ogg.m4 alsa.m4 codeset.m4 glibc21.m4 isc-posix.m4 progtest.m4 sdl.m4 xvid.m4 libfame.m4" +m4_files="_xine.m4 arts.m4 esd.m4 iconv.m4 lcmessage.m4 vorbis.m4 aa.m4 gettext.m4 irixal.m4 ogg.m4 alsa.m4 codeset.m4 glibc21.m4 isc-posix.m4 progtest.m4 sdl.m4 xvid.m4 libfame.m4 dvdnav.m4" if test -d $srcdir/m4; then rm -f acinclude.m4 for m4f in $m4_files; do |