From 14a52517906af2994cd2059b4ef9f98139cb3980 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 6 Jun 2008 11:19:17 +0000 Subject: Add -Wl,--exclude-libs=libiconv.a to ICONV_LIBS on Windows to avoid 2008-06-06 Tor Lillqvist * configure.in: Add -Wl,--exclude-libs=libiconv.a to ICONV_LIBS on Windows to avoid auto-exporting functions from the static libiconv.a implementation in win_iconv from evolution's DLLs. svn path=/trunk/; revision=35602 --- ChangeLog | 6 ++++++ configure.in | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index d9aff2de27..40929a60fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-06-06 Tor Lillqvist + + * configure.in: Add -Wl,--exclude-libs=libiconv.a to ICONV_LIBS on + Windows to avoid auto-exporting functions from the static + libiconv.a implementation in win_iconv from evolution's DLLs. + 2008-06-05 Johnny Jacob Committing this on behalf Chenthill Palanisamy diff --git a/configure.in b/configure.in index 45d4e19240..2e2ac2c43b 100644 --- a/configure.in +++ b/configure.in @@ -230,6 +230,11 @@ int main (int argc, char **argv) if test $ac_cv_libiconv = yes; then ICONV_LIBS="$ICONV_LIBS -liconv" + if test $os_win32 = yes; then + # Don't pointlessly auto-export the global symbols + # from a potentially static libiconv.a + ICONV_LIBS="$ICONV_LIBS -Wl,--exclude-libs=libiconv.a" + fi have_iconv=yes else CFLAGS="$save_CFLAGS" -- cgit v1.2.3