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

diff --git a/acinclude.m4 b/acinclude.m4
index 90ca74f6fa64092954614fb48bab18703a12d558..ce1d637dd9a040f9a65e641c2fe34a6eacb16f8d 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -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=""

diff --git a/support/Makefile.in b/support/Makefile.in
index 745d86c2c81c46c75322957cff00d57a38dbec6f..c7d76876125b8d7b95785c47ea9731d785932015 100644 (file)
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -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