Fix httpd's definition of LTFLAGS to be consistent with that of apr

and apr-util, allow it to be overridden by the configure command-line
(default="--silent") and introduce LT_LDFLAGS to replace what we were
formally abusing as LTFLAGS.

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

diff --git a/CHANGES b/CHANGES
index 85112b5f05fe971415cd6cd2e3b3eec26bceefde..f3df730c6c8c1615937147229c71d9d06da80472 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 2.0.18-dev
 
+  *) Fix httpd's definition of LTFLAGS to be consistent with that of apr
+     and apr-util, allow it to be overridden by the configure command-line
+     (default="--silent") and introduce LT_LDFLAGS to replace what we were
+     formally abusing as LTFLAGS.  [Roy Fielding]
+
   *) Clean up the reporting of incorrect closing container tags.
      [Barrie Slaymaker <barries@slaysys.com>]
 

diff --git a/STATUS b/STATUS
index 7ea46b18e4e0edfce86fba3cfd1ad16a9f0ee392..5511eb057b6ddbfc0bca2e186a3eb6d4baf549ce 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                             -*-text-*-
-Last modified at [$Date: 2001/05/07 16:59:05 $]
+Last modified at [$Date: 2001/05/12 03:48:29 $]
 
 Release:
 
@@ -310,11 +310,6 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
     * (possibly) port the bug fix for PR 6942 (segv when LoadModule is put
       into a VirtualHost container) to 2.0.
 
-    * the LTFLAGS = -export-dynamic in the config.m4 is wrong. it is getting
-      added multiple times during the config process. The -export-dynamic
-      should probably move into build/special.mk (the make file used for
-      building Apache modules).
-
     * shift stuff to mod_core.h
 
     * APR-ize resolver stuff in mod_unique_id (Jeff volunteers)

diff --git a/acinclude.m4 b/acinclude.m4
index bdc2be50c156defa3d1b1437f6b2d42f1c879edd..ee96803052a36a76b04de37457a5bd7c47711eba 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -56,6 +56,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(CXXFLAGS)
   APACHE_SUBST(LTFLAGS)
   APACHE_SUBST(LDFLAGS)
+  APACHE_SUBST(LT_LDFLAGS)
   APACHE_SUBST(SH_LDFLAGS)
   APACHE_SUBST(HTTPD_LDFLAGS)
   APACHE_SUBST(LIBS)

diff --git a/build/rules.mk b/build/rules.mk
index 905d7e4a260271a0d054eae56bfc5e57cc92942b..f050bbc89a133a0190d52204d650f0ce9c811d7c 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -81,9 +81,9 @@ LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $< && touch $@
 
 # Link-related commands
 
-LINK     = $(LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(ALL_LDFLAGS) -o $@
-SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) -o $@
-MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LTFLAGS) $(ALL_LDFLAGS) -o $@
+LINK     = $(LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
+SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) -o $@
+MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
 
 # Cross compile commands
 

diff --git a/configure.in b/configure.in
index c5bec2f6ad12d2b43013c0b4374bb7af600760c3..3f08b1ad84c287ace14e458df71aea5b6cd597ef 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -103,8 +103,11 @@ case "$host_alias" in
       other_targets="$other_targets os2core"
       ;;
   *)
-      LIBTOOL='$(SHELL) $(top_builddir)/srclib/apr/libtool --silent'
-      SH_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool --silent'
+      if test "x$LTFLAGS" = "x"; then
+          LTFLAGS='--silent'
+      fi
+      LIBTOOL='$(SHELL) $(top_builddir)/srclib/apr/libtool $(LTFLAGS)'
+      SH_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool $(LTFLAGS)'
       ;;
 esac
 

diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index b8b359f9b15ea5dadc018e198e0113f5077b976d..e425da32b30664a0d15fa4a5f6e69c7b5b2b2222 100644 (file)
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -16,6 +16,6 @@ APACHE_MODULE(auth_db, DB-based access databases, , , , [
 
 APACHE_MODULE(auth_digest, RFC2617 Digest authentication, , , most)
 
-APR_ADDTO(LTFLAGS,-export-dynamic)
+APR_ADDTO(LT_LDFLAGS,-export-dynamic)
 
 APACHE_MODPATH_FINISH

diff --git a/modules/cache/config.m4 b/modules/cache/config.m4
index c4ad08307536e6bae839fdbdff3b52f1e2abc633..9eabf541275ce94128eb1f3048fbe946c102dc24 100644 (file)
--- a/modules/cache/config.m4
+++ b/modules/cache/config.m4
@@ -6,6 +6,6 @@ APACHE_MODPATH_INIT(cache)
 
 APACHE_MODULE(file_cache, File cache, , , no)
 
-APR_ADDTO(LTFLAGS,-export-dynamic)
+APR_ADDTO(LT_LDFLAGS,-export-dynamic)
 
 APACHE_MODPATH_FINISH

diff --git a/modules/echo/config.m4 b/modules/echo/config.m4
index 504a89c44a89cd0b602f7eeac23bbcbf7538cffa..234a7d5e9af4a79a0ffe1ae48fbcbaa9e1f70d66 100644 (file)
--- a/modules/echo/config.m4
+++ b/modules/echo/config.m4
@@ -6,6 +6,6 @@ APACHE_MODPATH_INIT(echo)
 
 APACHE_MODULE(echo, ECHO server, , , no)
 
-APR_ADDTO(LTFLAGS,-export-dynamic)
+APR_ADDTO(LT_LDFLAGS,-export-dynamic)
 
 APACHE_MODPATH_FINISH

diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
index 10fc0231ef17096a8b83e4a54f49e8b9fc3c07c2..4fa901d01acdacafbe6ca3d2313e20013b74634c 100644 (file)
--- a/modules/filters/config.m4
+++ b/modules/filters/config.m4
@@ -6,6 +6,6 @@ APACHE_MODPATH_INIT(filters)
 
 APACHE_MODULE(include, Server Side Includes, , , yes)
 
-APR_ADDTO(LTFLAGS,-export-dynamic)
+APR_ADDTO(LT_LDFLAGS,-export-dynamic)
 
 APACHE_MODPATH_FINISH

diff --git a/modules/generators/config5.m4 b/modules/generators/config5.m4
index 4e4379a6817eeb410c4f364491b3046e55bdb205..e334bfed411ed9649ea97ec9b82d4614edadcaa7 100644 (file)
--- a/modules/generators/config5.m4
+++ b/modules/generators/config5.m4
@@ -11,7 +11,7 @@ APACHE_MODULE(info, server information, , , most)
 APACHE_MODULE(suexec, set uid and gid for spawned processes, , , no, [
               other_targets=suexec ] )
 
-APR_ADDTO(LTFLAGS,-export-dynamic)
+APR_ADDTO(LT_LDFLAGS,-export-dynamic)
 
 if test "$apache_cv_mpm" = "threaded" -o "$apache_cv_mpm" = "perchild"; then
 # if we are using a threaded MPM, we will get better performance with

diff --git a/modules/metadata/config.m4 b/modules/metadata/config.m4
index d1bfb56d5b9ac4a9ba2ca21b464913b55a6401b7..cd08b428765f5a108f9d40a6c611601d2565c317 100644 (file)
--- a/modules/metadata/config.m4
+++ b/modules/metadata/config.m4
@@ -18,6 +18,6 @@ APACHE_MODULE(usertrack, user-session tracking, , , , [
 APACHE_MODULE(unique_id, per-request unique ids)
 APACHE_MODULE(setenvif, basing ENV vars on headers, , , yes)
 
-APR_ADDTO(LTFLAGS,-export-dynamic)
+APR_ADDTO(LT_LDFLAGS,-export-dynamic)
 
 APACHE_MODPATH_FINISH