Changeset 2534 for zzuf/trunk/src/zzuf.cTweet

Timestamp:

Jul 16, 2008, 11:52:08 AM (13 years ago)

Author:

Sam Hocevar

Message:

• zzuf.c: retrieve library object name from libtool's .la file so we don't need to hardcode .so, .sl, .dylib etc. for various platforms.

File:

• zzuf/trunk/src/zzuf.c (modified) (3 diffs)

zzuf/trunk/src/zzuf.c

@@ -906 +906 @@
     int pid, j, len = strlen(opts->oldargv[0]);
 #   if defined __APPLE__
-#       define FILENAME "libzzuf.dylib"
 #       define EXTRAINFO ""
 #       define PRELOAD "DYLD_INSERT_LIBRARIES"
     setenv("DYLD_FORCE_FLAT_NAMESPACE", "1", 1);
 #   elif defined __osf__
-#       define FILENAME "libzzuf.so"
 #       define EXTRAINFO ":DEFAULT"
 #       define PRELOAD "_RLD_LIST"
 #   else
-#       define FILENAME "libzzuf.so"
 #       define EXTRAINFO ""
 #       define PRELOAD "LD_PRELOAD"
@@ -978 +975 @@
 #if defined HAVE_FORK
     /* Make sure there is space for everything we might do. */
-    libpath = malloc(len + strlen(LIBDIR "/.libs/" FILENAME EXTRAINFO) + 1);
+    libpath = malloc(len + strlen(LIBDIR "/.libs/" SONAME EXTRAINFO) + 1);
     strcpy(libpath, opts->oldargv[0]);
 
@@ -987 +984 @@
     if(tmp)
     {
-        strcpy(tmp + 1, ".libs/" FILENAME);
+        strcpy(tmp + 1, ".libs/" SONAME);
         if(access(libpath, R_OK) < 0)
-            strcpy(libpath, LIBDIR "/" FILENAME);
+            strcpy(libpath, LIBDIR "/" SONAME);
     }
     else
-        strcpy(libpath, LIBDIR "/" FILENAME);
+        strcpy(libpath, LIBDIR "/" SONAME);
 
     /* OSF1 only */