httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r170383 - /httpd/httpd/trunk/support/apxs.in
Date Mon, 16 May 2005 13:03:35 GMT
Author: wrowe
Date: Mon May 16 06:03:35 2005
New Revision: 170383

URL: http://svn.apache.org/viewcvs?rev=170383&view=rev
Log:

  One issue I repeatedly have with 3rd party module builds is that
  they may choose to build a platform-default library with the usual
  platform-default extension, as part of the compilation process.

  Modules built on HP/UX with the .sl extension, on OSX with .dylib,
  or on OS2 or Win32 with .dll are perfectly legitimate loadable
  modules, but don't pass muster with apxs.

  This patch allows any of the common source library extensions to
  be passed in, but makes .so the explicit target.  The behavior
  already works for .la origin files with an .so target name.

Modified:
    httpd/httpd/trunk/support/apxs.in

Modified: httpd/httpd/trunk/support/apxs.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/support/apxs.in?rev=170383&r1=170382&r2=170383&view=diff
==============================================================================
--- httpd/httpd/trunk/support/apxs.in (original)
+++ httpd/httpd/trunk/support/apxs.in Mon May 16 06:03:35 2005
@@ -468,13 +468,15 @@
     my @cmds = ();
     my $f;
     foreach $f (@args) {
-        if ($f !~ m#(\.so$|\.la$)#) {
+        #  ack all potential gcc, hp/ux, win32+os2+aix and os/x extensions
+        if ($f !~ m#(\.so$|\.la$|\.sl$|\.dll$|\.dylib$|)#) {
             error("file $f is not a shared object");
             exit(1);
         }
         my $t = $f;
         $t =~ s|^.+/([^/]+)$|$1|;
-        $t =~ s|\.la$|\.so|;
+        #  use .so unambigiously for installed shared library modules
+        $t =~ s|\.[^./\\]+$|\.so|;
         if ($opt_i) {
 	    push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
                  "$libtool' $f $CFG_LIBEXECDIR");



Mime
View raw message