]> granicus.if.org Git - apache/commitdiff
Fix link errors for crypt() with --no-add-needed/--no-copy-dt-needed-entries,
authorStefan Fritsch <sf@apache.org>
Wed, 16 Feb 2011 22:38:52 +0000 (22:38 +0000)
committerStefan Fritsch <sf@apache.org>
Wed, 16 Feb 2011 22:38:52 +0000 (22:38 +0000)
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

configure.in
support/Makefile.in

index 0f4142435f40c72082342d3d0bcd355c5c0a04b2..6539f40cf794e2655aa2f57248ed2f8401610beb 100644 (file)
@@ -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( \
index 3425ffe7a6e1421cd92e2006b62a172cc0d627ec..92997b865ff8f9e342b21ff6dd9e6a74f500162f 100644 (file)
@@ -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)