Commit b723e08f authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

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
parent 3194ecaf

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- 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]

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -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

configure.in

+7 −0
Original line number Diff line number Diff line
@@ -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( \

support/Makefile.in

+2 −2
Original line number Diff line number Diff line
@@ -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)