X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=autogen.sh;h=93efd66b1a7fe681e676e793243aee1f6a5b3565;hb=c46b0d5f95003a3d5ad925c1d94dc38acbefd4ba;hp=919b5c4a28b8f564c530d29d48cd2675dbb36729;hpb=564a80ab74b92df304c1b10658f87c406ed6a368;p=cacao.git

diff --git a/autogen.sh b/autogen.sh
index 919b5c4a2..93efd66b1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,54 +1,25 @@
 #!/bin/sh
 
-# test for a libtoolize
+# Test for a autoconf commands.
 
-HAVE_LIBTOOLIZE=false
-
-for LIBTOOLIZE in libtoolize libtoolize15 glibtoolize; do
-    if ${LIBTOOLIZE} --version > /dev/null 2>&1; then
-        LIBTOOLIZE_VERSION=`${LIBTOOLIZE} --version | sed 's/^.*[^0-9.]\([0-9]\{1,\}\.[0-9.]\{1,\}\).*/\1/'`
-#        echo ${LIBTOOLIZE_VERSION}
-        case ${LIBTOOLIZE_VERSION} in
-            1.5* )
-                HAVE_LIBTOOLIZE=true
-                break;
-                ;;
-        esac
-    fi
-done
-
-if test ${HAVE_LIBTOOLIZE} = false; then
-    echo "No proper libtoolize was found."
-    echo "You must have libtool 1.5 installed."
-    exit 1
-fi
+# Test for a autoconf.
 
+HAVE_AUTOCONF=false
 
-# test for a aclocal
-
-HAVE_ACLOCAL=false
-
-for ACLOCAL in aclocal aclocal-1.9 aclocal19; do
-    if ${ACLOCAL} --version > /dev/null 2>&1; then
-        ACLOCAL_VERSION=`${ACLOCAL} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
-#        echo ${ACLOCAL_VERSION}
-        case ${ACLOCAL_VERSION} in
-            1.9* )
-                HAVE_ACLOCAL=true
+for AUTOCONF in autoconf autoconf259; do
+    if ${AUTOCONF} --version > /dev/null 2>&1; then
+        AUTOCONF_VERSION=`${AUTOCONF} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+#        echo ${AUTOCONF_VERSION}
+        case ${AUTOCONF_VERSION} in
+            2.59* | 2.6[0-9]* )
+                HAVE_AUTOCONF=true
                 break;
                 ;;
         esac
     fi
 done
 
-if test ${HAVE_ACLOCAL} = false; then
-    echo "No proper aclocal was found."
-    echo "You must have automake 1.9 installed."
-    exit 1
-fi
-
-
-# test for a autoheader
+# Test for a autoheader.
 
 HAVE_AUTOHEADER=false
 
@@ -57,7 +28,7 @@ for AUTOHEADER in autoheader autoheader259; do
         AUTOHEADER_VERSION=`${AUTOHEADER} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
 #        echo ${AUTOHEADER_VERSION}
         case ${AUTOHEADER_VERSION} in
-            2.59* )
+            2.59* | 2.6[0-9]* )
                 HAVE_AUTOHEADER=true
                 break;
                 ;;
@@ -65,23 +36,71 @@ for AUTOHEADER in autoheader autoheader259; do
     fi
 done
 
+# Test for a autoreconf.
+
+HAVE_AUTORECONF=false
+
+for AUTORECONF in autoreconf; do
+    if ${AUTORECONF} --version > /dev/null 2>&1; then
+        AUTORECONF_VERSION=`${AUTORECONF} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+#        echo ${AUTORECONF_VERSION}
+        case ${AUTORECONF_VERSION} in
+            2.59* | 2.6[0-9]* )
+                HAVE_AUTORECONF=true
+                break;
+                ;;
+        esac
+    fi
+done
+
+if test ${HAVE_AUTOCONF} = false; then
+    echo "No proper autoconf was found."
+    echo "You must have autoconf 2.59 or later installed."
+    exit 1
+fi
+
 if test ${HAVE_AUTOHEADER} = false; then
     echo "No proper autoheader was found."
-    echo "You must have autoconf 2.59 installed."
+    echo "You must have autoconf 2.59 or later installed."
+    exit 1
+fi
+
+if test ${HAVE_AUTORECONF} = false; then
+    echo "No proper autoreconf was found."
+    echo "You must have autoconf 2.59 or later installed."
     exit 1
 fi
 
 
-# test for a automake
+# Test for a automake commands.
+
+# Test for a aclocal.
+
+HAVE_ACLOCAL=false
+
+for ACLOCAL in aclocal aclocal-1.10 aclocal-1.9 aclocal19; do
+    if ${ACLOCAL} --version > /dev/null 2>&1; then
+        ACLOCAL_VERSION=`${ACLOCAL} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+#        echo ${ACLOCAL_VERSION}
+        case ${ACLOCAL_VERSION} in
+            1.9* | 1.1[0-9]* )
+                HAVE_ACLOCAL=true
+                break;
+                ;;
+        esac
+    fi
+done
+
+# Test for a automake.
 
 HAVE_AUTOMAKE=false
 
-for AUTOMAKE in automake automake-1.9 automake19; do
+for AUTOMAKE in automake automake-1.10 automake-1.9 automake19; do
     if ${AUTOMAKE} --version > /dev/null 2>&1; then
         AUTOMAKE_VERSION=`${AUTOMAKE} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
 #        echo ${AUTOMAKE_VERSION}
         case ${AUTOMAKE_VERSION} in
-            1.9* )
+            1.9* | 1.1[0-9]* )
                 HAVE_AUTOMAKE=true
                 break;
                 ;;
@@ -89,51 +108,43 @@ for AUTOMAKE in automake automake-1.9 automake19; do
     fi
 done
 
+if test ${HAVE_ACLOCAL} = false; then
+    echo "No proper aclocal was found."
+    echo "You must have automake 1.9 or later installed."
+    exit 1
+fi
+
 if test ${HAVE_AUTOMAKE} = false; then
     echo "No proper automake was found."
-    echo "You must have automake 1.9 installed."
+    echo "You must have automake 1.9 or later installed."
     exit 1
 fi
 
 
-# test for a autoconf
+# Test for a libtoolize.
 
-HAVE_AUTOCONF=false
+HAVE_LIBTOOLIZE=false
 
-for AUTOCONF in autoheader autoheader259; do
-    if ${AUTOCONF} --version > /dev/null 2>&1; then
-        AUTOCONF_VERSION=`${AUTOCONF} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
-#        echo ${AUTOCONF_VERSION}
-        case ${AUTOCONF_VERSION} in
-            2.59* )
-                HAVE_AUTOCONF=true
+for LIBTOOLIZE in libtoolize libtoolize15 glibtoolize; do
+    if ${LIBTOOLIZE} --version > /dev/null 2>&1; then
+        LIBTOOLIZE_VERSION=`${LIBTOOLIZE} --version | sed 's/^.*[^0-9.]\([0-9]\{1,\}\.[0-9.]\{1,\}\).*/\1/'`
+#        echo ${LIBTOOLIZE_VERSION}
+        case ${LIBTOOLIZE_VERSION} in
+            1.5* | 2.* )
+                HAVE_LIBTOOLIZE=true
                 break;
                 ;;
         esac
     fi
 done
 
-if test ${HAVE_AUTOCONF} = false; then
-    echo "No proper autoconf was found."
-    echo "You must have autoconf 2.59 installed."
+if test ${HAVE_LIBTOOLIZE} = false; then
+    echo "No proper libtoolize was found."
+    echo "You must have libtool 1.5 or later installed."
     exit 1
 fi
 
 
-${LIBTOOLIZE} --automake
-if test `uname` = 'FreeBSD'; then
-    ${ACLOCAL} -I m4 -I /usr/local/share/aclocal -I /usr/local/share/aclocal19
-else
-    ${ACLOCAL} -I m4
-fi
-${AUTOHEADER}
-${AUTOMAKE} --add-missing
-${AUTOCONF}
-
-export CACAO_LIBTOOLIZE=${LIBTOOLIZE}
-export CACAO_ACLOCAL=${ACLOCAL}
-export CACAO_AUTOHEADER=${AUTOHEADER}
-export CACAO_AUTOMAKE=${AUTOMAKE}
-export CACAO_AUTOCONF=${AUTOCONF}
+export ACLOCAL AUTOCONF AUTOHEADER AUTOMAKE LIBTOOLIZE
 
-cd src/boehm-gc && ./autogen.sh && cd ../..
+${AUTORECONF} --force --install --no-recursive