separate logic specific to building Apache DSOs from logic needed

when anybody's DSOs should be built (e.g., via apxs) so that on a
few platforms with special issues third-party modules can be loaded
as long as mod_so is built into httpd

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

diff --git a/CHANGES b/CHANGES
index a8d536f84281e22eef5ff887358f77b099b5ffa2..f111c5d2a3992c472b105ab7e6d63d1f545e3603 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,12 @@
 Changes with Apache 2.0.30-dev
 
+  *) Whenever mod_so is enabled (not just when there are DSOs for
+     our modules), do whatever special magic is required for compiling/
+     loading third-party modules.  This allows third-party DSOs to
+     be used on an AIX build when there were no built-in modules
+     built as DSOs.  (This should help on OS/390 and BeOS as well.)
+     [Jeff Trawick]
+
   *) Allow apxs to be used to build DSOs on AIX without requiring the
      user to hard-code the list of import files.  (This should help
      on OS/390 and BeOS as well.)  [Jeff Trawick]

diff --git a/configure.in b/configure.in
index cf9451265b096f9853db7d74f93c48e30f38c64b..a6b2b6ba3dabbb869535cf4a125ed4a2a458730c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -266,10 +266,18 @@ APACHE_SUBST(SHLIBPATH_VAR)
 PRE_SHARED_CMDS='echo ""'
 POST_SHARED_CMDS='echo ""'
 
+dnl apache_need_shared tells us if Apache modules are being built as DSOs
+
 if test "$apache_need_shared" = "yes"; then
   if test -f $ac_aux_dir/ltconfig; then
     $SHELL $ac_aux_dir/ltconfig --output=shlibtool --disable-static --srcdir=$ac_aux_dir --cache-file=./config.cache $ac_aux_dir/ltmain.sh
   fi
+  shared_build="shared-build"
+fi
+
+dnl enable_so tells is 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"
@@ -284,7 +292,6 @@ if test "$apache_need_shared" = "yes"; then
       HTTPD_LDFLAGS="$HTTPD_LDFLAGS --main=$abs_srcdir/server/main.o --core-dll=$abs_srcdir/apachecore.dll"
       SH_LDFLAGS="$SH_LDFLAGS --core-dll=$abs_srcdir/apachecore.dll"
   esac
-  shared_build="shared-build"
 fi
 
 APACHE_SUBST(PRE_SHARED_CMDS)