From a811888402977d99de939c611631bf743c95dbf9 Mon Sep 17 00:00:00 2001 From: Guido Draheim Date: Mon, 22 Jun 2009 13:43:25 +0000 Subject: [PATCH] #2796485 - use $can_build_shared to disable shared libary export --- ChangeLog | 4 ++++ configure.ac | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a0d2db5..bcaa32a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-06-22 guidod + * configure.ac: use $can_build_shared from linker-config to allow + build on platforms that do not support a shared library concept + or where it is disabled (the commandline switch overrides it?) + (should fix the SF bug ID 2796485 reported by Giovanni Bechis) * zzip/file.c: errornous usage of currentfp before setting it to the new fp value in zzip_seek(). In the good case it would seek on the wrong file and in the bad case it goes off on sigbus/NPE. diff --git a/configure.ac b/configure.ac index 0236be9..cea80ff 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_INIT([zziplib.spec]) AC_PREREQ(2.49) AC_COPYRIGHT([Guido Draheim for ZZipLib.SF.net]) -AC_REVISION($Revision: 1.12 $) +AC_REVISION($Revision: 1.13 $) AC_CONFIG_AUX_DIR([uses]) AC_CONFIG_MACRO_DIR([m4]) # ======================================================================= @@ -285,7 +285,11 @@ case "$host_os" in RESOLVES=' ' ;; *) - ZZIPLIB_LDFLAGS="--export-dynamic" + + if ".$can_build_shared" = .no + then ZZIPLIB_LDFLAGS="" + else ZZIPLIB_LDFLAGS="--export-dynamic" + fi RESOLVES=' # ' ;; esac -- 2.40.0