[Surfraw-commits] [SCM] surfraw - a fast unix command line interface to WWW branch, master, updated. surfraw_2-2-5_1-95-g7c30b08

[Ian Beckwith]

The following commit has been merged in the master branch:
commit 751720864a20169d35016bb1bddf66620ed290d8
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Mon Mar 1 22:57:01 2010 +0000

    prebuild: try and find a sane set of autotools, then call autoreconf -vi

diff --git a/ChangeLog b/ChangeLog
index e4d3114..281fa04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2010-03-01  Ian Beckwith  <ianb at erislabs.net>
 
 	* Lower required automake version to 1.10.
+	* prebuild: try and find a sane set of autotools, then call
+	  autoreconf -vi
 	* W, yahoo: fix tests.
 	* Update AUTHORS.
 	* Add a note to appendix 1 of HACKING about updating AUTHORS.
diff --git a/prebuild b/prebuild
old mode 100644
new mode 100755
index 06e6ef4..e1b346b
--- a/prebuild
+++ b/prebuild
@@ -1,3 +1,31 @@
-automake
-autoconf
-sh configure
+#!/bin/sh
+
+set -e
+
+# if AUTOMAKE + ACLOCAL are not set, explicity search
+# for automake-1.{10,11} and aclocal-1.{10,11}
+if [ -z "$AUTOMAKE" ] && [ -z "$ACLOCAL" ]; then
+    if   [ -x "`which automake-1.10 2>/dev/null`" ] &&
+         [ -x "`which aclocal-1.10 2>/dev/null`" ]; then
+	AUTOMAKE=automake-1.10
+	ACLOCAL=aclocal-1.10
+	export AUTOMAKE ACLOCAL
+    elif [ -x "`which automake-1.11 2>/dev/null`" ] &&
+ 	 [ -x "`which aclocal-1.11 2>/dev/null`" ]; then
+	AUTOMAKE=automake-1.11
+	ACLOCAL=aclocal-1.11
+	export AUTOMAKE ACLOCAL
+    fi
+    # else use default
+fi
+
+# if AUTOCONF is not set, explicity search for autoconf2.50
+if [ -z "$AUTOCONF" ]; then
+    if   [ -x "`which autoconf2.50 2>/dev/null`" ]; then
+	AUTOCONF=autoconf2.50
+	export AUTOCONF
+    fi
+    # else use default
+fi
+
+autoreconf -vi

-- 
surfraw -  a fast unix command line interface to WWW