diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/importers/Makefile.am | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index b524ef52a6..f26a7ac6a1 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -5,6 +5,11 @@ installing the schemas: Echo the command to a temporary .bat file and run it with cmd.exe... + * importers/Makefile.am: Use the bootstrap import library for + libevolution-mail.la on Win32 as libevolution-mail.la hasn't been + built yet when we come here. Use -no-undefined on Win32. Use + privsolib instead of privlib. (See ../ChangeLog.) + 2005-08-08 Not Zed <NotZed@Ximian.com> ** See bug #304938. diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am index b33c7e4265..e559ded8f9 100644 --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -1,5 +1,8 @@ +if OS_WIN32 +WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la +endif -privlib_LTLIBRARIES = libevolution-mail-importers.la +privsolib_LTLIBRARIES = libevolution-mail-importers.la INCLUDES = -I.. \ -I$(srcdir)/.. \ @@ -17,11 +20,14 @@ libevolution_mail_importers_la_SOURCES = \ pine-importer.c \ evolution-mbox-importer.c +libevolution_mail_importers_la_LDFLAGS = $(NO_UNDEFINED) + # these haven't been converted to plugins yet # netscape-importer.c # evolution-outlook-importer.c libevolution_mail_importers_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/filter/libfilter.la \ $(IMPORTERS_LIBS) |