diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 5 |
2 files changed, 11 insertions, 0 deletions
@@ -1,3 +1,9 @@ +2008-06-06 Tor Lillqvist <tml@novell.com> + + * 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 <jjohnny@novell.com> Committing this on behalf Chenthill Palanisamy <pchenthill@novell.com> 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" |