diff options
| -rw-r--r-- | generic/tclZipfs.c | 5 | ||||
| -rw-r--r-- | unix/Makefile.in | 2 | ||||
| -rw-r--r-- | win/Makefile.in | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index 303ea03..4d43331 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -16,7 +16,6 @@ * projects. */ -#define _GNU_SOURCE #include "tclInt.h" #include "tclFileSystem.h" @@ -33,7 +32,7 @@ #define TBLS 1 #endif -#if 1 /* HAVE_DLADDR */ +#if !defined(NO_DLFCN_H) #include <dlfcn.h> #endif @@ -3912,7 +3911,7 @@ TclZipfs_TclLibrary(void) if (ZipfsAppHookFindTclInit(dllName) == TCL_OK) { return Tcl_NewStringObj(zipfs_literal_tcl_library, -1); } -#elif 1 +#elif !defined(NO_DLFCN_H) Dl_info dlinfo; if (dladdr(TclZipfs_TclLibrary, &dlinfo) && (dlinfo.dli_fname != NULL) && (ZipfsAppHookFindTclInit(dlinfo.dli_fname) == TCL_OK)) { diff --git a/unix/Makefile.in b/unix/Makefile.in index 79dad02..e710b55 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1520,7 +1520,7 @@ tclZlib.o: $(GENERIC_DIR)/tclZlib.c $(CC) -c $(CC_SWITCHES) $(ZLIB_INCLUDE) $(GENERIC_DIR)/tclZlib.c tclZipfs.o: $(GENERIC_DIR)/tclZipfs.c - $(CC) -c $(CC_SWITCHES) \ + $(CC) -c $(CC_SWITCHES) -D_GNU_SOURCE \ -DCFG_RUNTIME_DLLFILE="\"$(TCL_LIB_FILE)\"" \ -DCFG_RUNTIME_LIBDIR="\"$(libdir)\"" \ -I$(ZLIB_DIR) -I$(ZLIB_DIR)/contrib/minizip \ diff --git a/win/Makefile.in b/win/Makefile.in index 3d68bda..9ed6186 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -856,7 +856,7 @@ install-libraries: libraries install-tzdata install-msgs $(COPY) "$$i" "$(SCRIPT_INSTALL_DIR)"; \ done; @echo "Installing package cookiejar 0.2" - @for j in $(ROOT_DIR)/library/cookiejar/*.{tcl,txt.gz}; \ + @for j in $(ROOT_DIR)/library/cookiejar/*.{tcl,gz}; \ do \ $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/cookiejar0.2"; \ done; |