Changes to get AIX DSOs working, sans APR changes.

Basically, this allows linker flags to be passed for the httpd executable
and DSOs only.

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

diff --git a/Makefile.in b/Makefile.in
index 693b463b7ffd41d95ab7b3cfa56758efdbbd7563..77e87b2fcdd28a9337a6d42ebf68bafa60ba66f1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,8 @@ SUBDIRS = srclib os server modules support
 
 PROGRAM_NAME         = $(progname)
 PROGRAM_SOURCES      = modules.c
-PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
+PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(HTTPD_LDFLAGS) \
+                       $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
 PROGRAM_DEPENDENCIES = \
   $(BUILTIN_LIBS) \
   $(MPM_LIB) \

diff --git a/acinclude.m4 b/acinclude.m4
index af5c56c1956adb08aea1208b48a129068898000e..56b5a6b02aa1a78e6d2ac2dde844bfed2e91d230 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -79,6 +79,8 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(CXXFLAGS)
   APACHE_SUBST(LTFLAGS)
   APACHE_SUBST(LDFLAGS)
+  APACHE_SUBST(SH_LDFLAGS)
+  APACHE_SUBST(HTTPD_LDFLAGS)
   APACHE_SUBST(DEFS)
   APACHE_SUBST(LIBTOOL)
   APACHE_SUBST(SHELL)

diff --git a/build/rules.mk b/build/rules.mk
index 5c909180bed90b89a9a1201f2c5d6e107075834d..55a288a527be1ca5227c88e0b151b36408cfaecd 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -71,7 +71,7 @@ LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $< && touch $@
 # Link-related commands
 
 LINK     = $(LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) $(NOTEST_LDFLAGS) -o $@
-SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(NOTEST_LDFLAGS) $(CORE_IMPLIB) -o $@
+SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(NOTEST_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) -o $@
 MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LTFLAGS) $(LDFLAGS) $(NOTEST_LDFLAGS) -o $@
 
 # Cross compile commands

diff --git a/configure.in b/configure.in
index 0f71a88191ff6f23d0733d177d9c14ed3776f734..b308f8aa8cd2a1ff49394114b3d5c2737cdc9c6c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -183,6 +183,10 @@ fi
 if test "$apache_need_shared" = "yes"; then
   $SHELL $ac_aux_dir/ltconfig --output=shlibtool --disable-static --srcdir=$ac_aux_dir --cache-file=./config.cache $ac_aux_dir/ltmain.sh
   case $PLATFORM in
+    *-ibm-aix*)
+      HTTPD_LDFLAGS="$HTTPD_LDFLAGS -Wl,-bE:$abs_srcdir/support/httpd.exp"
+      SH_LDFLAGS="$SH_LDFLAGS -Wl,-bI:$abs_srcdir/support/httpd.exp"
+      ;;
     *os390)
       CFLAGS="$CFLAGS -Wc,DLL,EXPORTALL"
       ;;