You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bj...@apache.org on 2001/12/30 15:05:56 UTC
cvs commit: httpd-2.0/build rules.mk.in
bjh 01/12/30 06:05:56
Modified: . acinclude.m4 configure.in
build rules.mk.in
Log:
OS/2: Supply the configured libraries to the linker when building loadable
modules. This allows things like mod_deflate to build (needs -lz).
Revision Changes Path
1.107 +1 -0 httpd-2.0/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- acinclude.m4 12 Dec 2001 19:39:54 -0000 1.106
+++ acinclude.m4 30 Dec 2001 14:05:55 -0000 1.107
@@ -92,6 +92,7 @@
APACHE_SUBST(PORT)
APACHE_SUBST(CORE_IMPLIB_FILE)
APACHE_SUBST(CORE_IMPLIB)
+ APACHE_SUBST(SH_LIBS)
APACHE_SUBST(SH_LIBTOOL)
APACHE_SUBST(MK_IMPLIB)
APACHE_SUBST(INSTALL_PROG_FLAGS)
1.196 +1 -0 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- configure.in 27 Dec 2001 02:18:57 -0000 1.195
+++ configure.in 30 Dec 2001 14:05:55 -0000 1.196
@@ -103,6 +103,7 @@
echo "using aplibtool"
LIBTOOL="$abs_srcdir/srclib/apr/build/aplibtool"
SH_LIBTOOL="$LIBTOOL --shared --export-all"
+ SH_LIBS="\$(ALL_LIBS)"
CORE_IMPLIB_FILE="ApacheCoreOS2.la"
CORE_IMPLIB="$abs_srcdir/server/$CORE_IMPLIB_FILE"
MK_IMPLIB="emximp"
1.5 +1 -1 httpd-2.0/build/rules.mk.in
Index: rules.mk.in
===================================================================
RCS file: /home/cvs/httpd-2.0/build/rules.mk.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rules.mk.in 3 Sep 2001 03:27:48 -0000 1.4
+++ rules.mk.in 30 Dec 2001 14:05:55 -0000 1.5
@@ -82,7 +82,7 @@
# Link-related commands
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 $@
+SH_LINK = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@
MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
# Cross compile commands