[xine-cvs] CVS: xine-lib configure.ac,1.1,1.2 cvscompile.sh,1.18,1.19

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

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

Modified Files:
	configure.ac cvscompile.sh 
Log Message:
Fix libtool problem. automake 1.5 and libtool 1.4.2 seems hate their child 
called AS. Don't use standard AM_PROG_AS, but our modified version (!x86
builder, report failure please).


Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/xine-lib/configure.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure.ac	19 Sep 2002 20:59:22 -0000	1.1
+++ configure.ac	20 Sep 2002 15:05:59 -0000	1.2
@@ -102,7 +102,7 @@
 dnl ---------------------------------------------
 dnl Check for assembler (ffmpeg need it), don't call this before LIBTOOL
 dnl ---------------------------------------------
-AM_PROG_AS
+AM_PROG_AS_MOD
 
 dnl ---------------------------------------------
 dnl Libtool

Index: cvscompile.sh
===================================================================
RCS file: /cvsroot/xine/xine-lib/cvscompile.sh,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cvscompile.sh	19 Sep 2002 21:02:53 -0000	1.18
+++ cvscompile.sh	20 Sep 2002 15:05:59 -0000	1.19
@@ -16,16 +16,16 @@
 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 dvdnav.m4"
+m4_files="_xine.m4 arts.m4 as.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
 	cat $srcdir/m4/$m4f >> acinclude.m4
     done
-    ## automake 1.5x implement AM_PROG_AS, not older ones, so add it.
-    if test x"$automake_1_5x" = x"no"; then
-	cat $srcdir/m4/as.m4 >> acinclude.m4
-    fi
+##    ## automake 1.5x implement AM_PROG_AS, not older ones, so add it.
+##    if test x"$automake_1_5x" = x"no"; then
+##	cat $srcdir/m4/as.m4 >> acinclude.m4
+##    fi
 else
     echo "Directory 'm4' is missing."
     exit 1