Merge r657354, r657459 from trunk:

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

Revert unintentional changes in r657354

Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@721832 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 28ad5f08429c5b236ed6d80d97e5106b5cde855b..8c3af59b3851995e0c754969132d769f115a4ef8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.11
 
+  *) configure: Don't reject libtool 2.x
+     PR 44817 [Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA gmail.com>]
+
   *) mod_autoindex: add configuration option to insert string
      in HTML HEAD (IndexHeadInsert). [Nick Kew]
 

diff --git a/STATUS b/STATUS
index 04f9f88dbd521ebdbebeb3ab9a798b4828a9c7dd..39067ee9867cc98b69853683120466b043fc455b 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -86,12 +86,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * configure.in: Don't reject libtool 2.x
-    PR 44817
-    http://svn.apache.org/viewvc?view=rev&revision=657354
-    http://svn.apache.org/viewvc?view=rev&revision=657459
-    +1: niq, rpluem, jim
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/configure.in b/configure.in
index 716efb89652c9846c7ea5b95a415844cbe95828b..4602c67ac05d709b6c577982a2e3d9a6fd69e921 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -235,7 +235,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"