Unix build: Add support for environment variable

EXTRA_LDFLAGS_SHLIB, which allows the user to add to the hard-coded
ld flags specified for DSOs.  Compare with the existing LDFLAGS_SHLIB
environment variable, which allows the user to completely replace the
hard-coded ld flags specified for DSOs.

Reviewed by:	Jim Jagielski, Justin Erenkrantz

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@98737 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/CHANGES b/src/CHANGES
index 6dd458bf517b2e5d2cf3486118cbd7f97557b370..706783308b9594ebf954a5ed40851b56e7e9682b 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,11 @@
 Changes with Apache 1.3.28
 
+  *) Unix build: Add support for environment variable 
+     EXTRA_LDFLAGS_SHLIB, which allows the user to add to the hard-coded 
+     ld flags specified for DSOs.  Compare with the existing LDFLAGS_SHLIB 
+     environment variable, which allows the user to completely replace the 
+     hard-coded ld flags specified for DSOs.  [Jeff Trawick]
+
   *) mod_auth_digest no longer tries to guess AuthDigestDomain, if it's
      not specified. Now it assumes "/" as already documented. PR 16937.
      [André Malo]

diff --git a/src/Configure b/src/Configure
index f05ab7e158818f3621e8a14329084a318844b42e..c166330065fc29db0596f5adf9c7ad13e48cf187 100755 (executable)
--- a/src/Configure
+++ b/src/Configure
@@ -1999,7 +1999,8 @@ if [ "x$using_shlib" = "x1" ] ; then
        echo "LD_SHLIB=$LD_SHLIB" >> Makefile.config
     fi
     if [ "x$TLDFLAGS_SHLIB" = "x" ]; then
-       echo "LDFLAGS_SHLIB=$LDFLAGS_SHLIB" >> Makefile.config
+       echo "EXTRA_LDFLAGS_SHLIB=$EXTRA_LDFLAGS_SHLIB" >> Makefile.config
+       echo "LDFLAGS_SHLIB=$LDFLAGS_SHLIB $EXTRA_LDFLAGS_SHLIB" >> Makefile.config
     fi
     if [ "x$TLDFLAGS_SHLIB_EXPORT" = "x" ]; then
        echo "LDFLAGS_SHLIB_EXPORT=$LDFLAGS_SHLIB_EXPORT" >> Makefile.config