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

2 files changed, 50 insertions, 32 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
 
diff --git a/misc/autogen.sh b/misc/autogen.sh
index debfc19f6..ff840a3a6 100755
--- a/misc/autogen.sh
+++ b/misc/autogen.sh
@@ -4,6 +4,7 @@
 # Raph Levien, slightly hacked for xine by Daniel Caujolle-Bert.
 
 DIE=0
+automake_1_6x=$1
 
 PROG=xine-lib
 
@@ -30,19 +31,21 @@ esac
         DIE=1
 }
 
+if test x"$automake_1_6x" != "xyes"; then
 (automake --version) < /dev/null > /dev/null 2>&1 || {
         echo
         echo "You must have automake installed to compile $PROG."
-        echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
+        echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.6.tar.gz"
         echo "(or a newer version if it is available)"
         DIE=1
 }
+fi
 
 (aclocal --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "**Error**: Missing aclocal. The version of automake"
 	echo "installed doesn't appear recent enough."
-	echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
+	echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.6.tar.gz"
 	echo "(or a newer version if it is available)"
 	DIE=1
 }
@@ -51,31 +54,43 @@ if [ "$DIE" -eq 1 ]; then
         exit 1
 fi
 
-aclocalinclude="$ACLOCAL_FLAGS"; \
-(echo $_echo_n " + Running aclocal: $_echo_c"; \
-    aclocal $aclocalinclude -I m4; \
- echo "done.") && \
-(echo $_echo_n " + Running libtoolize: $_echo_c"; \
-    libtoolize --force --copy >/dev/null 2>&1; \
- echo "done.") && \
-(echo $_echo_n " + Running autoheader: $_echo_c"; \
-    autoheader; \
- echo "done.") && \
-(echo $_echo_n " + Running automake: $_echo_c"; \
-    automake --gnu --add-missing --copy; \
- echo "done.") && \
-(echo $_echo_n " + Running autoconf: $_echo_c"; \
-    autoconf; \
- echo "done.")
+aclocalinclude="$ACLOCAL_FLAGS"; 
+echo $_echo_n " + Running aclocal: $_echo_c"; 
+    aclocal $aclocalinclude -I m4;
+echo "done."
+
+echo $_echo_n " + Running libtoolize: $_echo_c";
+    libtoolize --force --copy >/dev/null 2>&1;
+echo "done."
+
+echo $_echo_n " + Running autoheader: $_echo_c";
+    autoheader;
+echo "done."
+
+echo $_echo_n " + Running automake: $_echo_c";
+
+if test x"$automake_1_6x" = "xyes"; then
+  automake-1.6 --gnu --add-missing --copy;
+else
+  automake --gnu --add-missing --copy;
+fi
+echo "done."
+
+echo $_echo_n " + Running autoconf: $_echo_c";
+    autoconf;
+echo "done."
 
 rm -f config.cache
 
+#configure_flags=`expr $@ | sed -e 's/yes//'`
+#echo "$configure_flags"
+configure_flags=$2
 if [ x"$NO_CONFIGURE" = "x" ]; then
-    echo " + Running 'configure $@':"
+    echo " + Running 'configure $configure_flags':"
     if [ -z "$*" ]; then
 	echo "   ** If you wish to pass arguments to ./configure, please"
         echo "   ** specify them on the command line."
     fi
-    ./configure "$@" && \
+    ./configure "$configure_flags" && \
     echo "Now type 'make' to compile $PKG_NAME" || exit 1
 fi