diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/util/ChangeLog | 5 | ||||
| -rw-r--r-- | src/util/reconf | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/util/ChangeLog b/src/util/ChangeLog index b1cb6234ab..f8873f6e21 100644 --- a/src/util/ChangeLog +++ b/src/util/ChangeLog @@ -1,3 +1,8 @@ +2000-10-03 Ken Raeburn <raeburn@mit.edu> + + * reconf: Look for autoconf 2.12 or later. Don't use "grep -q", + it's not portable enough. + 2000-06-30 Tom Yu <tlyu@mit.edu> * Makefile.in (all-unix, clean_unix): Removed util/db2 include diff --git a/src/util/reconf b/src/util/reconf index 9251467ea7..5d6533dc13 100644 --- a/src/util/reconf +++ b/src/util/reconf @@ -21,15 +21,16 @@ do esac done - +# Currently (2000-10-03) we need 2.12 or later, and 2.13 is current. +pat="version 2.1[23456789]" if test ! -f $autoreconfprog ; then - if autoreconf --version | grep -q "version 2.[123456789]" && \ - autoconf --version | grep -q "version 2.[123456789]" && \ - autoheader --version | grep -q "version 2.[123456789]" ; then + if autoreconf --version | grep "$pat" >/dev/null && \ + autoconf --version | grep "$pat" >/dev/null && \ + autoheader --version | grep "$pat" >/dev/null; then autoreconf=autoreconf echo "Using" `autoconf --version` "found in your path..." else - echo "Couldn't find autoconf 2.1 or higher in your path." + echo "Couldn't find autoconf 2.12 or higher in your path." echo " " echo "Please cd to util/autoconf, and type the commands" echo "'configure' and then 'make'; then cd back to the top" |