diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2003-04-25 03:13:32 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2003-04-25 03:13:32 +0000 |
| commit | 062c91709b7dc93094602b54a0f99001b6b289f2 (patch) | |
| tree | 3b82c466fad2155fb0f7c691f8887770fc23a7bd /src | |
| parent | de65b5f9343461402846dce7eeeecae80dd0817d (diff) | |
| download | krb5-062c91709b7dc93094602b54a0f99001b6b289f2.tar.gz krb5-062c91709b7dc93094602b54a0f99001b6b289f2.tar.xz krb5-062c91709b7dc93094602b54a0f99001b6b289f2.zip | |
* reconf: Restore support for 2.52; reject older versions
ticket: 1242
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15371 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/util/ChangeLog | 4 | ||||
| -rw-r--r-- | src/util/reconf | 23 |
2 files changed, 22 insertions, 5 deletions
diff --git a/src/util/ChangeLog b/src/util/ChangeLog index 57c0c7c9f8..40b2a9174e 100644 --- a/src/util/ChangeLog +++ b/src/util/ChangeLog @@ -1,3 +1,7 @@ +2003-04-24 Ken Raeburn <raeburn@mit.edu> + + * reconf: Restore support for 2.52; reject older versions. + 2003-04-23 Ken Raeburn <raeburn@mit.edu> * reconf: Drop support for 2.52 and earlier. diff --git a/src/util/reconf b/src/util/reconf index 1aa7d605c6..6a5038145f 100644 --- a/src/util/reconf +++ b/src/util/reconf @@ -24,9 +24,8 @@ do esac done -# Currently (2003-04-23) we need 2.53 or later. -# The pattern also recognizes 2.40 and up. -patb="2.(1[0-9][0-9])|(5[3-9])|([6-9][0-9])" +# Currently (2003-04-24) we need 2.52 or later. +patb="2.(1[0-9][0-9])|(5[2-9])|([6-9][0-9])" # sedcmd1 recognizes the older 2.12 version, and sedcmd2 the newer 2.49 sedcmd1="s,.*version \(.*\)$,\1," @@ -43,6 +42,9 @@ if autoreconf --version | sed -e "$sedcmd1" -e "$sedcmd2" | egrep "$patb" >/dev/ # Determine if we need to patch autoreconf for 2.53 case "$autoconfversion" in + 2.52) + echo "WARNING: autoconf 2.52 is known to generate buggy configure scripts!" + ;; 2.53) echo "Patching autoreconf" # Walk the path to find autoreconf @@ -68,9 +70,20 @@ if autoreconf --version | sed -e "$sedcmd1" -e "$sedcmd2" | egrep "$patb" >/dev/ ;; esac - localdirarg="-I" + # 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.53 or higher in your path." + echo "Couldn't find autoconf 2.52 or higher in your path." echo " " echo "Please install or add to your path and re-run ./util/reconf" exit 1 |