[xine-cvs] CVS: xine-lib acconfig.h,1.29,1.30 cvscompile.sh,1.16,1.17 configure.in,1.205,1.206

[Michael R. <mr...@us...>]

Update of /cvsroot/xine/xine-lib
In directory usw-pr-cvs1:/tmp/cvs-serv30029

Modified Files:
	acconfig.h cvscompile.sh configure.in 
Log Message:
make developers life easier: add possibility to use an existing shared 
version of libdvdnav


Index: acconfig.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/acconfig.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- acconfig.h	3 Jun 2002 20:27:10 -0000	1.29
+++ acconfig.h	9 Aug 2002 22:17:37 -0000	1.30
@@ -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
 

Index: cvscompile.sh
===================================================================
RCS file: /cvsroot/xine/xine-lib/cvscompile.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cvscompile.sh	1 Jun 2002 17:23:55 -0000	1.16
+++ cvscompile.sh	9 Aug 2002 22:17:38 -0000	1.17
@@ -16,7 +16,7 @@
 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

Index: configure.in
===================================================================
RCS file: /cvsroot/xine/xine-lib/configure.in,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- configure.in	8 Aug 2002 17:49:20 -0000	1.205
+++ configure.in	9 Aug 2002 22:17:38 -0000	1.206
@@ -605,6 +605,14 @@
 	[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