From: Joe Orton <jorton@apache.org>
Date: Tue, 28 Nov 2017 09:31:00 +0000 (+0000)
Subject: * support/Makefile.in, acinclude.m4: Add OpenSSL libraries at the end of the
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df2cdee6e85a15c2be1c701e8a764527aed5b85b;p=apache

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


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

diff --git a/acinclude.m4 b/acinclude.m4
index 336f5ab697..46c98d3ee7 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -600,9 +600,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 65b77c0e4f..4836cc2e57 100644
--- 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