From: Jeff Trawick <trawick@apache.org>
Date: Wed, 12 Dec 2001 19:39:55 +0000 (+0000)
Subject: change Apache/apr/apr-util to use run-time linking on AIX
X-Git-Tag: 2.0.30~228
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f730a1a642e4c588b6563333b17ed4a2130f46e;p=thirdparty%2Fapache%2Fhttpd.git

change Apache/apr/apr-util to use run-time linking on AIX

currently, a kludge (-uXML_Parse) is needed to get a reference to expat
in the Apache executable programs; I think this is related to the fact
that expat libtool is getting generated a little differently than apr
libtool and is choosing to build a different flavor of shared library


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

diff --git a/acinclude.m4 b/acinclude.m4
index 2057f2b441d..a40255ce37e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -70,6 +70,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(LT_LDFLAGS)
   APACHE_SUBST(SH_LDFLAGS)
   APACHE_SUBST(HTTPD_LDFLAGS)
+  APACHE_SUBST(UTIL_LDFLAGS)
   APACHE_SUBST(LIBS)
   APACHE_SUBST(DEFS)
   APACHE_SUBST(INCLUDES)
diff --git a/configure.in b/configure.in
index a6b2b6ba3da..1cb32b5bd9a 100644
--- a/configure.in
+++ b/configure.in
@@ -275,13 +275,13 @@ if test "$apache_need_shared" = "yes"; then
   shared_build="shared-build"
 fi
 
-dnl enable_so tells is if *any* modules can be built as DSOs
+dnl enable_so tells us if *any* modules can be built as DSOs
 
 if test "$enable_so" = "yes"; then
   case $host in
     *-ibm-aix*)
-      HTTPD_LDFLAGS="$HTTPD_LDFLAGS -Wl,-bE:$abs_builddir/server/httpd.exp"
-      SH_LDFLAGS="$SH_LDFLAGS -Wl,-bI:$abs_builddir/server/httpd.exp -Wl,-bI:$abs_builddir/srclib/apr/apr.exp -Wl,-bI:$abs_builddir/srclib/apr-util/aprutil.exp"
+      HTTPD_LDFLAGS="$HTTPD_LDFLAGS -Wl,-uXML_Parse -Wl,-bE:$abs_builddir/server/httpd.exp"
+      UTIL_LDFLAGS="$UTIL_LDFLAGS -Wl,-uXML_Parse"
       ;;
     *beos)
       SH_LDFLAGS='$(top_builddir)/_APP_'
diff --git a/support/Makefile.in b/support/Makefile.in
index c6ea832d872..c3475bf1fa9 100644
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -4,7 +4,7 @@ DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
 PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid
 TARGETS  = $(PROGRAMS)
 
-PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
+PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
 PROGRAM_DEPENDENCIES = \
 	$(top_builddir)/srclib/apr-util/libaprutil.la \
 	$(top_builddir)/srclib/apr/libapr.la