Changeset 2534Tweet

Timestamp:

Jul 16, 2008, 11:52:08 AM (12 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.

Location:

zzuf/trunk

Files:

• msvc/config.h (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/zzuf.c (modified) (3 diffs)

zzuf/trunk/msvc/config.h

@@ -18 +18 @@
 
 #define VERSION "0.7 (msvc)"
+#define SONAME "libzzuf.dll"
 
 #define HAVE_WINDOWS_H 1

zzuf/trunk/src/Makefile.am

@@ -9 +9 @@
 zzuf_SOURCES = zzuf.c $(COMMON) $(GETOPT) \
                opts.c opts.h md5.c md5.h timer.c timer.h
-zzuf_CFLAGS = -DLIBDIR=\"$(libdir)/zzuf\"
+zzuf_CFLAGS = -DLIBDIR=\"$(libdir)/zzuf\" -DSONAME=\"$$(grep dlname libzzuf.la | cut -f2 -d"'")\"
 zzuf_LDFLAGS = $(MATH_LIBS) $(WINSOCK2_LIBS)
+zzuf_DEPENDENCIES = libzzuf.la
 
 pkglib_LTLIBRARIES = libzzuf.la

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 */