svn commit: r1094029 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS configure.in support/Makefile.in

[sf...@apache.org]

Author: sf
Date: Sat Apr 16 19:09:47 2011
New Revision: 1094029

URL: http://svn.apache.org/viewvc?rev=1094029&view=rev
Log:
Backport r1071426:

    Fix link errors for crypt() with --no-add-needed/--no-copy-dt-needed-entries,
    which is the default for the gold linker.

Reviewed by: sf, trawick, wrowe

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/configure.in
    httpd/httpd/branches/2.2.x/support/Makefile.in

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1094029&r1=1094028&r2=1094029&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Sat Apr 16 19:09:47 2011
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.18
 
+  *) configure: Fix htpasswd/htdbm libcrypt link errors with some newer
+     linkers. [Stefan Fritsch]
+
   *) MinGW build improvements.  PR 49535.  [John Vandenberg 
      <jayvdb gmail.com>, Jeff Trawick]
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1094029&r1=1094028&r2=1094029&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sat Apr 16 19:09:47 2011
@@ -91,11 +91,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * configure: Fix linking htpasswd/htdbm with crypt
-     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1071426
-     2.2.x patch: Trunk version of patch works with fuzz
-     +1: sf, trawick, wrowe
-
   * mod_win32: Add shebang check so that .vbs scripts can work as CGI.
      Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1054347
      2.2.x patch: Trunk version of patch works with offset  

Modified: httpd/httpd/branches/2.2.x/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/configure.in?rev=1094029&r1=1094028&r2=1094029&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/configure.in (original)
+++ httpd/httpd/branches/2.2.x/configure.in Sat Apr 16 19:09:47 2011
@@ -401,6 +401,13 @@ AC_C_CONST
 dnl ## Check for library functions
 AC_SEARCH_LIBS(sqrt, m)
 
+saved_LIBS="$LIBS"
+LIBS=""
+AC_SEARCH_LIBS(crypt, crypt)
+CRYPT_LIBS="$LIBS"
+APACHE_SUBST(CRYPT_LIBS)
+LIBS="$saved_LIBS"
+
 dnl See Comment #Spoon
 
 AC_CHECK_FUNCS( \

Modified: httpd/httpd/branches/2.2.x/support/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/support/Makefile.in?rev=1094029&r1=1094028&r2=1094029&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/support/Makefile.in (original)
+++ httpd/httpd/branches/2.2.x/support/Makefile.in Sat Apr 16 19:09:47 2011
@@ -31,7 +31,7 @@ install:
 
 htpasswd_OBJECTS = htpasswd.lo
 htpasswd: $(htpasswd_OBJECTS)
-	$(LINK) $(htpasswd_LTFLAGS) $(htpasswd_OBJECTS) $(PROGRAM_LDADD)
+	$(LINK) $(htpasswd_LTFLAGS) $(htpasswd_OBJECTS) $(PROGRAM_LDADD) $(CRYPT_LIBS)
 
 htdigest_OBJECTS = htdigest.lo
 htdigest: $(htdigest_OBJECTS)
@@ -47,7 +47,7 @@ logresolve: $(logresolve_OBJECTS)
 
 htdbm_OBJECTS = htdbm.lo
 htdbm: $(htdbm_OBJECTS)
-	$(LINK) $(htdbm_LTFLAGS) $(htdbm_OBJECTS) $(PROGRAM_LDADD)
+	$(LINK) $(htdbm_LTFLAGS) $(htdbm_OBJECTS) $(PROGRAM_LDADD) $(CRYPT_LIBS)
 
 ab_OBJECTS = ab.lo
 ab_LDADD = $(PROGRAM_LDADD) $(SSL_LIBS)