diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2001-10-25 17:36:45 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2001-10-25 17:36:45 +0000 |
| commit | bc1252843c941a30c7e85b1fd8211a163a4d7045 (patch) | |
| tree | 7f4e55d5dc54624f91bf05fffd9b7ded85822b5e /src/util/reconf | |
| parent | f2222c82a5594cfb61ca10f6ea2baa2d3d0ec62a (diff) | |
| download | krb5-bc1252843c941a30c7e85b1fd8211a163a4d7045.zip krb5-bc1252843c941a30c7e85b1fd8211a163a4d7045.tar.gz krb5-bc1252843c941a30c7e85b1fd8211a163a4d7045.tar.bz2 | |
* reconf: Require autoconf 2.13. Remove support for local autoconf
tree.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13847 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/util/reconf')
| -rw-r--r-- | src/util/reconf | 56 |
1 files changed, 26 insertions, 30 deletions
diff --git a/src/util/reconf b/src/util/reconf index 197db27..734a817 100644 --- a/src/util/reconf +++ b/src/util/reconf @@ -1,9 +1,9 @@ #!/bin/sh force= -autoreconfprog=./util/autoconf/autoreconf +autoreconfprog=autoreconf localdir=. -autoreconfoptions="-m util/autoconf" +autoreconfoptions="" verbose=false autoreconf="/bin/sh $autoreconfprog" @@ -23,39 +23,35 @@ do esac done -# Currently (2000-10-03) we need 2.12 or later, and 2.13 is current. -# Thie pattern also recognizes 2.40 and up. -patb="2.(1[2-9])|([4-9][0-9])" +# Currently (2000-10-03) we need 2.13 or later. +# The pattern also recognizes 2.40 and up. +patb="2.(1[3-9])|([4-9][0-9])" # sedcmd1 recognizes the older 2.12 version, and sedcmd2 the newer 2.49 sedcmd1="s,.*version \(.*\)$,\1," sedcmd2="s,.*) \(.*\)$,\1,;1q" -if test ! -f $autoreconfprog ; then - if autoreconf --version | sed -e "$sedcmd1" -e "$sedcmd2" | egrep "$patb" >/dev/null && \ - autoconf --version | sed -e "$sedcmd1" -e "$sedcmd2" | egrep "$patb" >/dev/null && \ - autoheader --version | sed -e "$sedcmd1" -e "$sedcmd2" | egrep "$patb" >/dev/null; then - autoreconf=autoreconf - autoreconfoptions= - autoconfversion=`autoconf --version | sed -e "$sedcmd1" -e "$sedcmd2"` - echo "Using autoconf version $autoconfversion found in your path..." - # Determine if localdir needs to be relative or absolute - case "$autoconfversion" in - 2.1*) - localdir=. - ;; - *) - localdir=`pwd` - ;; - esac - else - 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" - echo "of the source tree and re-run ./util/reconf" - exit 1 - fi +if autoreconf --version | sed -e "$sedcmd1" -e "$sedcmd2" | egrep "$patb" >/dev/null && \ + autoconf --version | sed -e "$sedcmd1" -e "$sedcmd2" | egrep "$patb" >/dev/null && \ + autoheader --version | sed -e "$sedcmd1" -e "$sedcmd2" | egrep "$patb" >/dev/null; then + autoreconf=autoreconf + autoreconfoptions= + autoconfversion=`autoconf --version | sed -e "$sedcmd1" -e "$sedcmd2"` + echo "Using autoconf version $autoconfversion found in your path..." + # Determine if localdir needs to be relative or absolute + case "$autoconfversion" in + 2.1*) + localdir=. + ;; + *) + localdir=`pwd` + ;; + esac +else + echo "Couldn't find autoconf 2.13 or higher in your path." + echo " " + echo "Please install or add to your path and re-run ./util/reconf" + exit 1 fi if $verbose ; then |