diff options
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | STATUS | 7 | ||||
| -rw-r--r-- | acinclude.m4 | 1 | ||||
| -rw-r--r-- | build/rules.mk | 6 | ||||
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | modules/aaa/config.m4 | 2 | ||||
| -rw-r--r-- | modules/cache/config.m4 | 2 | ||||
| -rw-r--r-- | modules/echo/config.m4 | 2 | ||||
| -rw-r--r-- | modules/filters/config.m4 | 2 | ||||
| -rw-r--r-- | modules/generators/config5.m4 | 2 | ||||
| -rw-r--r-- | modules/metadata/config.m4 | 2 |
11 files changed, 21 insertions, 17 deletions
@@ -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>] @@ -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 bdc2be50c1..ee96803052 100644 --- 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 905d7e4a26..f050bbc89a 100644 --- 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 c5bec2f6ad..3f08b1ad84 100644 --- 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 b8b359f9b1..e425da32b3 100644 --- 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 c4ad083075..9eabf54127 100644 --- 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 504a89c44a..234a7d5e9a 100644 --- 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 10fc0231ef..4fa901d01a 100644 --- 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 4e4379a681..e334bfed41 100644 --- 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 d1bfb56d5b..cd08b42876 100644 --- 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 |