You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fi...@apache.org on 2001/05/12 05:48:32 UTC
cvs commit: httpd-2.0/modules/metadata config.m4
fielding 01/05/11 20:48:31
Modified: . CHANGES STATUS acinclude.m4 configure.in
build rules.mk
modules/aaa config.m4
modules/cache config.m4
modules/echo config.m4
modules/filters config.m4
modules/generators config5.m4
modules/metadata config.m4
Log:
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.
Revision Changes Path
1.196 +5 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- CHANGES 2001/05/11 23:33:43 1.195
+++ CHANGES 2001/05/12 03:48:29 1.196
@@ -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 <ba...@slaysys.com>]
1.232 +1 -6 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- STATUS 2001/05/07 16:59:05 1.231
+++ STATUS 2001/05/12 03:48:29 1.232
@@ -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:
@@ -309,11 +309,6 @@
* (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
1.87 +1 -0 httpd-2.0/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- acinclude.m4 2001/05/11 18:18:04 1.86
+++ acinclude.m4 2001/05/12 03:48:30 1.87
@@ -56,6 +56,7 @@
APACHE_SUBST(CXXFLAGS)
APACHE_SUBST(LTFLAGS)
APACHE_SUBST(LDFLAGS)
+ APACHE_SUBST(LT_LDFLAGS)
APACHE_SUBST(SH_LDFLAGS)
APACHE_SUBST(HTTPD_LDFLAGS)
APACHE_SUBST(LIBS)
1.152 +5 -2 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- configure.in 2001/05/12 01:37:27 1.151
+++ configure.in 2001/05/12 03:48:30 1.152
@@ -103,8 +103,11 @@
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
1.56 +3 -3 httpd-2.0/build/rules.mk
Index: rules.mk
===================================================================
RCS file: /home/cvs/httpd-2.0/build/rules.mk,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- rules.mk 2001/05/11 19:44:42 1.55
+++ rules.mk 2001/05/12 03:48:30 1.56
@@ -81,9 +81,9 @@
# 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
1.42 +1 -1 httpd-2.0/modules/aaa/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/aaa/config.m4,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- config.m4 2001/04/29 05:24:09 1.41
+++ config.m4 2001/05/12 03:48:30 1.42
@@ -16,6 +16,6 @@
APACHE_MODULE(auth_digest, RFC2617 Digest authentication, , , most)
-APR_ADDTO(LTFLAGS,-export-dynamic)
+APR_ADDTO(LT_LDFLAGS,-export-dynamic)
APACHE_MODPATH_FINISH
1.5 +1 -1 httpd-2.0/modules/cache/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/cache/config.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config.m4 2001/04/29 05:24:09 1.4
+++ config.m4 2001/05/12 03:48:31 1.5
@@ -6,6 +6,6 @@
APACHE_MODULE(file_cache, File cache, , , no)
-APR_ADDTO(LTFLAGS,-export-dynamic)
+APR_ADDTO(LT_LDFLAGS,-export-dynamic)
APACHE_MODPATH_FINISH
1.5 +1 -1 httpd-2.0/modules/echo/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/echo/config.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config.m4 2001/04/29 05:24:09 1.4
+++ config.m4 2001/05/12 03:48:31 1.5
@@ -6,6 +6,6 @@
APACHE_MODULE(echo, ECHO server, , , no)
-APR_ADDTO(LTFLAGS,-export-dynamic)
+APR_ADDTO(LT_LDFLAGS,-export-dynamic)
APACHE_MODPATH_FINISH
1.6 +1 -1 httpd-2.0/modules/filters/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/filters/config.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config.m4 2001/04/29 05:24:09 1.5
+++ config.m4 2001/05/12 03:48:31 1.6
@@ -6,6 +6,6 @@
APACHE_MODULE(include, Server Side Includes, , , yes)
-APR_ADDTO(LTFLAGS,-export-dynamic)
+APR_ADDTO(LT_LDFLAGS,-export-dynamic)
APACHE_MODPATH_FINISH
1.7 +1 -1 httpd-2.0/modules/generators/config5.m4
Index: config5.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/config5.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config5.m4 2001/04/29 05:24:09 1.6
+++ config5.m4 2001/05/12 03:48:31 1.7
@@ -11,7 +11,7 @@
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
1.5 +1 -1 httpd-2.0/modules/metadata/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/metadata/config.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config.m4 2001/04/29 05:24:10 1.4
+++ config.m4 2001/05/12 03:48:31 1.5
@@ -18,6 +18,6 @@
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