From c62104ed7efd48703aee85ea05205a8f6bfb2f23 Mon Sep 17 00:00:00 2001
From: Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
Date: Sun, 16 Sep 2001 00:01:38 +0000
Subject: Few updates. autoconf-2.52/automake-1.5 supported.

CVS patchset: 637
CVS date: 2001/09/16 00:01:38
---
 cvscompile.sh | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'cvscompile.sh')

diff --git a/cvscompile.sh b/cvscompile.sh
index 79ad0a2fd..6cd96756a 100755
--- a/cvscompile.sh
+++ b/cvscompile.sh
@@ -1,17 +1,28 @@
 #!/bin/sh
 # Run this to generate all the initial Makefiles, etc.
 
+## extract autoconf version
+autoconf_2_5x=no
+AC="`autoconf --version | sed -n 1p | sed -e 's/[a-zA-Z\ \.\(\)]//g'`"
+if [ `expr $AC` -ge 250 ]; then
+    autoconf_2_5x=yes
+fi
+
 rm -f config.cache
 
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-#m4_files="_xine.m4 alsa.m4 arts.m4 esd.m4 aa.m4 irixal.m4"
+m4_files="_xine.m4 alsa.m4 arts.m4 esd.m4 aa.m4 irixal.m4"
 if test -d $srcdir/m4; then
     rm -f acinclude.m4
-    for m4f in $srcdir/m4/*.m4; do
-	cat $m4f >> acinclude.m4
+    for m4f in $m4_files; do
+	cat $srcdir/m4/$m4f >> acinclude.m4
     done
+    ## autoconf 2.5x implement AM_PROG_AS, not older ones, so add it.
+    if test x"$autoconf_2_5x" = x"no"; then
+	cat $srcdir/m4/as.m4 >> acinclude.m4
+    fi
 else
     echo "Directory 'm4' is missing."
     exit 1
-- 
cgit v1.2.3