[xine-cvs] CVS: xine-vcdnav Makefile.am,1.5,1.6 configure.in,1.14,1.15

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

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

Modified Files:
	Makefile.am configure.in 
Log Message:
Lots of auto-configuration crap. 
Getting ready for 1-beta2 release. 



Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.am	22 Aug 2002 11:40:46 -0000	1.5
+++ Makefile.am	16 Jan 2003 04:24:44 -0000	1.6
@@ -16,9 +16,9 @@
 #
 # $Id$
 
-SUBDIRS =  vcdimager-0.7.12-rocky xine-extra input m4 misc 
+SUBDIRS =  vcdimager-0.7.12-rocky xine-extra input m4 misc po intl
 
-EXTRA_DIST = xine-vcdx.spec \
+EXTRA_DIST = xine-vcdx.spec intl/Makefile po/Makefile \
         @DEPCOMP@
 
 RPMDIR=`rpm --eval '%{_rpmdir}'`

Index: configure.in
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/configure.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- configure.in	15 Dec 2002 02:30:12 -0000	1.14
+++ configure.in	16 Jan 2003 04:24:44 -0000	1.15
@@ -27,13 +27,12 @@
 XINE_SUB=0
 XINE_PRE=""
 PACKAGE="xine-vcdx"
+SUBPACKAGE="beta2"
 RELEASE="1"
-TAR_NAME=$PACKAGE-$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PRE
-SPEC_VERSION=$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PRE
+SPEC_VERSION=$XINE_MAJOR-$SUBPACKAGE
 AC_SUBST(XINE_MAJOR)
 AC_SUBST(XINE_MINOR)
 AC_SUBST(XINE_SUB)
-AC_SUBST(TAR_NAME)
 AC_SUBST(SPEC_VERSION)
 AC_SUBST(PACKAGE)
 AC_SUBST(RELEASE)
@@ -66,6 +65,7 @@
 dnl create a config.h file (Automake will add -DHAVE_CONFIG_H)
 AM_CONFIG_HEADER(config.h)
 
+VERSION=$XINE_MAJOR-$SUBPACKAGE
 AC_SUBST(VERSION)
 
 ISODATE=`date +%Y-%m-%d`
@@ -201,7 +201,6 @@
 AM_CHECK_CDROM_IOCTLS([AC_DEFINE([HAVE_CDROM_IOCTLS])],
 	[AC_MSG_RESULT([*** (S)VCD support will be disabled ***])])
 AM_CONDITIONAL(HAVE_CDROM_IOCTLS, [test x"$have_cdrom_ioctls" = "xyes"])
-
 
 dnl
 dnl check cflags not supported by all gcc versions