From: Nick Kew <niq@apache.org>
Date: Sat, 17 May 2008 13:34:58 +0000 (+0000)
Subject: configure: Don't reject libtool 2.x
X-Git-Tag: 2.3.0~620
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=def48d549214ee91e7976e689eda51bb39b9c4c5;p=apache

configure: Don't reject libtool 2.x
PR 44817


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@657354 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index e09c88b0d8..2045f52af9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) configure: Don't reject libtool 2.x
+     PR 44817 [Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA gmail.com>]
+
   *) suexec: When group is given as a numeric gid, validate it by looking up
      the actual group name such that the name can be used in log entries.
      PR 7862 [<y-koga apache.or.jp>, Leif W <warp-9.9 usa.net>]
diff --git a/configure.in b/configure.in
index 10450911b4..ca4f5dc92e 100644
--- a/configure.in
+++ b/configure.in
@@ -69,7 +69,7 @@ apr_version=1
 
 if test "x$with_included_apr" = "xyes"; then
    apr_found=reconfig
-   apr_config="$srcdir/srclib/apr/apr-${apr_version}-config"
+   apr_config="./srclib/apr/apr-${apr_version}-config"
 else 
    APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, ${apr_version})
 fi
@@ -106,7 +106,7 @@ apu_version=1
 
 if test "x$with_included_apr" = "xyes"; then
    apu_found=reconfig
-   apu_config="${srcdir}/srclib/apr-util/apu-${apu_version}-config"
+   apu_config="./srclib/apr-util/apu-${apu_version}-config"
 else 
    APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 1, ${apu_version})
 fi
@@ -237,7 +237,7 @@ case $host in
       LIBTOOL="$my_libtool \$(LTFLAGS)"
       libtoolversion=`$my_libtool --version`
       case $libtoolversion in
-          *1.[[45]]*)
+          *1.[[45]]* | *[[2-9]].[[0-9]]*)
               SH_LIBTOOL='$(LIBTOOL)'
               SHLTCFLAGS="-prefer-pic"
               LTCFLAGS="-prefer-non-pic -static"