From: Stefan Fritsch <sf@apache.org>
Date: Wed, 16 Feb 2011 22:38:52 +0000 (+0000)
Subject: Fix link errors for crypt() with --no-add-needed/--no-copy-dt-needed-entries,
X-Git-Tag: 2.3.11~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0db0515ac74d10bfabf7bfaa04159c55ddcf369f;p=thirdparty%2Fapache%2Fhttpd.git

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


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

diff --git a/configure.in b/configure.in
index 0f4142435f4..6539f40cf79 100644
--- a/configure.in
+++ b/configure.in
@@ -414,6 +414,13 @@ MATH_LIBS="$LIBS"
 APACHE_SUBST(MATH_LIBS)
 LIBS="$saved_LIBS"
 
+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 3425ffe7a6e..92997b865ff 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) $(MATH_LIBS)