Commit 914a7ccf authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent 3bb82b29

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- 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]

STATUS

+0 −6
Changes for STATUS: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -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 ]

configure.in

+1 −1
Changes for configure.in: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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"