apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject svn commit: r619857 - /apr/apr/trunk/build/jlibtool.c
Date Fri, 08 Feb 2008 12:20:20 GMT
Author: jerenkrantz
Date: Fri Feb  8 04:20:17 2008
New Revision: 619857

URL: http://svn.apache.org/viewvc?rev=619857&view=rev
Log:
Minor fixes to jlibtool.

* build/jlibtool.c
  (MODULE_LIB_EXT): Use .bundle on Mac.
  (parse_short_opt): Recognize -shared properly.

Modified:
    apr/apr/trunk/build/jlibtool.c

Modified: apr/apr/trunk/build/jlibtool.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/jlibtool.c?rev=619857&r1=619856&r2=619857&view=diff
==============================================================================
--- apr/apr/trunk/build/jlibtool.c (original)
+++ apr/apr/trunk/build/jlibtool.c Fri Feb  8 04:20:17 2008
@@ -55,7 +55,7 @@
 #if defined(__APPLE__)
 #  define SHELL_CMD  "/bin/sh"
 #  define DYNAMIC_LIB_EXT "dylib"
-#  define MODULE_LIB_EXT  "so"
+#  define MODULE_LIB_EXT  "bundle"
 #  define STATIC_LIB_EXT "a"
 #  define OBJECT_EXT     "o"
 #  define LIBRARIAN      "ar"
@@ -590,6 +590,14 @@
 
     if (strcmp(arg, "module") == 0) {
         cmd_data->output = otModule;
+        return 1;
+    }
+
+    if (strcmp(arg, "shared") == 0) {
+        if (cmd_data->mode == mLink) {
+            cmd_data->output = otDynamicLibraryOnly;
+        }
+        cmd_data->options.shared = share_SHARED;
         return 1;
     }
 



Mime
View raw message