From 0a06bccf23f2b2d040094d0c2f084b7a7142867c Mon Sep 17 00:00:00 2001
From: Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
Date: Fri, 20 Sep 2002 15:05:59 +0000
Subject: 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).

CVS patchset: 2721
CVS date: 2002/09/20 15:05:59
---
 configure.ac  |  2 +-
 cvscompile.sh | 10 +++++-----
 m4/as.m4      |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0c823b2d4..ffdbc5ef1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,7 +102,7 @@ AC_PROG_AWK
 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
diff --git a/cvscompile.sh b/cvscompile.sh
index a9c336d70..d6bb13c1e 100755
--- a/cvscompile.sh
+++ b/cvscompile.sh
@@ -16,16 +16,16 @@ rm -f config.cache
 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
diff --git a/m4/as.m4 b/m4/as.m4
index 452db39c5..276cac93c 100644
--- a/m4/as.m4
+++ b/m4/as.m4
@@ -3,15 +3,15 @@ dnl Daniel Caujolle-Bert <segfault@club-internet.fr>
 
 # Figure out how to run the assembler.
 
-# AM_PROG_AS
-AC_DEFUN([AM_PROG_AS],
+# AM_PROG_AS_MOD
+AC_DEFUN([AM_PROG_AS_MOD],
 [# By default we simply use the C compiler to build assembly code.
 AC_REQUIRE([AC_PROG_CC])
-: ${AS='$(CC)'}
+: ${AS='$CC'}
 # Set ASFLAGS if not already set.
 : ${ASFLAGS='$(CFLAGS)'}
 # Set ASCOMPILE if not already set.
-if test $AS = '$''('CC')'; then
+if test $AS = '$'CC; then
 : ${ASCOMPILE='$(AS) $(AM_ASFLAGS) $(ASFLAGS) -c'}
 else
 : ${ASCOMPILE='$(AS) $(AM_ASFLAGS) $(ASFLAGS)'}
-- 
cgit v1.2.3