make sure mod_foo.so is installed by apxs -i

also, it is the .so file that needs to be executable, not the .la file

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

diff --git a/CHANGES b/CHANGES
index 60607694219f3592b4ffe9e774b1999f34f91ccf..366b3833ca88131fa03a029fa42c990285c5ab37 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,10 +3,10 @@ Changes with Apache 2.0.30-dev
   *) Fix bug that could potentially prevent the perchild MPM from
      working with more than one vhost/uid.  [Aaron Bannert]
 
-  *) Change make install processing of DSO modules to perform special
-     handling on platforms where libtool doesn't install mod_foo.so.
-     This fixes some wonkiness on HP-UX, Tru64, and AIX which
-     prevented standard LoadModule statements from working.
+  *) Change make install and apxs -i processing of DSO modules to 
+     perform special handling on platforms where libtool doesn't install 
+     mod_foo.so.  This fixes some wonkiness on HP-UX, Tru64, and AIX 
+     which prevented standard LoadModule statements from working.
      [Jeff Trawick]
 
   *) Whenever mod_so is enabled (not just when there are DSOs for

diff --git a/Makefile.in b/Makefile.in
index 4f6e83e6a6a1ba91224b7c23cdd8f6e38661a146..b04fed64d0df02c9e4e5c5ce0c7eae8547db8ff9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -83,6 +83,7 @@ install-build:
        @sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
            config_vars.mk > $(installbuilddir)/config_vars.mk; \
        cp build/*.mk $(installbuilddir); \
+       cp build/instdso.sh $(installbuilddir); \
        cp srclib/apr/libtool $(installbuilddir); \
        if test -f srclib/apr/shlibtool; then \
            cp srclib/apr/shlibtool $(installbuilddir); \

diff --git a/support/apxs.in b/support/apxs.in
index c3e2d2e7554a4d21fc5497c99e59d57fd24f5cca..98a257a81a9227d32cf70edb288d251547504bde 100644 (file)
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -469,8 +469,10 @@ if ($opt_i or $opt_e) {
         }
         my $t = $f;
         $t =~ s|^.+/([^/]+)$|$1|;
+        $t =~ s|\.la$|\.so|;
         if ($opt_i) {
-           push(@cmds, "$prefix/build/libtool --mode=install cp $f $CFG_LIBEXECDIR/$t");
+           push(@cmds, "$prefix/build/instdso.sh SH_LIBTOOL='" .
+                 "$prefix/build/libtool' $f $CFG_LIBEXECDIR");
            push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
         }