From: William A. Rowe Jr <wrowe@apache.org>
Date: Mon, 16 May 2005 12:59:34 +0000 (+0000)
Subject:   Did not belong in r170253; evalute this patch seperately from
X-Git-Tag: 2.1.5~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c8f20855899fef282f6fbaa2f4954ba3748a3d6;p=thirdparty%2Fapache%2Fhttpd.git

  Did not belong in r170253; evalute this patch seperately from
  the win32 /Oy- patch.  Will recommit for seperate discussion.

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

diff --git a/support/apxs.in b/support/apxs.in
index f1a5a3c900c..c0314d477f9 100644
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -468,15 +468,13 @@ if ($opt_i or $opt_e) {
     my @cmds = ();
     my $f;
     foreach $f (@args) {
-        #  ack all potential gcc, hp/ux, win32+os2+aix and os/x extensions
-        if ($f !~ m#(\.so$|\.la$|\.sl$|\.dll$|\.dylib$|)#) {
+        if ($f !~ m#(\.so$|\.la$)#) {
             error("file $f is not a shared object");
             exit(1);
         }
         my $t = $f;
         $t =~ s|^.+/([^/]+)$|$1|;
-        #  use .so unambigiously for installed shared library modules
-        $t =~ s|\.[^./\\]+$|\.so|;
+        $t =~ s|\.la$|\.so|;
         if ($opt_i) {
 	    push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
                  "$libtool' $f $CFG_LIBEXECDIR");