evolution-data-server r8942 - branches/gnome-2-22

[tml svn gnome org]

Author: tml
Date: Fri Jun  6 10:45:52 2008
New Revision: 8942
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8942&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:
   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 10:45:52 2008
@@ -255,6 +255,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
@@ -294,6 +299,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"