rbb 00/02/17 14:32:30
Modified:src/build rules.mk
src/modules/standard config.m4
src/os config.m4
Log:
Enable dynamic module support on Linux. This should work on any LIBTOOL
based system, but YMMV.
Revision ChangesPath
1.3 +2 -2 apache-2.0/src/build/rules.mk
Index: rules.mk
===
RCS file: /home/cvs/apache-2.0/src/build/rules.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rules.mk 2000/02/16 00:55:51 1.2
+++ rules.mk 2000/02/17 22:32:29 1.3
@@ -21,7 +21,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
##
-# $Id: rules.mk,v 1.2 2000/02/16 00:55:51 rbb Exp $
+# $Id: rules.mk,v 1.3 2000/02/17 22:32:29 rbb Exp $
#
include $(DEPTH)/config_vars.mk
@@ -31,7 +31,7 @@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS)
$(EXTRA_CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES)
$(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS)
-o $@
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(LTFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
$(LDFLAGS) -o $@
mkinstalldirs = $(abs_srcdir)/helpers/mkdir.sh
INSTALL = $(abs_srcdir)/helpers/install.sh -c
INSTALL_DATA = $(INSTALL) -m 644
1.12 +5 -0 apache-2.0/src/modules/standard/config.m4
Index: config.m4
===
RCS file: /home/cvs/apache-2.0/src/modules/standard/config.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- config.m4 2000/01/11 13:11:11 1.11
+++ config.m4 2000/02/17 22:32:30 1.12
@@ -51,5 +51,10 @@
APACHE_CHECK_STANDARD_MODULE(echo, , yes)
APACHE_MODPATH_FINISH
+
+if test "$sharedobjs" = "yes"; then
+LIBS="$LIBS -ldl"
+LTFLAGS="$LTFLAGS -export-dynamic"
+fi
APACHE_SUBST(STANDARD_LIBS)
1.5 +2 -1 apache-2.0/src/os/config.m4
Index: config.m4
===
RCS file: /home/cvs/apache-2.0/src/os/config.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config.m4 2000/01/26 07:51:43 1.4
+++ config.m4 2000/02/17 22:32:30 1.5
@@ -1,6 +1,7 @@
AC_MSG_CHECKING(for target platform)
-PLATFORM=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`
+#PLATFORM=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`
+PLATFORM=`$ac_config_guess`
case "$PLATFORM" in
*beos*)