Get shared builds of libapr and libaprutil, as well as Apache DSOs,

working on AIX.

Submitted by: a cast of many, reverse engineering libtool to
              figure out how to work around its oddities/limitations/
              bugs on AIX
              (Jeff Trawick coded these changes but it took a lot of
              help)

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

diff --git a/CHANGES b/CHANGES
index b1cb0bb51e71c992aa78f95445d361f89d9761c5..70983d58e72003fe8ac0b3d2173c0ccd4adef920 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.30-dev
 
+  *) Get shared builds of libapr and libaprutil, as well as Apache DSOs,
+     working on AIX.  [Aaron Bannert, Dick Dunbar <RLDunbar@pacbell.net>,
+     Gary Hook <ghook@us.ibm.com>, Victor Orlikowski, Jeff Trawick]
+
   *) Fix the handling of SSI directives in which the ">" of the
      terminating "-->" is the last byte in a file [Brian Pane]
 

diff --git a/configure.in b/configure.in
index 0230a1694dd0afca64c353a0559df60179d8e798..3c25e59aa77dc5c405da96f7baa5af9f45671b04 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -48,23 +48,15 @@ dnl work on some platforms
 
 AC_CANONICAL_SYSTEM
 
-case $host in
-    *-ibm-aix*)
-        disable_shared="--disable-shared"
-      ;;
-    *)
-        disable_shared=""
-esac
-
 orig_prefix="$prefix"
 
 echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
 
-APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --prefix=$prefix $disable_shared")
+APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --prefix=$prefix")
 
 echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
 
-APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --prefix=$prefix $disable_shared")
+APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --prefix=$prefix")
 
 echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
 
@@ -280,7 +272,7 @@ if test "$apache_need_shared" = "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"
+      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"
       ;;
     *beos)
       SH_LDFLAGS='$(top_builddir)/_APP_'

diff --git a/server/Makefile.in b/server/Makefile.in
index ad99178a108f6864bd1b4c1fc7de15af8cde57c5..08af87044a3f80660915ea424ea5abe9734bfd40 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -65,5 +65,5 @@ httpd.exp: exports.c export_vars.h
        @echo "#! ." > $@
        @echo "* This file was AUTOGENERATED at build time." >> $@
        @echo "* Please do not edit by hand." >> $@
-       $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@
-       $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.h | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' >> $@
+       $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | grep -v apr_ | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@
+       $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.h | grep -v apr_ | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' >> $@