diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | configure.in | 13 | ||||
| -rw-r--r-- | plugins/exchange-operations/ChangeLog | 7 | ||||
| -rw-r--r-- | plugins/exchange-operations/Makefile.am | 13 |
4 files changed, 33 insertions, 11 deletions
@@ -1,3 +1,14 @@ +2005-09-28 Tor Lillqvist <tml@novell.com> + + * configure.in: Drop unused SOCKET_LIBS leftover. Don't check for + OpenLDAP on Win32. Set corresponding variables unconditionally on + Win32, as LDAP support is always present (in <winldap.h> and + -lwldap32). + (CAMEL_EXCHANGE): Add more stuff to CAMEL_EXCHANGE_CFLAGS and + _LIBS. These are used only in + plugins/exchange-operations/Makefile.am, and now it's enough to + use only that CAMEL_EXCHANGE_CFLAGS and _LIBS there. + 2005-09-05 Mengjie Yu <meng-jie.yu@sun.com> * configure.in:grep on Solaris doesn't support -q, use > /dev/null instead. diff --git a/configure.in b/configure.in index 5d422ed96c..e44a75397b 100644 --- a/configure.in +++ b/configure.in @@ -106,7 +106,6 @@ case "$host" in ;; *) os_win32=no NO_UNDEFINED='' - SOCKET_LIBS='' SOEXT='.so' SA_JUNK_PLUGIN=sa-junk-plugin DL_LIB='-ldl' @@ -462,6 +461,7 @@ AM_CONDITIONAL(ENABLE_IPv6, test "x$enable_ipv6" = "xyes") dnl ************************************************** dnl LDAP support. dnl ************************************************** +if test "$os_win32" != yes; then EVO_LDAP_CHECK(no) case $with_openldap in no) @@ -477,6 +477,15 @@ no) ;; esac esac +else # Win32 +LDAP_CFLAGS="" +LDAP_LIBS="-lwldap32" +AC_SUBST(LDAP_CFLAGS) +AC_SUBST(LDAP_LIBS) +AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support]) +AM_CONDITIONAL(ENABLE_LDAP, true) +msg_exchange="yes" +fi # Win32 dnl ************************************************** dnl NNTP support. @@ -1500,7 +1509,7 @@ if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then dnl ************************************************** dnl * Exchange Operations plugin dnl ************************************************** - EVO_SET_COMPILE_FLAGS(CAMEL_EXCHANGE, camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE >= $EDS_REQUIRED) + EVO_SET_COMPILE_FLAGS(CAMEL_EXCHANGE, libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gthread-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE libebook-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE) AC_SUBST(CAMEL_EXCHANGE_CFLAGS) AC_SUBST(CAMEL_EXCHANGE_LIBS) else diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index ee216d2820..5f1376e4fb 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,10 @@ +2005-09-28 Tor Lillqvist <tml@novell.com> + + * Makefile.am (INCLUDES, LIBADD): Use just CAMEL_EXCHANGE_CFLAGS + and _LIBS, they now includes all necessary (see top-level + ChangeLog). + (LDFLAGS): Use NO_UNDEFINED. + 2005-09-22 Praveen Kumar <kpraveen@novell.com> ** Fixes bug 312849 diff --git a/plugins/exchange-operations/Makefile.am b/plugins/exchange-operations/Makefile.am index 896eaf2d9b..8d57a5c1fd 100644 --- a/plugins/exchange-operations/Makefile.am +++ b/plugins/exchange-operations/Makefile.am @@ -2,11 +2,7 @@ INCLUDES = -I . \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/calendar \ - $(EVOLUTION_MAIL_CFLAGS) \ $(CAMEL_EXCHANGE_CFLAGS) \ - $(CAMEL_CFLAGS) \ - $(LDAP_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DCONNECTOR_GLADEDIR=\""$(gladedir)"\" @@ -47,16 +43,15 @@ liborg_gnome_exchange_operations_la_SOURCES = \ exchange-folder-subscription.h \ exchange-folder.c -liborg_gnome_exchange_operations_la_LIBADD = \ - $(EVOLUTION_MAIL_LIBS) \ - $(CAMEL_EXCHANGE_LIBS) \ +liborg_gnome_exchange_operations_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la + $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \ + $(CAMEL_EXCHANGE_LIBS) -liborg_gnome_exchange_operations_la_LDFLAGS = -module -avoid-version +liborg_gnome_exchange_operations_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) glade_DATA = \ exchange-change-password.glade \ |