Ugly hack for ensure automake-1.6 is used first before using the default 'automake'. We need to make these one file.

CVS patchset: 3165
CVS date: 2002/11/03 14:43:04

1 files changed, 15 insertions, 12 deletions

diff --git a/cvscompile.sh b/cvscompile.sh
index 519ee1102..935742145 100755
--- a/cvscompile.sh
+++ b/cvscompile.sh
@@ -2,21 +2,23 @@
 # Run this to generate all the initial Makefiles, etc.
 
 ## extract automake version
-automake_1_6x=no
-AM="`automake --version | sed -n 1p | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
-if test $AM -lt 100 ; then
-  AM=`expr $AM \* 10`
-fi
-if [ `expr $AM` -ge 160 ]; then
+
+if [ -f automake-1.6 ]; then
+  automake_1_6x=yes
+else
+  AM="`automake --version | sed -n 1p | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
+  if test $AM -lt 100 ; then
+    AM=`expr $AM \* 10`
+  fi
+  if [ `expr $AM` -ge 160 ]; then
     automake_1_6x=yes
-fi
-if [ -z "$NO_AUTOCONF_CHECK" ]; then
-  if test x"$automake_1_6x" = x"no"; then
-	  echo "To compile xine-lib from CVS requires automake >= 1.6"
-	  exit
   fi
 fi
 
+if test x"$automake_1_6x" = x"no"; then
+  echo "Warning: automake < 1.6. Some warning message might occur from automake"
+fi
+
 ## extract autoconf version
 autoconf_2_53=no
 AC="`autoconf --version | sed -n 1p | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
@@ -42,5 +44,6 @@ test -z "$srcdir" && srcdir=.
     exit 1
 }
 
-. $srcdir/misc/autogen.sh
+configure_flags=$@
+. $srcdir/misc/autogen.sh $automake_1_6x $configure_flags