evolution-data-server r8943 - trunk

[tml svn gnome org]

Author: tml
Date: Fri Jun  6 10:46:30 2008
New Revision: 8943
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8943&view=rev

Log:
2008-06-06  Tor Lillqvist  <tml novell com>

	* configure.in: Add a couple of -Wl,--exclude-libs options on
	Windows to avoid needlessly auto-exporting functions from static
	libiconv and libdb-4.1 when linked into e-d-s's DLLs.



Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Jun  6 10:46:30 2008
@@ -276,6 +276,11 @@
 else
         DB_CFLAGS="-I\$(top_builddir)/libdb/dist"
         DB_LIBS="\$(top_builddir)/libdb/dist/libdb-4.1.la"
+	if test $os_win32 = yes; then
+		# Don't pointlessly auto-export the global symbols
+		# from the static libdb
+		DB_LIBS="$DB_LIBS -Wl,--exclude-libs=libdb-4.1.a"
+	fi
         AC_MSG_NOTICE(Using local libdb)
         msg_libdb="statically linked to local copy"
 fi
@@ -315,6 +320,11 @@
 ], ac_cv_libiconv=yes, ac_cv_libiconv=no, ac_cv_libiconv=no))
 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"