From: Brian Havard <bjh@apache.org>
Date: Sun, 30 Dec 2001 14:05:55 +0000 (+0000)
Subject: OS/2: Supply the configured libraries to the linker when building loadable
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=079029cfe64bd40512d66e41e55715f08a3d2061;p=apache

OS/2: Supply the configured libraries to the linker when building loadable
modules. This allows things like mod_deflate to build (needs -lz).


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

diff --git a/acinclude.m4 b/acinclude.m4
index a40255ce37..ddde36bafb 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -92,6 +92,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   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)
diff --git a/build/rules.mk.in b/build/rules.mk.in
index 23c1c3b2b6..e0086ddb77 100644
--- a/build/rules.mk.in
+++ b/build/rules.mk.in
@@ -82,7 +82,7 @@ LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) @LTCFLAGS@ -c $< && to
 # 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
diff --git a/configure.in b/configure.in
index 6773e888f2..80dbde362b 100644
--- a/configure.in
+++ b/configure.in
@@ -103,6 +103,7 @@ case $host in
       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"