From 49efa827aa3bbb9cab7c9eb62dcd0916e441f447 Mon Sep 17 00:00:00 2001
From: Stefan Fritsch <sf@apache.org>
Date: Sun, 27 May 2012 20:39:14 +0000
Subject: [PATCH] Make apxs use LDFLAGS from config_vars.mk in addition to
 CFLAGS and CPPFLAGS

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1343094 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES         | 3 +++
 support/apxs.in | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 34f7f5e17f..3cdb5831ea 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) apxs: Use LDFLAGS from config_vars.mk in addition to CFLAGS and CPPFLAGS.
+     [Stefan Fritsch]
+
   *) mpm_event: Fix handling of MaxConnectionsPerChild. [Stefan Fritsch]
 
   *) suexec: Add --enable-suexec-capabilites support on Linux, to use
diff --git a/support/apxs.in b/support/apxs.in
index 39ff16cd3c..8bdc2daca0 100644
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -39,6 +39,8 @@ my $CFG_TARGET     = get_vars("progname");
 my $CFG_SYSCONFDIR = get_vars("sysconfdir");
 my $CFG_CFLAGS     = join ' ', map { get_vars($_) }
   qw(SHLTCFLAGS CFLAGS NOTEST_CPPFLAGS EXTRA_CPPFLAGS EXTRA_CFLAGS);
+my $CFG_LDFLAGS    = join ' ', map { get_vars($_) }
+  qw(LDFLAGS NOTEST_LDFLAGS SH_LDFLAGS);
 my $includedir     = get_vars("includedir");
 my $CFG_INCLUDEDIR = eval qq("$includedir");
 my $CFG_CC         = get_vars("CC");
@@ -448,6 +450,7 @@ if ($opt_c) {
         $opt .= " -l$opt_l";
     }
 
+    my $ldflags = "$CFG_LDFLAGS";
     if ($opt_p == 1) {
         
         my $apr_libs=`$apr_config --cflags --ldflags --link-libtool --libs`;
@@ -466,7 +469,7 @@ if ($opt_c) {
         $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";
     }
 
-    push(@cmds, "$libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt $lo");
+    push(@cmds, "$libtool $ltflags --mode=link $CFG_CC $ldflags -o $dso_file $opt $lo");
 
     #   execute the commands
     &execute_cmds(@cmds);
-- 
2.40.0