diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2002-11-14 04:43:25 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2002-11-14 04:43:25 +0000 |
| commit | 72d8f8901985324b50a9b8c255170ec08f9b7eea (patch) | |
| tree | 9e0fb440bbf704a4fccff1d1f9162e97ecbf6f75 /src/util | |
| parent | 516e41d1fa9970f0b6f3bd58f46e77ebe2a3beaf (diff) | |
| download | krb5-72d8f8901985324b50a9b8c255170ec08f9b7eea.zip krb5-72d8f8901985324b50a9b8c255170ec08f9b7eea.tar.gz krb5-72d8f8901985324b50a9b8c255170ec08f9b7eea.tar.bz2 | |
Invoke autoconf/autoreconf with the option --localdir or --include depending
on if pre/post autoconf 2.54. In 2.55 --localdir has been removed and replaced
with --include which was introduced in 2.53.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14996 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/ChangeLog | 5 | ||||
| -rw-r--r-- | src/util/reconf | 18 |
2 files changed, 21 insertions, 2 deletions
diff --git a/src/util/ChangeLog b/src/util/ChangeLog index 82e36c0..659661d 100644 --- a/src/util/ChangeLog +++ b/src/util/ChangeLog @@ -1,3 +1,8 @@ +2002-11-13 Ezra Peisach <epeisach@bu.edu> + + * reconf: For pre autoconf 2.54 - invoke autoreconf with -l for + localdir. Posr 2.54 use the -I option. + 2002-09-27 Tom Yu <tlyu@mit.edu> * depgen.sed: Solaris sed doesn't like '\(^.*$\)'; replace it with diff --git a/src/util/reconf b/src/util/reconf index 48ebb30..c246272 100644 --- a/src/util/reconf +++ b/src/util/reconf @@ -5,6 +5,7 @@ autoreconfprog=autoreconf localdir=. autoreconfoptions="" verbose=false +localdirarg= autoreconf="/bin/sh $autoreconfprog" @@ -74,6 +75,19 @@ if autoreconf --version | sed -e "$sedcmd1" -e "$sedcmd2" | egrep "$patb" >/dev/ *) ;; esac + + # Determine the proper argument to autoreconf + case "$autoconfversion" in + 2.1*) + localdirarg="-l" + ;; + 2.5[23]) + localdirarg="-l" + ;; + *) + localdirarg="-I" + ;; + esac else echo "Couldn't find autoconf 2.13 or higher in your path." echo " " @@ -82,9 +96,9 @@ else fi if $verbose ; then - echo $autoreconf $autoreconfoptions -l $localdir --verbose $force + echo $autoreconf $autoreconfoptions $localdirarg $localdir --verbose $force fi -$autoreconf $autoreconfoptions -l $localdir --verbose $force || exit 1 +$autoreconf $autoreconfoptions $localdirarg $localdir --verbose $force || exit 1 if test $? = 0 ; then if test ! -d include/krb5/autoconf.stmp ; then cp /dev/null include/krb5/autoconf.stmp |