Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 18371200D4A for ; Tue, 28 Nov 2017 10:31:05 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 16B28160C07; Tue, 28 Nov 2017 09:31:05 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5DB32160C01 for ; Tue, 28 Nov 2017 10:31:04 +0100 (CET) Received: (qmail 65091 invoked by uid 500); 28 Nov 2017 09:31:03 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 65082 invoked by uid 99); 28 Nov 2017 09:31:03 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Nov 2017 09:31:03 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 33BBD3A0043 for ; Tue, 28 Nov 2017 09:31:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1816534 - in /httpd/httpd/trunk: acinclude.m4 support/Makefile.in Date: Tue, 28 Nov 2017 09:31:00 -0000 To: cvs@httpd.apache.org From: jorton@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20171128093102.33BBD3A0043@svn01-us-west.apache.org> archived-at: Tue, 28 Nov 2017 09:31:05 -0000 Author: jorton Date: Tue Nov 28 09:31:00 2017 New Revision: 1816534 URL: http://svn.apache.org/viewvc?rev=1816534&view=rev Log: * support/Makefile.in, acinclude.m4: Add OpenSSL libraries at the end of the ab link line, not the start. Modified: httpd/httpd/trunk/acinclude.m4 httpd/httpd/trunk/support/Makefile.in Modified: httpd/httpd/trunk/acinclude.m4 URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?rev=1816534&r1=1816533&r2=1816534&view=diff ============================================================================== --- httpd/httpd/trunk/acinclude.m4 (original) +++ httpd/httpd/trunk/acinclude.m4 Tue Nov 28 09:31:00 2017 @@ -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="" Modified: httpd/httpd/trunk/support/Makefile.in URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/Makefile.in?rev=1816534&r1=1816533&r2=1816534&view=diff ============================================================================== --- httpd/httpd/trunk/support/Makefile.in (original) +++ httpd/httpd/trunk/support/Makefile.in Tue Nov 28 09:31:00 2017 @@ -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