From 0a36639ec0366ff9f1b085dd44ca6e0cb7afdf2b Mon Sep 17 00:00:00 2001
From: Stefan Fritsch <sf@apache.org>
Date: Sat, 16 Apr 2011 19:09:47 +0000
Subject: 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1094029 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES             | 3 +++
 STATUS              | 5 -----
 configure.in        | 7 +++++++
 support/Makefile.in | 4 ++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 75a7df8717..736dfe9aa3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 
diff --git a/STATUS b/STATUS
index 06985bc308..b383640138 100644
--- a/STATUS
+++ b/STATUS
@@ -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  
diff --git a/configure.in b/configure.in
index d240cfa02f..0557b4addb 100644
--- a/configure.in
+++ b/configure.in
@@ -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( \
diff --git a/support/Makefile.in b/support/Makefile.in
index aaaf6f4ab4..85aff3403b 100644
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -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)
-- 
cgit v1.2.1