From: dpage <dpage@a7884b65-44f6-0310-8a51-81a127f17b15>
Date: Tue, 29 Sep 2009 11:22:21 +0000 (+0000)
Subject: Update for new versions of aclocal/automake.
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=ac02637d705e7a9aacb4493acacd0f7aa00950fc;p=users%2Fquan74%2Fpgadmin-import.git

Update for new versions of aclocal/automake.

git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@8049 a7884b65-44f6-0310-8a51-81a127f17b15
---

diff --git a/bootstrap b/bootstrap
index 351c4ba6f..5de53b55e 100644
--- a/bootstrap
+++ b/bootstrap
@@ -8,37 +8,50 @@
 #
 #######################################################################
 
-# Check for aclocal 1.9/1.10
+# Check for aclocal 1.9/1.10/1.11
 echo "Checking aclocal..."
-RET=`type aclocal-1.10 > /dev/null 2>&1 || echo fail`
+RET=`type aclocal-1.11 > /dev/null 2>&1 || echo fail`
 if [ ! $RET ];
 then
-  ACLOCAL=aclocal-1.10
+  ACLOCAL=aclocal-1.11
 else
-  RET=`type aclocal-1.9 > /dev/null 2>&1 || echo fail` 
+  RET=`type aclocal-1.10 > /dev/null 2>&1 || echo fail`
   if [ ! $RET ];
   then
-    ACLOCAL=aclocal-1.9
+    ACLOCAL=aclocal-1.10
   else
-    echo "ERROR: this script requires aclocal-1.9 or aclocal-1.10"
-    exit 1
+    RET=`type aclocal-1.9 > /dev/null 2>&1 || echo fail` 
+    if [ ! $RET ];
+    then
+      ACLOCAL=aclocal-1.9
+    else
+      echo "ERROR: this script requires aclocal-1.9, aclocal-1.10 or aclocal-1.11"
+      exit 1
+    fi
   fi
 fi
 
-# Check for automake 1.9/1.10
+
+# Check for automake 1.9/1.10/1.11
 echo "Checking automake..."
-RET=`type automake-1.10 > /dev/null 2>&1 || echo fail`
+RET=`type automake-1.11 > /dev/null 2>&1 || echo fail`
 if [ ! $RET ];
 then
-  AUTOMAKE=automake-1.10
+  AUTOMAKE=automake-1.11
 else
-  RET=`type automake-1.9 > /dev/null 2>&1 || echo fail`
+  RET=`type automake-1.10 > /dev/null 2>&1 || echo fail`
   if [ ! $RET ];
   then
-    AUTOMAKE=automake-1.9
+    AUTOMAKE=automake-1.10
   else
-    echo "ERROR: this script requires automake-1.9 or automake-1.10"
-    exit 1
+    RET=`type automake-1.9 > /dev/null 2>&1 || echo fail`
+    if [ ! $RET ];
+    then
+      AUTOMAKE=automake-1.9
+    else
+      echo "ERROR: this script requires automake-1.9, automake-1.10 or automake-1.11"
+      exit 1
+    fi
   fi
 fi