[Toxine-cvs] CVS: toxine autogen.sh,1.1,1.2

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/toxine/toxine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29978

Modified Files:
	autogen.sh 
Log Message:
@@update

Index: autogen.sh
===================================================================
RCS file: /cvsroot/toxine/toxine/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autogen.sh	15 Jan 2003 17:40:10 -0000	1.1
+++ autogen.sh	6 Jul 2004 09:50:45 -0000	1.2
@@ -20,14 +20,14 @@
 #
 # $Id$
 #
-# Wrote by Stephen Torri <st...@us...>
-# Stolen by me from xine-ui.
+# Maintained by Stephen Torri <st...@us...>
 #
 # run this to generate all the initial makefiles, etc.
 
 PROG=toxine
 
 # Minimum value required to build
+WANT_AUTOMAKE_1_6=1 export WANT_AUTOMAKE_1_6
 AUTOMAKE_MIN=1.6.0
 AUTOCONF_MIN=2.53
 LIBTOOL_MIN=1.4.0
@@ -112,7 +112,7 @@
   NUM_RESULT=$#
   RESULT_FILE=$3
   if [ $RETVAL -eq 0 -a $NUM_RESULT -eq 3 -a -f "$RESULT_FILE" ]; then
-    LT="`libtool --version | awk '{ print $4 }' | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
+    LT="`libtool --version | awk '{ print $4 }' | sed -e 's/[a-zA-Z\ \.\(\)\-\;]//g'`"
     LIBTOOL_MIN="`echo $LIBTOOL_MIN | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
     if test $LT -lt 100 ; then
       LT=`expr $LT \* 10`
@@ -226,7 +226,7 @@
   echo $_echo_n " + Running aclocal: $_echo_c"
   aclocalinclude=`xine-config --acflags`
 
-  aclocal $aclocalinclude -I m4
+  aclocal -I m4 $aclocalinclude
   echo "done." 
 }