Commit 5e0dbb9f authored by Joe Orton's avatar Joe Orton
Browse files

Merge r1816534 from trunk: 

* support/Makefile.in, acinclude.m4: Add OpenSSL libraries at the end of the
  ab link line, not the start.

[too boring for CHANGES]

Submitted by: jorton
Reviewed by: jorton, jim, ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1823624 13f79535-47bb-0310-9956-ffa450edef68
parent e2501860

acinclude.m4

+2 −2
Original line number Diff line number Diff line
@@ -574,9 +574,9 @@ AC_DEFUN([APACHE_CHECK_OPENSSL],[ 
      ap_openssl_libs="${ap_openssl_libs:--lssl -lcrypto} `$apr_config --libs`"

      APR_ADDTO(MOD_LDFLAGS, [$ap_openssl_libs])

      APR_ADDTO(LIBS, [$ap_openssl_libs])

      APR_SETVAR(ab_LDFLAGS, [$MOD_LDFLAGS])

      APR_SETVAR(ab_LIBS, [$MOD_LDFLAGS])

      APACHE_SUBST(ab_CFLAGS)

      APACHE_SUBST(ab_LDFLAGS)

      APACHE_SUBST(ab_LIBS)



      dnl Run library and function checks

      liberrors=""

support/Makefile.in

+2 −2
Original line number Diff line number Diff line
@@ -60,12 +60,12 @@ htdbm: $(htdbm_OBJECTS) 
	$(LINK) $(htdbm_LTFLAGS) $(htdbm_OBJECTS) $(PROGRAM_LDADD) $(CRYPT_LIBS)



ab_OBJECTS = ab.lo

ab_LDADD = $(PROGRAM_LDADD) $(MATH_LIBS)

ab_LDADD = $(PROGRAM_LDADD) $(MATH_LIBS) $(ab_LIBS)

ab.lo: ab.c

	$(LIBTOOL) --mode=compile $(CC) $(ab_CFLAGS) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \

	    $(ALL_INCLUDES) $(PICFLAGS) $(LTCFLAGS) -c $< && touch $@

ab: $(ab_OBJECTS)

	$(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(ab_LDFLAGS) $(PILDFLAGS) \

	$(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(PILDFLAGS) \

	    $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ $(ab_LTFLAGS) $(ab_OBJECTS) $(ab_LDADD)



checkgid_OBJECTS = checkgid.lo