[xine-cvs] CVS: xine-vcdnav Makefile.am,1.8,1.9 autogen.sh,1.2,1.3 configure.ac,1.7,1.8 acconfig.h,1.4,NONE bootstrap.sh,1.1,NONE

[Rocky B. <ro...@us...>]

Update of /cvsroot/xine/xine-vcdnav
In directory sc8-pr-cvs1:/tmp/cvs-serv9422

Modified Files:
	Makefile.am autogen.sh configure.ac 
Removed Files:
	acconfig.h bootstrap.sh 
Log Message:
auto* changes courtesy Daniel Caujolle-Bert. Thanks Daniel! 
Some modification and merging done to make closer to code inside vcdimager.




Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.am	11 Mar 2003 03:13:05 -0000	1.8
+++ Makefile.am	16 Mar 2003 02:59:50 -0000	1.9
@@ -54,6 +54,7 @@
 	-rm -f config.h.in stamp-h.in ltconfig ltmain.sh
 	-rm -f config.guess config.sub install-sh missing mkinstalldirs
 	-rm -f depcomp config.log
+	-rm -rf autom4te.cache
 
 maintainer-clean-generic-hook: 
 	rm -f config.status

Index: autogen.sh
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/autogen.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- autogen.sh	24 Jan 2003 19:59:59 -0000	1.2
+++ autogen.sh	16 Mar 2003 02:59:50 -0000	1.3
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2002 the xine project
+# Copyright (C) 2000,2002,2003 the xine project
 #
 # This file is part of xine, a unix video player.
 # 
@@ -24,7 +24,9 @@
 #
 # run this to generate all the initial makefiles, etc.
 
-PROG=xine-lib
+(cd vcdimager-0.7.12-rocky && NOCONFIGURE=1 $0 $@)
+
+PROG=xine-vcdx
 
 # Minimum value required to build
 AUTOMAKE_MIN=1.6.0

Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure.ac	11 Mar 2003 02:22:43 -0000	1.7
+++ configure.ac	16 Mar 2003 02:59:50 -0000	1.8
@@ -1,22 +1,22 @@
 dnl
 dnl Require autoconf version 2.50 or greater
 dnl
-# Copyright (C) 2002 Rocky Bernstein <ro...@pa...>
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+dnl Copyright (C) 2002,2003 Rocky Bernstein <ro...@pa...>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
 
 AC_INIT(input/xineplug_inp_vcd.c)
 
@@ -197,7 +197,7 @@
 dnl CD-ROM IOCTLS
 dnl
 AC_CHECK_HEADERS(sys/cdio.h linux/cdrom.h strings.h)
-AM_CHECK_CDROM_IOCTLS([AC_DEFINE([HAVE_CDROM_IOCTLS])],
+AM_CHECK_CDROM_IOCTLS([AC_DEFINE([HAVE_CDROM_IOCTLS],1,[Define this if you have CD-ROM ioctls.])],
 	[AC_MSG_RESULT([*** (S)VCD support will be disabled ***])])
 AM_CONDITIONAL(HAVE_CDROM_IOCTLS, [test x"$have_cdrom_ioctls" = "xyes"])
 
@@ -225,8 +225,8 @@
     GLOBAL_CFLAGS="$GLOBAL_CFLAGS $m_psb"
     GLOBAL_CFLAGS="$GLOBAL_CFLAGS $CFLAGS $COMMON_CFLAGS $ALSA_CFLAGS $ESD_CFLAGS -D_REENTRANT"
     DEBUG_CFLAGS="$X_CFLAGS $DEBUG_CFLAGS $CFLAGS $COMMON_CFLAGS $ALSA_CFLAGS $ESD_CFLAGS -D_REENTRANT -DDEBUG"
-    AC_DEFINE(__i386__)
-    AC_DEFINE([ARCH_X86],,[x86 architecture])
+    AC_DEFINE(__i386__,1,[Define this if you're running an x86 architecture.])
+    AC_DEFINE([ARCH_X86],,[Define this also if you're running an x86 architecture.])
 
     ;;
   *)
@@ -244,8 +244,8 @@
 	dnl special check for k7 cpu CC support
         AC_TRY_CFLAGS("$sarchopt=athlon", k7cpu=athlon"", k7cpu="athlon")
 	
-        AC_DEFINE(__i386__)
-	AC_DEFINE([ARCH_X86],,[x86 architecture])
+        AC_DEFINE(__i386__,1,[Define this if you're running an x86 architecture.])
+	AC_DEFINE([ARCH_X86],,[Define this also if you're running an x86 architecture.])
 
 	dnl add x86 specific CFLAGS
 	GLOBAL_CFLAGS="$GLOBAL_CFLAGS $m_psb"
@@ -338,7 +338,7 @@
 fi
 AC_SUBST(DEPCOMP)
 
-AC_CONFIG_SUBDIRS(vcdimager-0.7.12-rocky)
+AC_CONFIG_SUBDIRS([vcdimager-0.7.12-rocky])
 
 dnl
 dnl Output configuration files

--- acconfig.h DELETED ---

--- bootstrap.sh DELETED ---