make sure mod_foo.so is installed by apxs -i

trawick · trawick · commit 71a12729acf6 · 2001-12-07T19:06:58.000Z
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
@@ -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
@@ -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
@@ -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");
         }
 

Original file line number	Diff line number	Diff line change
`@@ -469,8 +469,10 @@ if ($opt_i or $opt_e) {`
`469`	`469`	`}`
`470`	`470`	`my $t = $f;`
`471`	`471`	`$t =~ s\|^.+/([^/]+)$\|$1\|;`
	`472`	`+ $t =~ s\|\.la$\|\.so\|;`
`472`	`473`	`if ($opt_i) {`
`473`		`- push(@cmds, "$prefix/build/libtool --mode=install cp $f $CFG_LIBEXECDIR/$t");`
	`474`	`+ push(@cmds, "$prefix/build/instdso.sh SH_LIBTOOL='" .`
	`475`	`+ "$prefix/build/libtool' $f $CFG_LIBEXECDIR");`
`474`	`476`	`push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");`
`475`	`477`	`}`
`476`	`478`