evolution r35601 - branches/gnome-2-22

[tml svn gnome org]

Author: tml
Date: Fri Jun  6 11:18:20 2008
New Revision: 35601
URL: http://svn.gnome.org/viewvc/evolution?rev=35601&view=rev

Log:
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.



Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/configure.in

Modified: branches/gnome-2-22/configure.in
==============================================================================
--- branches/gnome-2-22/configure.in	(original)
+++ branches/gnome-2-22/configure.in	Fri Jun  6 11:18:20 2008
@@ -230,6 +230,11 @@
 
 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"