From 71db41ef693bb3444cb9b459ef73fb5bdb0d4764 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 28 May 2009 00:47:04 -0400 Subject: Get the mailer's URI popup menu working. Except for "Add to Address Book", which looks like a project unto itself. This also kills off another plugin (copy-tool). --- configure.ac | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 6a4826cd49..12650c47ed 100644 --- a/configure.ac +++ b/configure.ac @@ -1807,7 +1807,7 @@ plugins_base_always="calendar-file calendar-http $CALENDAR_WEATHER itip-formatte plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono" -plugins_standard_always="bbdb subject-thread save-calendar copy-tool mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates pst-import vcard-inline" +plugins_standard_always="bbdb subject-thread save-calendar mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates pst-import vcard-inline" plugins_standard="$plugins_standard_always" all_plugins_standard="$plugins_standard" @@ -1817,7 +1817,7 @@ plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" dnl Temporary KILL-BONOBO hack -enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http copy-tool default-source external-editor google-account-setup hula-account-setup imap-features mail-notification mark-all-read plugin-manager profiler sa-junk-plugin save-calendar subject-thread $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" +enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-source external-editor google-account-setup hula-account-setup imap-features mail-notification mark-all-read plugin-manager profiler sa-junk-plugin save-calendar subject-thread $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" dnl PLUGINS NOT BUILDING YET dnl ------------------------ @@ -2132,7 +2132,6 @@ plugins/caldav/Makefile plugins/calendar-file/Makefile plugins/calendar-http/Makefile plugins/calendar-weather/Makefile -plugins/copy-tool/Makefile plugins/default-mailer/Makefile plugins/default-source/Makefile plugins/email-custom-header/Makefile -- cgit From 6e87927dac9c7620d8e0650fde085e45c735fb29 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 2 Jun 2009 12:23:38 -0400 Subject: Bug 582939 – Drop support for CDE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configure.ac | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 12650c47ed..f272adf5ca 100644 --- a/configure.ac +++ b/configure.ac @@ -1298,26 +1298,6 @@ else fi AM_CONDITIONAL(ENABLE_EXCHANGE, [test x$enable_exchange = xyes]) -dnl ****************** -dnl CDE dtappintegrate -dnl ****************** - -AC_ARG_WITH([cde-path], - AC_HELP_STRING([--with-cde-path=PATH], - [Location of CDE installation]), - [with_cde_path=$withval],[with_cde_path=/usr/dt]) - -AC_MSG_CHECKING(for dtappintegrate) -if test -x "$with_cde_path/bin/dtappintegrate" ; then - DTAPPINTEGRATE="$with_cde_path/bin/dtappintegrate" -else - DTAPPINTEGRATE="no" -fi -AC_MSG_RESULT([$DTAPPINTEGRATE]) - -AC_SUBST(DTAPPINTEGRATE) -AM_CONDITIONAL(HAVE_DTAPPINTEGRATE, [test x$DTAPPINTEGRATE != xno]) - dnl ***************** dnl killall or pkill? dnl ***************** @@ -2036,17 +2016,6 @@ addressbook/tools/csv2vcard addressbook/util/Makefile art/Makefile data/Makefile -data/cde_app_root/Makefile -data/cde_app_root/dt/Makefile -data/cde_app_root/dt/appconfig/Makefile -data/cde_app_root/dt/appconfig/appmanager/Makefile -data/cde_app_root/dt/appconfig/appmanager/C/Makefile -data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile -data/cde_app_root/dt/appconfig/icons/Makefile -data/cde_app_root/dt/appconfig/icons/C/Makefile -data/cde_app_root/dt/appconfig/types/Makefile -data/cde_app_root/dt/appconfig/types/C/Makefile -data/cde_app_root/dt/appconfig/types/C/Ximian.dt data/icons/Makefile doc/Makefile doc/reference/Makefile -- cgit From b0e26e9c5f13c710c7677959cc457158206befe1 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 5 Jun 2009 14:48:29 +0200 Subject: Fix even more compiler warnings and disable one for format strings --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index f272adf5ca..32c4e6c94b 100644 --- a/configure.ac +++ b/configure.ac @@ -59,7 +59,7 @@ AS_COMPILER_FLAGS(WARNING_FLAGS, -Wno-unused-parameter -Wdeclaration-after-statement -Werror-implicit-function-declaration - -Wformat-nonliteral -Wformat-security -Winit-self + -Wformat-security -Winit-self -Wmissing-declarations -Wmissing-include-dirs -Wmissing-noreturn -Wnested-externs -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings") @@ -70,6 +70,7 @@ AC_SUBST(WARNING_FLAGS) # # -Wmissing-format-attribute # -Wshadow +# -Wformat-nonliteral CFLAGS="$CFLAGS $WARNING_FLAGS" -- cgit From c6911b3029629f1032dd594249c099d79efe9fe1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Jun 2009 16:06:05 -0400 Subject: Fix "make distcheck" errors. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 32c4e6c94b..6a902f406a 100644 --- a/configure.ac +++ b/configure.ac @@ -1788,7 +1788,7 @@ plugins_base_always="calendar-file calendar-http $CALENDAR_WEATHER itip-formatte plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono" -plugins_standard_always="bbdb subject-thread save-calendar mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates pst-import vcard-inline" +plugins_standard_always="bbdb subject-thread save-calendar mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder backup-restore email-custom-header templates pst-import vcard-inline" plugins_standard="$plugins_standard_always" all_plugins_standard="$plugins_standard" -- cgit From 5aa431a5e2db2959c6e503ffaa4e1a05bc335cf2 Mon Sep 17 00:00:00 2001 From: Jeff Cai Date: Mon, 15 Jun 2009 00:11:34 +0200 Subject: Don't link against libsoftoken3 explicitly Fixes bug 585523. --- configure.ac | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 3433bfcd60..b16d4bd9e7 100644 --- a/configure.ac +++ b/configure.ac @@ -181,7 +181,6 @@ case "$host" in SA_JUNK_PLUGIN='' BF_JUNK_PLUGIN='' DL_LIB='' - SOFTOKN3_LIB='' HAL_REQUIREMENT='' ;; *) os_win32=no @@ -190,7 +189,6 @@ case "$host" in SA_JUNK_PLUGIN=sa-junk-plugin BF_JUNK_PLUGIN=bogo-junk-plugin DL_LIB='-ldl' - SOFTOKN3_LIB='-lsoftokn3' HAL_REQUIREMENT='hal' ;; esac @@ -1222,7 +1220,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then LIBS="$nsslibs $nsprlibs" AC_TRY_LINK_FUNC(NSS_Init, ac_cv_moz_nss_libs="yes", ac_cv_moz_nss_libs="no") if test "$ac_cv_moz_nss_libs" = no; then - nsslibs="-lssl3 -lsmime3 -lnss3 $SOFTOKN3_LIB" + nsslibs="-lssl3 -lsmime3 -lnss3" LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs" AC_TRY_LINK_FUNC(NSS_Init, ac_cv_moz_nss_libs="yes", ac_cv_moz_nss_libs="no") fi -- cgit From b7bf7ae3af4b831e05b212dec0962ff51daf696a Mon Sep 17 00:00:00 2001 From: "H.Habighorst" Date: Fri, 19 Jun 2009 09:24:25 -0400 Subject: Bug 586378 - Various build cleanups --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index b16d4bd9e7..04f936f097 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.52) +AC_PREREQ(2.54) m4_define([evo_major_version], [2]) m4_define([evo_minor_version], [27]) @@ -81,10 +81,10 @@ GTK_DOC_CHECK(1.10) # The extra brackets are to foil regex-based scans. m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])]) -AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) -AM_CONFIG_HEADER(config.h) - +AM_INIT_AUTOMAKE([gnu]) +AC_CONFIG_HEADERS(config.h) AC_CANONICAL_HOST + AC_DEFINE_UNQUOTED(VERSION_COMMENT, "", [Define if you want a comment appended to the version number]) dnl Put the ACLOCAL flags in the Makefile -- cgit From 92685c079d4a7c640488f526d273991a7ecb24d0 Mon Sep 17 00:00:00 2001 From: "H.Habighorst" Date: Fri, 19 Jun 2009 21:41:49 -0400 Subject: More build cleanups. --- configure.ac | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 04f936f097..cc692f9dbf 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,14 @@ m4_define([evo_stable_version], [evo_major_version.m4_eval(evo_minor_version - 1)], [evo_version])]) +# Base version : This is for api/versioning tracking for things like bonobo .server files +# This should always be the major/minor of the stable version or stable version to be +m4_define([base_version], [2.28]) + +# Upgrade Revision: This is for triggering migration calls between +# varying versions. This should be reset to 0 whenever BASE_VERSION changes. +m4_define([upgrade_revision], [0]) + AC_INIT(evolution, [evo_version], http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution) AC_CONFIG_SRCDIR(README) @@ -98,26 +106,10 @@ if test "$evo_version" != "$evo_stable_version"; then [Define to the latest stable version if this version is unstable]) fi -dnl ************************************************************************************************* -dnl Base Version -dnl -dnl This is for api/versioning tracking for things like bonobo .server files -dnl -dnl This should always be the major/minor of the stable version or stable version to be -dnl ************************************************************************************************* -BASE_VERSION=2.28 -AC_SUBST(BASE_VERSION) +AC_SUBST([BASE_VERSION],[base-version]) AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", [Base version (Major.Minor)]) -dnl ************************************************************************************************* -dnl Upgrade Revision -dnl -dnl This is for triggering migration calls between varying versions. -dnl -dnl This should be reset to 0 whenever BASE_VERSION changes -dnl ************************************************************************************************* -UPGRADE_REVISION=0 -AC_SUBST(UPGRADE_REVISION) +AC_SUBST([UPGRADE_REVISION],[upgrade_revision]) AC_DEFINE_UNQUOTED(UPGRADE_REVISION, "$UPGRADE_REVISION", [The number of times we've upgraded since the BASE_VERSION release]) AC_ISC_POSIX @@ -135,7 +127,7 @@ case $YACC in AC_MSG_ERROR(You need bison to build Evolution) ;; esac -AC_STDC_HEADERS +AC_HEADER_STDC AC_ARG_PROGRAM AC_PROG_INSTALL AC_PROG_LN_S -- cgit From 44bffbc712735c12215deaf1e22e1030efdb671c Mon Sep 17 00:00:00 2001 From: "H.Habighorst" Date: Sat, 20 Jun 2009 22:26:59 -0400 Subject: Bug 586478 – Fix quoting in configure.ac MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configure.ac | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index cc692f9dbf..886f8fdaec 100644 --- a/configure.ac +++ b/configure.ac @@ -11,12 +11,13 @@ m4_define([evo_stable_version], [evo_major_version.m4_eval(evo_minor_version - 1)], [evo_version])]) -# Base version : This is for api/versioning tracking for things like bonobo .server files -# This should always be the major/minor of the stable version or stable version to be +# Base Version: This is for API/version tracking for things like +# Bonobo server files. This should always be the major/minor of +# the stable version or stable version to be. m4_define([base_version], [2.28]) -# Upgrade Revision: This is for triggering migration calls between -# varying versions. This should be reset to 0 whenever BASE_VERSION changes. +# Upgrade Revision: This is for triggering migration calls between +# varying versions. Reset to 0 whenever BASE_VERSION changes. m4_define([upgrade_revision], [0]) AC_INIT(evolution, [evo_version], http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution) @@ -106,11 +107,11 @@ if test "$evo_version" != "$evo_stable_version"; then [Define to the latest stable version if this version is unstable]) fi -AC_SUBST([BASE_VERSION],[base-version]) -AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", [Base version (Major.Minor)]) +AC_SUBST([BASE_VERSION],[base_version]) +AC_DEFINE_UNQUOTED(BASE_VERSION, ["$BASE_VERSION"], [Base version (Major.Minor)]) AC_SUBST([UPGRADE_REVISION],[upgrade_revision]) -AC_DEFINE_UNQUOTED(UPGRADE_REVISION, "$UPGRADE_REVISION", [The number of times we've upgraded since the BASE_VERSION release]) +AC_DEFINE_UNQUOTED(UPGRADE_REVISION, ["$UPGRADE_REVISION"], [The number of times we've upgraded since the BASE_VERSION release]) AC_ISC_POSIX AC_PROG_CC -- cgit From bf4a3e68f70587f34e9cef264dc2869a7e9ffd28 Mon Sep 17 00:00:00 2001 From: "H.Habighorst" Date: Tue, 23 Jun 2009 11:11:32 -0400 Subject: Bug 586631 – Rearrange autotool initialization in configure.ac MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configure.ac | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 886f8fdaec..48f6e2fdd5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,4 @@ -# Process this file with autoconf to produce a configure script. -AC_PREREQ(2.54) - +# Evolution Versions m4_define([evo_major_version], [2]) m4_define([evo_minor_version], [27]) m4_define([evo_micro_version], [3]) @@ -20,9 +18,20 @@ m4_define([base_version], [2.28]) # varying versions. Reset to 0 whenever BASE_VERSION changes. m4_define([upgrade_revision], [0]) +# Autoconf / Automake Initialization +AC_PREREQ(2.54) AC_INIT(evolution, [evo_version], http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution) +AM_INIT_AUTOMAKE([gnu]) +AC_CONFIG_HEADERS(config.h) AC_CONFIG_SRCDIR(README) +# Gnome Doc Initialization +GNOME_DOC_INIT + +# Gross hack to enable 'make dist' on automake 1.9+tar 1.14. +# The extra brackets are to foil regex-based scans. +m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])]) + # Some requirements have versioned package names # XXX In the spirit of getting rid of versioned # files, can we please drop these suffixes? @@ -83,17 +92,7 @@ AC_SUBST(WARNING_FLAGS) CFLAGS="$CFLAGS $WARNING_FLAGS" -# GNOME Documentation -GNOME_DOC_INIT -GTK_DOC_CHECK(1.10) -# Gross hack to enable 'make dist' on automake 1.9+tar 1.14. -# The extra brackets are to foil regex-based scans. -m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])]) - -AM_INIT_AUTOMAKE([gnu]) -AC_CONFIG_HEADERS(config.h) AC_CANONICAL_HOST - AC_DEFINE_UNQUOTED(VERSION_COMMENT, "", [Define if you want a comment appended to the version number]) dnl Put the ACLOCAL flags in the Makefile -- cgit From 75c526305d3a03d536484a9ed3922fa2587df543 Mon Sep 17 00:00:00 2001 From: "H.Habighorst" Date: Tue, 23 Jun 2009 11:17:39 -0400 Subject: Bug 586632 – Require automake 1.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configure.ac | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 48f6e2fdd5..ab6dbbacee 100644 --- a/configure.ac +++ b/configure.ac @@ -21,17 +21,13 @@ m4_define([upgrade_revision], [0]) # Autoconf / Automake Initialization AC_PREREQ(2.54) AC_INIT(evolution, [evo_version], http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution) -AM_INIT_AUTOMAKE([gnu]) +AM_INIT_AUTOMAKE([gnu 1.9]) AC_CONFIG_HEADERS(config.h) AC_CONFIG_SRCDIR(README) # Gnome Doc Initialization GNOME_DOC_INIT -# Gross hack to enable 'make dist' on automake 1.9+tar 1.14. -# The extra brackets are to foil regex-based scans. -m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])]) - # Some requirements have versioned package names # XXX In the spirit of getting rid of versioned # files, can we please drop these suffixes? -- cgit From 54cc76ac50b500645cde0858bd6f767591ecba3e Mon Sep 17 00:00:00 2001 From: "H.Habighorst" Date: Tue, 23 Jun 2009 11:41:52 -0400 Subject: Bug 586629 – Fix whitespace in configure.ac MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configure.ac | 120 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 60 insertions(+), 60 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ab6dbbacee..765a9bbb60 100644 --- a/configure.ac +++ b/configure.ac @@ -174,7 +174,7 @@ case "$host" in *) os_win32=no NO_UNDEFINED='-Wl,-no-undefined' SOEXT='.so' - SA_JUNK_PLUGIN=sa-junk-plugin + SA_JUNK_PLUGIN=sa-junk-plugin BF_JUNK_PLUGIN=bogo-junk-plugin DL_LIB='-ldl' HAL_REQUIREMENT='hal' @@ -455,7 +455,7 @@ AC_CACHE_CHECK([if ctime_r wants three arguments], ac_cv_ctime_r_three_args, ac_cv_ctime_r_three_args=no ]) ]) - + if test x"$ac_cv_ctime_r_three_args" = xyes ; then AC_DEFINE(CTIME_R_THREE_ARGS, 1, [Solaris-style ctime_r]) fi @@ -488,7 +488,7 @@ AC_CACHE_CHECK([if gethostbyname_r wants five arguments], ac_cv_gethostbyname_r_ ac_cv_gethostbyname_r_five_args=no ]) ])]) - + if test "x$ac_cv_gethostbyname_r_five_args" = "xyes" ; then AC_DEFINE(GETHOSTBYNAME_R_FIVE_ARGS, 1, [Solaris-style gethostbyname_r]) fi @@ -521,7 +521,7 @@ AC_CACHE_CHECK([if gethostbyaddr_r wants seven arguments], ac_cv_gethostbyaddr_r ac_cv_gethostbyaddr_r_seven_args=no ]) ])]) - + if test "x$ac_cv_gethostbyaddr_r_seven_args" = "xyes" ; then AC_DEFINE(GETHOSTBYADDR_R_SEVEN_ARGS, 1, [Solaris-style gethostbyaddr_r]) fi @@ -749,7 +749,7 @@ int main (int argc, char **argv) { const char *utf8 = "\x66\x66\x66\x66\x66\x66\x66\xC2\xA9"; size_t utf8_real_len = strlen (utf8); - char *pstring; + char *pstring; if (convert_ToPilotChar ("UTF-8", utf8, utf8_real_len, &pstring) == -1) exit (1); @@ -820,7 +820,7 @@ AC_ARG_WITH([krb4-includes], msg_krb5="no" if test "x${with_krb5}" != "xno"; then LDFLAGS_save="$LDFLAGS" - + mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" sunlibs="-lkrb5 -lgss" @@ -830,7 +830,7 @@ if test "x${with_krb5}" != "xno"; then AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$mitlibs", [ LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $heimlibs" - AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs", + AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs", [ LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $sunlibs" AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$sunlibs", ac_cv_lib_kerberos5="no") @@ -888,7 +888,7 @@ if test "x${with_krb4}" != "xno"; then # Look for MIT krb5 compat krb4 LDFLAGS="$LDFLAGS -L$with_krb4_libs $mitcompatlibs" AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="$mitcompatlibs") - + if test "$ac_cv_lib_kerberos4" = "no"; then # Look for KTH krb4 LDFLAGS="$LDFLAGS_save -L$with_krb4_libs -lkrb -lcrypto -lcom_err -lroken" @@ -920,7 +920,7 @@ if test "x${with_krb4}" != "xno"; then KRB4_CFLAGS="-I$with_krb4_includes" fi KRB4_LIBS="-L$with_krb4_libs $ac_cv_lib_kerberos4" - + CFLAGS_save="$CFLAGS" CFLAGS="$CFLAGS $KRB4_CFLAGS" AC_TRY_COMPILE([#include "krb.h" @@ -999,7 +999,7 @@ fi dnl ******************************************************************************** dnl security extension support (SSL and S/MIME) dnl -dnl The following voodoo does detection of mozilla libraries (nspr and nss) +dnl The following voodoo does detection of mozilla libraries (nspr and nss) dnl needed by Camel (SSL and S/MIME). dnl dnl The Evolution security extensions are only built if these libraries are found @@ -1009,21 +1009,21 @@ msg_smime="no" dnl these 2 enable's are inverses of each other -AC_ARG_ENABLE([nss], +AC_ARG_ENABLE([nss], AC_HELP_STRING([--enable-nss=@<:@yes/no/static@:>@], [Attempt to use Mozilla libnss for SSL support.]), [enable_nss=$enableval],[enable_nss=yes]) -AC_ARG_ENABLE([smime], +AC_ARG_ENABLE([smime], AC_HELP_STRING([--enable-smime], [Attempt to use Mozilla libnss for SMIME support (this requires --enable-nss)]), [enable_smime=$enableval],[enable_smime=yes]) -AC_ARG_WITH([nspr-includes], +AC_ARG_WITH([nspr-includes], AC_HELP_STRING([--with-nspr-includes=PATH], [Location of Mozilla nspr4 includes.])) -AC_ARG_WITH([nspr-libs], +AC_ARG_WITH([nspr-libs], AC_HELP_STRING([--with-nspr-libs=PATH], [Location of Mozilla nspr4 libs.])) @@ -1041,7 +1041,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then else check_manually="no" fi - + if test "x${check_manually}" = "xno"; then AC_MSG_CHECKING(Mozilla NSPR pkg-config module name) mozilla_nspr_pcs="nspr mozilla-nspr firefox-nspr xulrunner-nspr seamonkey-nspr" @@ -1052,7 +1052,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then break; fi done - + AC_MSG_CHECKING(Mozilla NSS pkg-config module name) mozilla_nss_pcs="nss mozilla-nss firefox-nss xulrunner-nss seamonkey-nss" for pc in $mozilla_nss_pcs; do @@ -1062,7 +1062,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then break; fi done - + if test -n "$mozilla_nspr" -a -n "$mozilla_nss"; then msg_ssl="yes (Mozilla NSS)" if test "x$enable_smime" = "xyes"; then @@ -1082,20 +1082,20 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then mozilla_nss="" fi fi - + if test "x${check_manually}" = "xyes"; then mozilla_nss="" have_nspr_includes="no" if test "x${with_nspr_includes}" != "xno"; then CPPFLAGS_save="$CPPFLAGS" - + AC_MSG_CHECKING(for Mozilla nspr4 includes in $with_nspr_includes) AC_MSG_RESULT("") - + CPPFLAGS="$CPPFLAGS -I$with_nspr_includes" AC_CHECK_HEADERS(nspr.h prio.h, [ moz_nspr_includes="yes" ]) CPPFLAGS="$CPPFLAGS_save" - + if test "x{$moz_nspr_includes}" != "xno" -a "x{$moz_nspr_includes}" != "x" ; then have_nspr_includes="yes" MANUAL_NSPR_CFLAGS="-I$with_nspr_includes" @@ -1104,12 +1104,12 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then AC_MSG_CHECKING(for Mozilla nspr4 includes) AC_MSG_RESULT(no) fi - + have_nspr_libs="no" if test "x${with_nspr_libs}" != "xno" -a "x${have_nspr_includes}" != "xno"; then CFLAGS_save="$CFLAGS" LDFLAGS_save="$LDFLAGS" - + if test "$enable_nss" = "static"; then if test -z "${with_nspr_libs}"; then AC_MSG_ERROR([Static linkage requested, but path to nspr libraries not set.] @@ -1121,12 +1121,12 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then else nsprlibs="$DL_LIB -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" fi - + AC_CACHE_CHECK([for Mozilla nspr libraries], ac_cv_moz_nspr_libs, [ LIBS_save="$LIBS" CFLAGS="$CFLAGS $MANUAL_NSPR_CFLAGS" - + if test "x${with_nspr_libs}" != "x"; then LIBS="$nsprlibs" LDFLAGS="$LDFLAGS -L$with_nspr_libs" @@ -1134,7 +1134,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then LIBS="$nsprlibs" LDFLAGS="$LDFLAGS" fi - + AC_TRY_LINK_FUNC(PR_Init, ac_cv_moz_nspr_libs="yes", ac_cv_moz_nspr_libs="no") CFLAGS="$CFLAGS_save" LDFLAGS="$LDFLAGS_save" @@ -1150,26 +1150,26 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then AC_MSG_CHECKING(for Mozilla nspr4 libraries) AC_MSG_RESULT(no) fi - + if test "x${with_nss_includes}" != "xno" -a "x${have_nspr_libs}" != "xno"; then CPPFLAGS_save="$CPPFLAGS" - + AC_MSG_CHECKING(for Mozilla nss3 includes in $with_nss_includes) AC_MSG_RESULT("") - + if test "x${with_nspr_includes}" != "x"; then CPPFLAGS="$CPPFLAGS -I$with_nspr_includes -I$with_nss_includes" else CPPFLAGS="$CPPFLAGS -I$with_nss_includes" fi - + AC_CHECK_HEADERS(nss.h ssl.h smime.h, - [ have_nss_includes="yes" ], + [ have_nss_includes="yes" ], [ have_nss_includes="no" ]) - + CPPFLAGS="$CPPFLAGS_save" - - if test "x${have_nss_includes}" = "xyes"; then + + if test "x${have_nss_includes}" = "xyes"; then have_nss_includes="yes" MANUAL_NSS_CFLAGS="-I$with_nss_includes" else @@ -1180,10 +1180,10 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then AC_MSG_CHECKING(for Mozilla nss3 includes) AC_MSG_RESULT(no) fi - + if test "x${with_nss_libs}" != "xno" -a "x${have_nss_includes}" != "xno"; then LDFLAGS_save="$LDFLAGS" - + if test "$enable_nss" = "static"; then if test -z "${with_nss_libs}"; then AC_MSG_ERROR([Static linkage requested, but path to nss libraries not set.] @@ -1199,8 +1199,8 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then fi else nsslibs="-lssl3 -lsmime3 -lnss3" - fi - + fi + AC_CACHE_CHECK([for Mozilla nss libraries], ac_cv_moz_nss_libs, [ LIBS_save="$LIBS" @@ -1210,7 +1210,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then if test "$ac_cv_moz_nss_libs" = no; then nsslibs="-lssl3 -lsmime3 -lnss3" LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs" - AC_TRY_LINK_FUNC(NSS_Init, ac_cv_moz_nss_libs="yes", ac_cv_moz_nss_libs="no") + AC_TRY_LINK_FUNC(NSS_Init, ac_cv_moz_nss_libs="yes", ac_cv_moz_nss_libs="no") fi LDFLAGS="$LDFLAGS_save" LIBS="$LIBS_save" @@ -1238,7 +1238,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then AC_MSG_CHECKING(for Mozilla nss libraries) AC_MSG_RESULT(no) fi - + MANUAL_NSS_CFLAGS="$MANUAL_NSPR_CFLAGS $MANUAL_NSS_CFLAGS" MANUAL_NSS_LIBS="$MANUAL_NSPR_LIBS $MANUAL_NSS_LIBS" fi @@ -1255,18 +1255,18 @@ dnl ************************************************** dnl Check if we should build the weather calendar plugin dnl ************************************************** AC_MSG_CHECKING(if we should build the weather calendar plugin) -AC_ARG_WITH([weather], +AC_ARG_WITH([weather], [AS_HELP_STRING([--with-weather], [Build the weather calendar setup plugin (default=yes)])], - [use_gweather=$withval], + [use_gweather=$withval], [use_gweather=yes]) AC_MSG_RESULT($use_gweather) if test $use_gweather = yes; then - PKG_CHECK_MODULES([LIBGWEATHER], + PKG_CHECK_MODULES([LIBGWEATHER], [gweather >= gweather_minimum_version], - [CALENDAR_WEATHER="calendar-weather"], + [CALENDAR_WEATHER="calendar-weather"], [AC_MSG_ERROR([The weather calendar setup plugin requires GWeather >= gweather_minimum_version. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin.])]) -else +else CALENDAR_WEATHER="" fi @@ -1316,14 +1316,14 @@ dnl with_openssl_includes="$withval", with_openssl_includes="/usr/include") dnl have_openssl_includes="no" dnl if test "x${with_openssl_includes}" != "xno"; then dnl CPPFLAGS_save="$CPPFLAGS" -dnl +dnl dnl AC_MSG_CHECKING(for OpenSSL includes) dnl AC_MSG_RESULT("") -dnl +dnl dnl CPPFLAGS="$CPPFLAGS -I$with_openssl_includes" dnl AC_CHECK_HEADERS(openssl/ssl.h openssl/x509.h, [ openssl_includes="yes" ]) dnl CPPFLAGS="$CPPFLAGS_save" -dnl +dnl dnl if test "x{$openssl_includes}" != "xno" -a "x{$openssl_includes}" != "x"; then dnl have_openssl_includes="yes" dnl OPENSSL_CFLAGS="-I$with_openssl_includes" @@ -1334,17 +1334,17 @@ dnl else dnl AC_MSG_CHECKING(for OpenSSL includes) dnl AC_MSG_RESULT(no) dnl fi -dnl +dnl dnl AC_ARG_WITH(openssl-libs, [ --with-openssl-libs=PREFIX Location of OpenSSL libs.], dnl with_openssl_libs="$withval") dnl if test "x${with_openssl_libs}" != "xno" -a "x${have_openssl_includes}" != "xno"; then dnl LDFLAGS_save="$LDFLAGS" -dnl +dnl dnl case $with_openssl_libs in dnl ""|-L*) ;; dnl *) with_openssl_libs="-L$with_openssl_libs" ;; dnl esac -dnl +dnl dnl AC_CHECK_LIB(dl, dlopen, DL_LDFLAGS="-ldl", DL_LDFLAGS="") dnl AC_CACHE_CHECK([for OpenSSL libraries], openssl_libs, dnl [ @@ -1368,8 +1368,8 @@ dnl fi dnl else dnl OPENSSL_CFLAGS="" dnl OPENSSL_LDFLAGS="" -dnl -dnl +dnl +dnl dnl AC_SUBST(OPENSSL_CFLAGS) dnl AC_SUBST(OPENSSL_LDFLAGS) @@ -1468,7 +1468,7 @@ else fi AC_MSG_CHECKING([for yTNEF]) -AC_TRY_COMPILE([#include +AC_TRY_COMPILE([#include #include ], [TNEFStruct *tnef;], tnef_ok=yes, tnef_ok=no) if test "$tnef_ok" = "yes"; then @@ -1476,7 +1476,7 @@ if test "$tnef_ok" = "yes"; then TNEF_ATTACHMENTS="tnef-attachments" TNEF_CFLAGS="-DHAVE_YTNEF_H" else - AC_TRY_COMPILE([#include + AC_TRY_COMPILE([#include #include ], [TNEFStruct *tnef;], tnef_ok=yes, tnef_ok=no) if test "$tnef_ok" = "yes"; then @@ -1544,7 +1544,7 @@ AC_SUBST(TZDIALOG_LIBS) EVO_SET_COMPILE_FLAGS(E_WIDGETS, libbonoboui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE gtkhtml-editor) AC_SUBST(E_WIDGETS_CFLAGS) AC_SUBST(E_WIDGETS_LIBS) - + EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-$EDS_PACKAGE camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE libglade-2.0 libbonoboui-2.0 libgnomeui-2.0 libebook-$EDS_PACKAGE) AC_SUBST(IMPORTERS_CFLAGS) AC_SUBST(IMPORTERS_LIBS) @@ -1559,12 +1559,12 @@ NM_SUPPORT_PACKAGES="" PKG_CHECK_MODULES(NM, dbus-glib-1, NM_SUPPORT="yes", NM_SUPPORT="no") AC_CHECK_HEADER(NetworkManager/NetworkManager.h, [ nm_header="yes" ] ) -if test "x$NM_SUPPORT" = "xyes" -a "x$nm_header" = "xyes"; then +if test "x$NM_SUPPORT" = "xyes" -a "x$nm_header" = "xyes"; then AC_DEFINE(NM_SUPPORT, 1, [network manager available]) NM_SUPPORT_PACKAGES="dbus-1 dbus-glib-1" else NM_SUPPORT=no -fi +fi AM_CONDITIONAL(NM_SUPPORT, test x$NM_SUPPORT = xyes) @@ -1771,7 +1771,7 @@ AC_ARG_ENABLE([plugins], dnl Add any new plugins here plugins_base_always="calendar-file calendar-http $CALENDAR_WEATHER itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup publish-calendar caldav imap-features google-account-setup webdav-account-setup" -plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " +plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono" plugins_standard_always="bbdb subject-thread save-calendar mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder backup-restore email-custom-header templates pst-import vcard-inline" @@ -1892,7 +1892,7 @@ if ${PKG_CONFIG} --exists dbus-glib-1 ; then AC_DEFINE(HAVE_DBUS,1,[Define if you have DBUS support]) AC_SUBST(HAVE_DBUS) AM_CONDITIONAL(ENABLE_DBUS, true) - + else echo "warning: dbus-glib-1 was not found, Mail notification plugins's dbus message support not built" AM_CONDITIONAL(ENABLE_DBUS, false) -- cgit From fea8c66641a96e9ea4c1a78d8bbe995756f28e00 Mon Sep 17 00:00:00 2001 From: "H.Habighorst" Date: Wed, 24 Jun 2009 09:25:12 -0400 Subject: Bug 586806 – Fix iconv cflags/libs in configure.ac MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 765a9bbb60..e2e6a06b57 100644 --- a/configure.ac +++ b/configure.ac @@ -242,7 +242,7 @@ have_iconv=no AC_ARG_WITH([libiconv], AC_HELP_STRING([--with-libiconv=PATH], [Prefix where libiconv is installed])) -if test -d $withval; then +if test -d "$withval"; then ICONV_CFLAGS="-I$withval/include" ICONV_LIBS="-L$withval/lib" fi -- cgit From 94302ea73cde0b470faad653f752406f19f202d7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 24 Jun 2009 10:15:27 -0400 Subject: Bug 586809 – Enable "silent rules" automake 1.11 option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index e2e6a06b57..bd90aee9e4 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,9 @@ AC_CONFIG_SRCDIR(README) # Gnome Doc Initialization GNOME_DOC_INIT +# Automake 1.11 - Silent Build Rules +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + # Some requirements have versioned package names # XXX In the spirit of getting rid of versioned # files, can we please drop these suffixes? -- cgit From f0d3f3afdfa314e1e8cd7d8da790878008a46aad Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 24 Jun 2009 12:59:33 -0400 Subject: Radically reorganize source code. - Collect all shell modules into a new top-level 'modules' directory: $(top_srcdir)/modules/addressbook $(top_srcdir)/modules/calendar $(top_srcdir)/modules/mail Nothing is allowed to link to these, not plugins nor other modules. THIS SOLVES BUG #571275 AND OPENS THE DOOR TO PORTING TO MAC OS X. - Mimic the libevolution-mail-shared library from master (except drop the "shared" suffix) and have libevolution-mail-importers and all mail-related plugins link to it. - Discard the a11y subdirectories and have the files live alongside their counterpart widgets. --- configure.ac | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index bd90aee9e4..80bde6b9c1 100644 --- a/configure.ac +++ b/configure.ac @@ -25,9 +25,12 @@ AM_INIT_AUTOMAKE([gnu 1.9]) AC_CONFIG_HEADERS(config.h) AC_CONFIG_SRCDIR(README) -# Gnome Doc Initialization +# User Documentation GNOME_DOC_INIT +# Developer Documentation +GTK_DOC_CHECK(1.9) + # Automake 1.11 - Silent Build Rules m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -1787,7 +1790,7 @@ plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" dnl Temporary KILL-BONOBO hack -enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-source external-editor google-account-setup hula-account-setup imap-features mail-notification mark-all-read plugin-manager profiler sa-junk-plugin save-calendar subject-thread $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" +enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-source external-editor google-account-setup hula-account-setup imap-features mail-notification plugin-manager profiler sa-junk-plugin save-calendar subject-thread $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" dnl PLUGINS NOT BUILDING YET dnl ------------------------ @@ -1803,6 +1806,7 @@ dnl ipod-sync dnl itip-formatter dnl mailing-list-actions dnl mail-to-task +dnl mark-all-read dnl mono dnl prefer-plain dnl pst-import @@ -1994,7 +1998,6 @@ a11y/Makefile addressbook/Makefile addressbook/conduit/Makefile addressbook/gui/Makefile -addressbook/gui/component/Makefile addressbook/gui/contact-editor/Makefile addressbook/gui/contact-list-editor/Makefile addressbook/gui/merging/Makefile @@ -2056,7 +2059,6 @@ calendar/conduits/memo/Makefile calendar/gui/Makefile calendar/gui/alarm-notify/Makefile calendar/gui/dialogs/Makefile -calendar/module/Makefile composer/Makefile mail/Makefile mail/default/Makefile @@ -2080,6 +2082,11 @@ mail/default/sr/Makefile mail/default/sr@latin/Makefile mail/default/sv/Makefile mail/default/hu/Makefile +mail/importers/Makefile +modules/Makefile +modules/addressbook/Makefile +modules/calendar/Makefile +modules/mail/Makefile plugins/Makefile plugins/addressbook-file/Makefile plugins/attachment-reminder/Makefile -- cgit From fc69e596cc52aca862407cab4cb13f26876c6805 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 24 Jun 2009 22:28:22 -0400 Subject: Get the "mark-all-read" plugin working again. --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 80bde6b9c1..f4208e86c0 100644 --- a/configure.ac +++ b/configure.ac @@ -1790,7 +1790,7 @@ plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" dnl Temporary KILL-BONOBO hack -enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-source external-editor google-account-setup hula-account-setup imap-features mail-notification plugin-manager profiler sa-junk-plugin save-calendar subject-thread $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" +enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-source external-editor google-account-setup hula-account-setup imap-features mail-notification mark-all-read plugin-manager profiler sa-junk-plugin save-calendar subject-thread $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" dnl PLUGINS NOT BUILDING YET dnl ------------------------ @@ -1806,7 +1806,6 @@ dnl ipod-sync dnl itip-formatter dnl mailing-list-actions dnl mail-to-task -dnl mark-all-read dnl mono dnl prefer-plain dnl pst-import -- cgit From e0dfedddffb8cb56b74318692d01ccf0a7d57ad7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 24 Jun 2009 22:33:44 -0400 Subject: Get the "default-mailer" plugin working again. --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index f4208e86c0..11b1ffaaca 100644 --- a/configure.ac +++ b/configure.ac @@ -1790,13 +1790,12 @@ plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" dnl Temporary KILL-BONOBO hack -enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-source external-editor google-account-setup hula-account-setup imap-features mail-notification mark-all-read plugin-manager profiler sa-junk-plugin save-calendar subject-thread $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" +enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-mailer default-source external-editor google-account-setup hula-account-setup imap-features mail-notification mark-all-read plugin-manager profiler sa-junk-plugin save-calendar subject-thread $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" dnl PLUGINS NOT BUILDING YET dnl ------------------------ dnl backup-restore dnl calendar-weather -dnl default-mailer dnl email-custom-header dnl exchange-operations dnl face -- cgit From 634a470db0caaced80739c69a6810018567a1aac Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 24 Jun 2009 22:36:17 -0400 Subject: Get the "email-custom-header" plugin working again. --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 11b1ffaaca..632956d794 100644 --- a/configure.ac +++ b/configure.ac @@ -1790,13 +1790,12 @@ plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" dnl Temporary KILL-BONOBO hack -enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-mailer default-source external-editor google-account-setup hula-account-setup imap-features mail-notification mark-all-read plugin-manager profiler sa-junk-plugin save-calendar subject-thread $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" +enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-mailer default-source email-custom-header external-editor google-account-setup hula-account-setup imap-features mail-notification mark-all-read plugin-manager profiler sa-junk-plugin save-calendar subject-thread $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" dnl PLUGINS NOT BUILDING YET dnl ------------------------ dnl backup-restore dnl calendar-weather -dnl email-custom-header dnl exchange-operations dnl face dnl folder-unsubscribe -- cgit From 79e6d5efc32f1cfa33beeff58174bc710ffa67e4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 24 Jun 2009 23:04:49 -0400 Subject: Get the "face" plugin working again. --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 632956d794..988b4d8f1b 100644 --- a/configure.ac +++ b/configure.ac @@ -1790,14 +1790,13 @@ plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" dnl Temporary KILL-BONOBO hack -enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-mailer default-source email-custom-header external-editor google-account-setup hula-account-setup imap-features mail-notification mark-all-read plugin-manager profiler sa-junk-plugin save-calendar subject-thread $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" +enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features mail-notification mark-all-read plugin-manager profiler sa-junk-plugin save-calendar subject-thread $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" dnl PLUGINS NOT BUILDING YET dnl ------------------------ dnl backup-restore dnl calendar-weather dnl exchange-operations -dnl face dnl folder-unsubscribe dnl groupwise-features dnl ipod-sync -- cgit From af91eb424ba614ed3712a0e2d0c1b8b6e80ddea6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 24 Jun 2009 23:10:57 -0400 Subject: Get the "templates" plugin working again. --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 988b4d8f1b..70ca2c2550 100644 --- a/configure.ac +++ b/configure.ac @@ -1790,7 +1790,7 @@ plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" dnl Temporary KILL-BONOBO hack -enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features mail-notification mark-all-read plugin-manager profiler sa-junk-plugin save-calendar subject-thread $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" +enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features mail-notification mark-all-read plugin-manager profiler sa-junk-plugin save-calendar subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" dnl PLUGINS NOT BUILDING YET dnl ------------------------ @@ -1809,7 +1809,6 @@ dnl pst-import dnl publish-calendar dnl python dnl startup-wizard -dnl templates case x"$enable_plugins" in xno) -- cgit From e26654bf19d9d2b5df889631e6c211af0e7de655 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 24 Jun 2009 23:26:04 -0400 Subject: Get the "prefer-plain" plugin working again. --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 70ca2c2550..8cab9ff338 100644 --- a/configure.ac +++ b/configure.ac @@ -1790,7 +1790,7 @@ plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" dnl Temporary KILL-BONOBO hack -enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features mail-notification mark-all-read plugin-manager profiler sa-junk-plugin save-calendar subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" +enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features mail-notification mark-all-read plugin-manager prefer-plain profiler sa-junk-plugin save-calendar subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" dnl PLUGINS NOT BUILDING YET dnl ------------------------ @@ -1804,7 +1804,6 @@ dnl itip-formatter dnl mailing-list-actions dnl mail-to-task dnl mono -dnl prefer-plain dnl pst-import dnl publish-calendar dnl python -- cgit From f0cf88bc99a458193f2c16a3ed346c20f6a5fd1a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 25 Jun 2009 13:27:20 -0400 Subject: Kill the "folder-unsubscribe" plugin. Feature is now integrated in core mailer, and has a main menu item. --- configure.ac | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 8cab9ff338..78a5748543 100644 --- a/configure.ac +++ b/configure.ac @@ -1785,7 +1785,7 @@ plugins_standard_always="bbdb subject-thread save-calendar mail-to-task audio-in plugins_standard="$plugins_standard_always" all_plugins_standard="$plugins_standard" -plugins_experimental_always="face folder-unsubscribe external-editor hula-account-setup" +plugins_experimental_always="face external-editor hula-account-setup" plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN" all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" @@ -1797,7 +1797,6 @@ dnl ------------------------ dnl backup-restore dnl calendar-weather dnl exchange-operations -dnl folder-unsubscribe dnl groupwise-features dnl ipod-sync dnl itip-formatter @@ -2098,7 +2097,6 @@ plugins/email-custom-header/Makefile plugins/exchange-operations/Makefile plugins/external-editor/Makefile plugins/face/Makefile -plugins/folder-unsubscribe/Makefile plugins/google-account-setup/Makefile plugins/groupwise-account-setup/Makefile plugins/groupwise-features/Makefile -- cgit From ce37d56d0b42f88549e45920df29a06fdce3ce95 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 26 Jun 2009 11:05:58 -0400 Subject: Get the "mail-to-task" plugin working again. This one was more challenging. It exposed some flaws in the new shell design and in EPluginUI, which is good because they're fixed now. --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 78a5748543..a27a3b9b1a 100644 --- a/configure.ac +++ b/configure.ac @@ -1790,7 +1790,7 @@ plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" dnl Temporary KILL-BONOBO hack -enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features mail-notification mark-all-read plugin-manager prefer-plain profiler sa-junk-plugin save-calendar subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" +enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features mail-notification mail-to-task mark-all-read plugin-manager prefer-plain profiler sa-junk-plugin save-calendar subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" dnl PLUGINS NOT BUILDING YET dnl ------------------------ @@ -1801,7 +1801,6 @@ dnl groupwise-features dnl ipod-sync dnl itip-formatter dnl mailing-list-actions -dnl mail-to-task dnl mono dnl pst-import dnl publish-calendar -- cgit From 8dc6bbd250891bcef9130a789c9b74a01be7f1cb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 30 Jun 2009 10:47:59 -0400 Subject: Get the "startup-wizard" plugin working again. --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index a27a3b9b1a..565499187c 100644 --- a/configure.ac +++ b/configure.ac @@ -1790,7 +1790,7 @@ plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" dnl Temporary KILL-BONOBO hack -enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features mail-notification mail-to-task mark-all-read plugin-manager prefer-plain profiler sa-junk-plugin save-calendar subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" +enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features mail-notification mail-to-task mark-all-read plugin-manager prefer-plain profiler sa-junk-plugin save-calendar startup-wizard subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" dnl PLUGINS NOT BUILDING YET dnl ------------------------ @@ -1805,7 +1805,6 @@ dnl mono dnl pst-import dnl publish-calendar dnl python -dnl startup-wizard case x"$enable_plugins" in xno) -- cgit From b2f2de359791cc9cc67060234203e9deee961122 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 2 Jul 2009 15:02:27 -0400 Subject: Revert the version bump until 2.27.4 is actually released. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 4975ff1d3c..5df7d64d3d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Evolution Versions m4_define([evo_major_version], [2]) m4_define([evo_minor_version], [27]) -m4_define([evo_micro_version], [4]) +m4_define([evo_micro_version], [3]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit From 10eab2350036e1c36377c93d31472125b3e7c8c7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 10 Jul 2009 18:36:49 -0400 Subject: Implement the shutdown protocol and stub in session management. The shutdown protocol is modelled after online/offline preparation. Session management code is copied from libegg. Not yet used. --- configure.ac | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 42b8726cb0..df48cd719f 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,7 @@ m4_define([libgnomecanvas_minimum_version], [2.0.0]) # XXX Just a Guess m4_define([libgnomeui_minimum_version], [2.0.0]) # XXX Just a Guess m4_define([libxml_minimum_version], [2.7.3]) m4_define([shared_mime_info_minimum_version], [0.22]) -m4_define([unique_minimum_version], [1.0]) # XXX Just a Guess +m4_define([unique_minimum_version], [1.0.8]) # Optional Packages # @@ -1438,7 +1438,7 @@ dnl Utility macro to set compiler flags for a specific lib. dnl EVO_SET_COMPILE_FLAGS(VAR-PREFIX, DEPS, EXTRA-CFLAGS, EXTRA-LIBS) AC_DEFUN([EVO_SET_COMPILE_FLAGS], [ PKG_CHECK_MODULES([$1], [$2]) - $1_CFLAGS="[$]$1_CFLAGS \$(WERROR) $3" + $1_CFLAGS="[$]$1_CFLAGS $3" $1_LIBS="[$]$1_LIBS $4" ]) @@ -1644,6 +1644,12 @@ EVO_SET_COMPILE_FLAGS(EVOLUTION_TEST, gtk+-2.0 gconf-2.0 libxml-2.0 unique-1.0) AC_SUBST(EVOLUTION_TEST_CFLAGS) AC_SUBST(EVOLUTION_TEST_LIBS) +dnl --- eggsmclient flags + +EVO_SET_COMPILE_FLAGS(EGG_SMCLIENT, gtk+-2.0) +AC_SUBST(EGG_SMCLIENT_CFLAGS) +AC_SUBST(EGG_SMCLIENT_LIBS) + dnl ******************* dnl Special directories dnl ******************* @@ -2116,6 +2122,7 @@ plugins/templates/Makefile plugins/tnef-attachments/Makefile plugins/vcard-inline/Makefile plugins/webdav-account-setup/Makefile +smclient/Makefile smime/Makefile smime/lib/Makefile smime/gui/Makefile -- cgit From 3d62dcf4cb08e8acb98693561037d35fd8741c73 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 27 Jul 2009 09:26:17 -0400 Subject: Post-release version bump. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index a38b478223..2260dceecd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Evolution Versions m4_define([evo_major_version], [2]) m4_define([evo_minor_version], [27]) -m4_define([evo_micro_version], [5]) +m4_define([evo_micro_version], [90]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit From 5c94f4022841c61ed9717e92fa1d2df85536be3c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 30 Jul 2009 08:35:06 -0400 Subject: Fix an intltool issue in configure.ac. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 2260dceecd..9109837366 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,8 @@ m4_define([evo_stable_version], # Base Version: This is for API/version tracking for things like # Bonobo server files. This should always be the major/minor of # the stable version or stable version to be. -m4_define([base_version], [2.28]) +BASE_VERSION=2.28 +AC_SUBST([BASE_VERSION]) # Upgrade Revision: This is for triggering migration calls between # varying versions. Reset to 0 whenever BASE_VERSION changes. @@ -109,7 +110,6 @@ if test "$evo_version" != "$evo_stable_version"; then [Define to the latest stable version if this version is unstable]) fi -AC_SUBST([BASE_VERSION],[base_version]) AC_DEFINE_UNQUOTED(BASE_VERSION, ["$BASE_VERSION"], [Base version (Major.Minor)]) AC_SUBST([UPGRADE_REVISION],[upgrade_revision]) -- cgit From 6163cfd4a02a4adb490eaf0a0c0bde66e907785c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 31 Jul 2009 08:42:49 -0400 Subject: Re-fix intltool issue to not break other stuff. --- configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 9109837366..63848be7a4 100644 --- a/configure.ac +++ b/configure.ac @@ -11,9 +11,10 @@ m4_define([evo_stable_version], # Base Version: This is for API/version tracking for things like # Bonobo server files. This should always be the major/minor of -# the stable version or stable version to be. +# the stable version or stable version to be. Note, this is set +# the way it is so that GETTEXT_PACKAGE will be parsed correctly. BASE_VERSION=2.28 -AC_SUBST([BASE_VERSION]) +m4_define([base_version], [2.28]) # Upgrade Revision: This is for triggering migration calls between # varying versions. Reset to 0 whenever BASE_VERSION changes. @@ -110,6 +111,7 @@ if test "$evo_version" != "$evo_stable_version"; then [Define to the latest stable version if this version is unstable]) fi +AC_SUBST([BASE_VERSION], [base_version]) AC_DEFINE_UNQUOTED(BASE_VERSION, ["$BASE_VERSION"], [Base version (Major.Minor)]) AC_SUBST([UPGRADE_REVISION],[upgrade_revision]) -- cgit From e1655141406910938698f7d390900b93a40ce602 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 7 Aug 2009 18:44:07 +0200 Subject: Bug #586076 - [external-editor] Pass cursor pos to vim --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 63848be7a4..562b2b9519 100644 --- a/configure.ac +++ b/configure.ac @@ -52,7 +52,7 @@ m4_define([eds_minimum_version], [evo_version]) m4_define([gnome_icon_theme_minimum_version], [2.19.91]) m4_define([libbonobo_minimum_version], [2.20.3]) m4_define([libbonoboui_minimum_version], [2.4.2]) -m4_define([libgtkhtml_minimum_version], [3.25.4]) +m4_define([libgtkhtml_minimum_version], [3.27.90]) m4_define([gconf_minimum_version], [2.0.0]) # XXX Just a Guess m4_define([libglade_minimum_version], [2.0.0]) # XXX Just a Guess m4_define([libgnomecanvas_minimum_version], [2.0.0]) # XXX Just a Guess -- cgit From 94c55ab5622b0ed137207a8b4b48b708934204b6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 8 Aug 2009 23:14:19 -0400 Subject: Enforce including only top-level GLib and GTK+ headers. --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 562b2b9519..a93951c554 100644 --- a/configure.ac +++ b/configure.ac @@ -76,6 +76,8 @@ AS_COMPILER_FLAGS(WARNING_FLAGS, -DPANGO_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED + -DG_DISABLE_SINGLE_INCLUDES + -DGTK_DISABLE_SINGLE_INCLUDES -Wall -Wextra -Wno-missing-field-initializers -Wno-sign-compare -- cgit From 5573f943c385c8e224b7116f43e7615715499653 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 30 Jul 2009 10:39:17 -0400 Subject: Bug 590260 – Minimum requirement of libpst not checked MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index a93951c554..06e2b9aac4 100644 --- a/configure.ac +++ b/configure.ac @@ -59,6 +59,7 @@ m4_define([libgnomecanvas_minimum_version], [2.0.0]) # XXX Just a Guess m4_define([libgnomeui_minimum_version], [2.0.0]) # XXX Just a Guess m4_define([libxml_minimum_version], [2.7.3]) m4_define([shared_mime_info_minimum_version], [0.22]) +m4_define([libpst_minimum_version], [0.6.41]) m4_define([unique_minimum_version], [1.0.8]) # Optional Packages @@ -1853,7 +1854,7 @@ then dnl ********************* dnl libpst dnl ********************* - PKG_CHECK_MODULES([LIBPST], [libpst]) + PKG_CHECK_MODULES([LIBPST], [libpst >= libpst_minimum_version]) AC_SUBST(LIBPST_CFLAGS) AC_SUBST(LIBPST_LIBS) else -- cgit From f22e25d7352235c187059c4180c084cae3a28b74 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 3 Aug 2009 20:42:45 +0200 Subject: Bug #580895 - Kill libgnomeui/gnome-thumbnail.h --- configure.ac | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 06e2b9aac4..889fd413b0 100644 --- a/configure.ac +++ b/configure.ac @@ -50,6 +50,7 @@ m4_define([glib_minimum_version], [2.20.0]) m4_define([gtk_minimum_version], [2.16.0]) m4_define([eds_minimum_version], [evo_version]) m4_define([gnome_icon_theme_minimum_version], [2.19.91]) +m4_define([gnome_desktop_minimum_version], [2.26.0]) m4_define([libbonobo_minimum_version], [2.20.3]) m4_define([libbonoboui_minimum_version], [2.4.2]) m4_define([libgtkhtml_minimum_version], [3.27.90]) @@ -222,6 +223,7 @@ PKG_CHECK_MODULES([GNOME_PLATFORM], libgnomecanvas-2.0 >= libgnomecanvas_minimum_version libgnomeui-2.0 >= libgnomeui_minimum_version libxml-2.0 >= libxml_minimum_version + gnome-desktop-2.0 >= gnome_desktop_minimum_version shared-mime-info >= shared_mime_info_minimum_version unique-1.0 >= unique_minimum_version]) AC_SUBST(GNOME_PLATFORM_CFLAGS) @@ -1360,22 +1362,6 @@ dnl --- Flags to get all the GNOME stuff FULL_GNOME_DEPS="libbonoboui-2.0 gconf-2.0 gthread-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0" -CPPFLAGS_save="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags-only-I libgnomeui-2.0`" -AC_CHECK_HEADERS(libgnomeui/gnome-icon-lookup.h,,, -[[ - #if HAVE_LIBGNOMEUI_GNOME_ICON_LOOKUP_H - #include - #endif -]]) -AC_CHECK_HEADERS(libgnomeui/gnome-thumbnail.h,,, -[[ - #if HAVE_LIBGNOMEUI_GNOME_THUMBNAIL_H - #include - #endif -]]) -CPPFLAGS="$CPPFLAGS_save" - PKG_CHECK_MODULES([HAL], [hal >= hal_minimum_version], [HAVE_HAL="yes"], [HAVE_HAL="no"]) if test "x$HAVE_HAL" = "xyes"; then AC_DEFINE(HAVE_HAL, 1, [hal available]) @@ -1503,7 +1489,7 @@ else E_UTIL_X11_CFLAGS="" E_UTIL_X11_LIBS="" fi -EVO_SET_COMPILE_FLAGS(E_UTIL, libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $E_UTIL_X11_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $E_UTIL_X11_LIBS) +EVO_SET_COMPILE_FLAGS(E_UTIL, libbonoboui-2.0 libglade-2.0 gnome-desktop-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $E_UTIL_X11_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $E_UTIL_X11_LIBS) AC_SUBST(E_UTIL_CFLAGS) AC_SUBST(E_UTIL_LIBS) -- cgit From bbb11677c03c530b6f85d598d59ae065bec53ce7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 4 Aug 2009 15:58:56 +0530 Subject: Bug #580895 - Fix evolution build break --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 889fd413b0..58fb67aa8c 100644 --- a/configure.ac +++ b/configure.ac @@ -1489,7 +1489,7 @@ else E_UTIL_X11_CFLAGS="" E_UTIL_X11_LIBS="" fi -EVO_SET_COMPILE_FLAGS(E_UTIL, libbonoboui-2.0 libglade-2.0 gnome-desktop-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $E_UTIL_X11_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $E_UTIL_X11_LIBS) +EVO_SET_COMPILE_FLAGS(E_UTIL, libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gnome-desktop-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $E_UTIL_X11_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $E_UTIL_X11_LIBS) AC_SUBST(E_UTIL_CFLAGS) AC_SUBST(E_UTIL_LIBS) -- cgit From b5a2e47cb53aa92be37b469d3d9d625ea8477416 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Fri, 7 Aug 2009 09:02:32 +0530 Subject: Allow calendar to be written as a external app and split the huge .so to a share private lib and component lib. --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 58fb67aa8c..e14d6cefc8 100644 --- a/configure.ac +++ b/configure.ac @@ -223,7 +223,7 @@ PKG_CHECK_MODULES([GNOME_PLATFORM], libgnomecanvas-2.0 >= libgnomecanvas_minimum_version libgnomeui-2.0 >= libgnomeui_minimum_version libxml-2.0 >= libxml_minimum_version - gnome-desktop-2.0 >= gnome_desktop_minimum_version + gnome-desktop-2.0 >= gnome_desktop_minimum_version shared-mime-info >= shared_mime_info_minimum_version unique-1.0 >= unique_minimum_version]) AC_SUBST(GNOME_PLATFORM_CFLAGS) @@ -236,8 +236,8 @@ PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER], libedataserverui-$EDS_PACKAGE >= eds_minimum_version libegroupwise-$EDS_PACKAGE >= eds_minimum_version libebackend-$EDS_PACKAGE >= eds_minimum_version - libgdata-$EDS_PACKAGE >= eds_minimum_version - libgdata-google-$EDS_PACKAGE >= eds_minimum_version]) + libgdata-$EDS_PACKAGE >= eds_minimum_version + libgdata-google-$EDS_PACKAGE >= eds_minimum_version]) dnl ****************** dnl User Documentation @@ -1512,7 +1512,7 @@ AC_SUBST(LIBFILTER_CFLAGS) AC_SUBST(LIBFILTER_LIBS) dnl --- evolution (shell) flags -EVO_SET_COMPILE_FLAGS(SHELL, libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE unique-1.0 libedataserverui-$EDS_PACKAGE) +EVO_SET_COMPILE_FLAGS(SHELL, libgnomeui-2.0 libbonoboui-2.0 gnome-desktop-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE unique-1.0 libedataserverui-$EDS_PACKAGE) AC_SUBST(SHELL_CFLAGS) AC_SUBST(SHELL_LIBS) -- cgit From bc802dbf6ce81736c79ed363d4e9aceb35d349ef Mon Sep 17 00:00:00 2001 From: "H.Habighorst" Date: Mon, 10 Aug 2009 13:14:10 -0400 Subject: Bug 591321 – Cosmetic changes and fixes in configure.ac MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configure.ac | 455 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 228 insertions(+), 227 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index e14d6cefc8..9245e69748 100644 --- a/configure.ac +++ b/configure.ac @@ -1,51 +1,51 @@ -# Evolution Versions +dnl Evolution Versions m4_define([evo_major_version], [2]) m4_define([evo_minor_version], [27]) m4_define([evo_micro_version], [90]) m4_define([evo_version], - [evo_major_version.evo_minor_version.evo_micro_version]) + [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], - [m4_if(m4_eval(evo_minor_version % 2), [1], - [evo_major_version.m4_eval(evo_minor_version - 1)], - [evo_version])]) - -# Base Version: This is for API/version tracking for things like -# Bonobo server files. This should always be the major/minor of -# the stable version or stable version to be. Note, this is set -# the way it is so that GETTEXT_PACKAGE will be parsed correctly. + [m4_if(m4_eval(evo_minor_version % 2), [1], + [evo_major_version.m4_eval(evo_minor_version - 1)], + [evo_version])]) + +dnl Base Version: This is for API/version tracking for things like +dnl Bonobo server files. This should always be the major/minor of +dnl the stable version or stable version to be. Note, this is set +dnl the way it is so that GETTEXT_PACKAGE will be parsed correctly. BASE_VERSION=2.28 m4_define([base_version], [2.28]) -# Upgrade Revision: This is for triggering migration calls between -# varying versions. Reset to 0 whenever BASE_VERSION changes. +dnl Upgrade Revision: This is for triggering migration calls between +dnl varying versions. Reset to 0 whenever BASE_VERSION changes. m4_define([upgrade_revision], [0]) -# Autoconf / Automake Initialization +dnl Autoconf / Automake Initialization AC_PREREQ(2.58) AC_INIT([evolution],[evo_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution]) AM_INIT_AUTOMAKE([gnu 1.9]) AC_CONFIG_HEADERS(config.h) AC_CONFIG_SRCDIR(README) -# User Documentation +dnl User Documentation GNOME_DOC_INIT -# Developer Documentation +dnl Developer Documentation GTK_DOC_CHECK(1.9) dnl This is for the autoconf tests only - it set's the language we use AC_LANG(C) -# Automake 1.11 - Silent Build Rules +dnl Automake 1.11 - Silent Build Rules m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -# Some requirements have versioned package names -# XXX In the spirit of getting rid of versioned -# files, can we please drop these suffixes? +dnl Some requirements have versioned package names +dnl XXX In the spirit of getting rid of versioned +dnl files, can we please drop these suffixes? EDS_PACKAGE=1.2 GTKHTML_PACKAGE=3.14 -# Required Packages +dnl Required Packages m4_define([glib_minimum_version], [2.20.0]) m4_define([gtk_minimum_version], [2.16.0]) m4_define([eds_minimum_version], [evo_version]) @@ -54,16 +54,16 @@ m4_define([gnome_desktop_minimum_version], [2.26.0]) m4_define([libbonobo_minimum_version], [2.20.3]) m4_define([libbonoboui_minimum_version], [2.4.2]) m4_define([libgtkhtml_minimum_version], [3.27.90]) -m4_define([gconf_minimum_version], [2.0.0]) # XXX Just a Guess -m4_define([libglade_minimum_version], [2.0.0]) # XXX Just a Guess -m4_define([libgnomecanvas_minimum_version], [2.0.0]) # XXX Just a Guess -m4_define([libgnomeui_minimum_version], [2.0.0]) # XXX Just a Guess +m4_define([gconf_minimum_version], [2.0.0]) dnl XXX Just a Guess +m4_define([libglade_minimum_version], [2.0.0]) dnl XXX Just a Guess +m4_define([libgnomecanvas_minimum_version], [2.0.0]) dnl XXX Just a Guess +m4_define([libgnomeui_minimum_version], [2.0.0]) dnl XXX Just a Guess m4_define([libxml_minimum_version], [2.7.3]) m4_define([shared_mime_info_minimum_version], [0.22]) m4_define([libpst_minimum_version], [0.6.41]) m4_define([unique_minimum_version], [1.0.8]) -# Optional Packages +dnl Optional Packages m4_define([dbus_minimum_version], [0.74]) m4_define([nm_minimum_version],[0.7]) m4_define([hal_minimum_version], [0.5.4]) @@ -71,7 +71,7 @@ m4_define([libnotify_minimum_version], [0.3.0]) m4_define([gnome_pilot_minimum_version], [2.0.15]) m4_define([gweather_minimum_version], [2.25.3]) -# Compiler Warning Flags +dnl Compiler Warning Flags AS_COMPILER_FLAGS(WARNING_FLAGS, "-DG_DISABLE_DEPRECATED @@ -92,12 +92,11 @@ AS_COMPILER_FLAGS(WARNING_FLAGS, -Wredundant-decls -Wundef -Wwrite-strings") AC_SUBST(WARNING_FLAGS) -# Other useful compiler warnings for test builds only. -# These may produce warnings we have no control over. -# -# -Wmissing-format-attribute -# -Wshadow -# -Wformat-nonliteral +dnl Other useful compiler warnings for test builds only. +dnl These may produce warnings we have no control over. +dnl -Wmissing-format-attribute +dnl -Wshadow +dnl -Wformat-nonliteral CFLAGS="$CFLAGS $WARNING_FLAGS" @@ -111,8 +110,8 @@ dnl Initialize maintainer mode AM_MAINTAINER_MODE if test "$evo_version" != "$evo_stable_version"; then - AC_DEFINE(STABLE_VERSION, ["evo_stable_version"], - [Define to the latest stable version if this version is unstable]) + AC_DEFINE(STABLE_VERSION, ["evo_stable_version"], + [Define to the latest stable version if this version is unstable]) fi AC_SUBST([BASE_VERSION], [base_version]) @@ -143,9 +142,9 @@ AC_ARG_PROGRAM dnl Test whether jw is installed AC_PATH_PROG(JW,jw,no) if test x$JW = xno; then - HAVE_JW="no" + HAVE_JW="no" else - HAVE_JW="yes" + HAVE_JW="yes" fi AM_CONDITIONAL(HAVE_JW, [test x$HAVE_JW = xyes]) AC_SUBST(HAVE_JW) @@ -177,22 +176,25 @@ dnl Win32 AC_MSG_CHECKING([for Win32]) case "$host" in *-mingw*) - os_win32=yes - NO_UNDEFINED='-no-undefined' - SOEXT='.dll' - SA_JUNK_PLUGIN='' - BF_JUNK_PLUGIN='' - DL_LIB='' - HAL_REQUIREMENT='' - ;; -*) os_win32=no - NO_UNDEFINED='-Wl,-no-undefined' - SOEXT='.so' - SA_JUNK_PLUGIN=sa-junk-plugin - BF_JUNK_PLUGIN=bogo-junk-plugin - DL_LIB='-ldl' - HAL_REQUIREMENT='hal' - ;; + os_win32=yes + NO_UNDEFINED='-no-undefined' + SOEXT='.dll' + SA_JUNK_PLUGIN='' + BF_JUNK_PLUGIN='' + DL_LIB='' + SOFTOKN3_LIB='' + HAL_REQUIREMENT='' + ;; +*) + os_win32=no + NO_UNDEFINED='' + SOEXT='.so' + SA_JUNK_PLUGIN=sa-junk-plugin + BF_JUNK_PLUGIN=bogo-junk-plugin + DL_LIB='-ldl' + SOFTOKN3_LIB='-lsoftokn3' + HAL_REQUIREMENT='hal' + ;; esac AC_MSG_RESULT([$os_win32]) AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes]) @@ -203,41 +205,41 @@ MATH_LIB="-lm" AC_SUBST(MATH_LIB) if test "$os_win32" = "yes"; then - AC_CHECK_TOOL(WINDRES, windres, :) + AC_CHECK_TOOL(WINDRES, windres, :) else - WINDRES=":" + WINDRES=":" fi AM_CONDITIONAL(HAVE_WINDRES, test "x$WINDRES" != "x:") AC_SUBST(WINDRES) -# Check for base dependencies early. +dnl Check for base dependencies early. PKG_CHECK_MODULES([GNOME_PLATFORM], - [glib-2.0 >= glib_minimum_version - gtk+-2.0 >= gtk_minimum_version - gconf-2.0 >= gconf_minimum_version - libbonobo-2.0 >= libbonobo_minimum_version - libbonoboui-2.0 >= libbonoboui_minimum_version - libglade-2.0 >= libglade_minimum_version - libgnomecanvas-2.0 >= libgnomecanvas_minimum_version - libgnomeui-2.0 >= libgnomeui_minimum_version - libxml-2.0 >= libxml_minimum_version - gnome-desktop-2.0 >= gnome_desktop_minimum_version - shared-mime-info >= shared_mime_info_minimum_version - unique-1.0 >= unique_minimum_version]) + [glib-2.0 >= glib_minimum_version + gtk+-2.0 >= gtk_minimum_version + gconf-2.0 >= gconf_minimum_version + libbonobo-2.0 >= libbonobo_minimum_version + libbonoboui-2.0 >= libbonoboui_minimum_version + libglade-2.0 >= libglade_minimum_version + libgnomecanvas-2.0 >= libgnomecanvas_minimum_version + libgnomeui-2.0 >= libgnomeui_minimum_version + libxml-2.0 >= libxml_minimum_version + shared-mime-info >= shared_mime_info_minimum_version + gnome-desktop-2.0 >= gnome_desktop_minimum_version]) AC_SUBST(GNOME_PLATFORM_CFLAGS) AC_SUBST(GNOME_PLATFORM_LIBS) PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER], - [libebook-$EDS_PACKAGE >= eds_minimum_version - libecal-$EDS_PACKAGE >= eds_minimum_version - libedataserver-$EDS_PACKAGE >= eds_minimum_version - libedataserverui-$EDS_PACKAGE >= eds_minimum_version - libegroupwise-$EDS_PACKAGE >= eds_minimum_version - libebackend-$EDS_PACKAGE >= eds_minimum_version - libgdata-$EDS_PACKAGE >= eds_minimum_version - libgdata-google-$EDS_PACKAGE >= eds_minimum_version]) + [libebook-$EDS_PACKAGE >= eds_minimum_version + libecal-$EDS_PACKAGE >= eds_minimum_version + libedataserver-$EDS_PACKAGE >= eds_minimum_version + libedataserverui-$EDS_PACKAGE >= eds_minimum_version + libegroupwise-$EDS_PACKAGE >= eds_minimum_version + libebackend-$EDS_PACKAGE >= eds_minimum_version + libgdata-$EDS_PACKAGE >= eds_minimum_version + libgdata-google-$EDS_PACKAGE >= eds_minimum_version]) + dnl ****************** dnl User Documentation @@ -262,29 +264,28 @@ AC_CACHE_CHECK([for iconv in -liconv], [ac_cv_libiconv], #include #include ]], - [[ - iconv_t cd; - cd = iconv_open ("UTF-8", "ISO-8859-1"); + [[ iconv_t cd; + cd = iconv_open ("UTF-8", "ISO-8859-1"); ]] )],[ac_cv_libiconv=yes],[ac_cv_libiconv=no])) if test $ac_cv_libiconv = yes; then - ICONV_LIBS="-liconv" + ICONV_LIBS="-liconv" if test $os_win32 = yes; then - # Don't pointlessly auto-export the global symbols - # from a potentially static libiconv.a + dnl Don't pointlessly auto-export the global symbols + dnl from a potentially static libiconv.a ICONV_LIBS="$ICONV_LIBS -Wl,--exclude-libs=libiconv.a" fi - have_iconv=yes + have_iconv=yes else - LIBS="$save_LIBS" - AC_CHECK_FUNC(iconv, have_iconv=yes, have_iconv=no) + LIBS="$save_LIBS" + AC_CHECK_FUNC(iconv, have_iconv=yes, have_iconv=no) fi if test $have_iconv = yes; then - if test $ac_cv_libiconv = no; then - AC_CHECK_FUNCS(gnu_get_libc_version) - fi + if test $ac_cv_libiconv = no; then + AC_CHECK_FUNCS(gnu_get_libc_version) + fi AC_CACHE_CHECK([if iconv() handles UTF-8], [ac_cv_libiconv_utf8], AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include @@ -320,7 +321,7 @@ AC_CACHE_CHECK([if iconv() handles UTF-8], [ac_cv_libiconv_utf8], fi if test "$have_iconv" = no; then - AC_MSG_ERROR([You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv]) + AC_MSG_ERROR([You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv]) fi AC_SUBST(ICONV_LIBS) @@ -501,25 +502,26 @@ dnl ************************************************** dnl stat(v)fs location/type dnl ************************************************** -AC_CHECK_HEADERS(sys/statvfs.h,,, -[[ - #if HAVE_SYS_STATVFS_H - #include - #endif -]]) +AC_CHECK_HEADER([sys/statvfs.h], + [AC_DEFINE([HAVE_SYS_STATVFS_H], 1, [Have ])],, + [[ #if HAVE_SYS_STATVFS_H + #include + #endif + ]]) AC_CHECK_FUNCS(statvfs) -AC_CHECK_HEADERS(sys/param.h,,, -[[ - #if HAVE_SYS_PARAM_H - #include - #endif -]]) -AC_CHECK_HEADERS(sys/mount.h,,, -[[ - #if HAVE_SYS_MOUNT_H - #include - #endif -]]) + +AC_CHECK_HEADER([sys/param.h], + [AC_DEFINE([HAVE_SYS_PARAM_H], 1, [Have ])],, + [[ #if HAVE_SYS_PARAM_H + #include + #endif + ]]) +AC_CHECK_HEADER([sys/mount.h], + [AC_DEFINE([HAVE_SYS_MOUNT_H], 1, [Have ])],, + [[ #if HAVE_SYS_MOUNT_H + #include + #endif + ]]) AC_CHECK_FUNCS(statfs) dnl ************************************************** @@ -577,7 +579,7 @@ AC_CHECK_FUNCS(ldap_ntlm_bind) CFLAGS="$SAVE_CFLAGS" LIBS="$SAVE_LIBS" -else # Win32 +else dnl Win32 LDAP_CFLAGS="-DLDAP_DEPRECATED" LDAP_LIBS="-lwldap32" AC_SUBST(LDAP_CFLAGS) @@ -585,7 +587,7 @@ AC_SUBST(LDAP_LIBS) AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support]) AM_CONDITIONAL(ENABLE_LDAP, true) msg_ldap="yes" -fi # Win32 +fi dnl Win32 dnl ************************************************** dnl SunLDAP support, but if OpenLDAP support, skip check SunLDAP. @@ -594,20 +596,20 @@ if test "$with_openldap" = no ; then EVO_SUNLDAP_CHECK(no) case $with_sunldap in no) - msg_ldap=no - ;; - *) - case $with_static_sunldap in - yes) - msg_ldap="$with_sunldap (static)" - ;; - *) - msg_ldap="$with_sunldap (dynamic)" - ;; - esac - esac + msg_ldap=no + ;; + *) + case $with_static_sunldap in + yes) + msg_ldap="$with_sunldap (static)" + ;; + *) + msg_ldap="$with_sunldap (dynamic)" + ;; + esac + esac else - with_sunldap=no + with_sunldap=no fi AM_CONDITIONAL(SUNLDAP, [test x$with_sunldap != xno]) @@ -659,12 +661,12 @@ dnl Libraries dnl ********* AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(regex,regexec, - [REGEX_LIBS=-lregex - AC_DEFINE(HAVE_REGEXEC,1,[Define to 1 if you have the regexec function.])], - [AC_MSG_ERROR([No regex library found])])]) + [REGEX_LIBS=-lregex + AC_DEFINE(HAVE_REGEXEC,1,[Define to 1 if you have the regexec function.])], + [AC_MSG_ERROR([No regex library found])])]) AC_SUBST(REGEX_LIBS) -# XXX Drop the version from the package name? +dnl XXX Drop the version from the package name? PKG_CHECK_MODULES([GTKHTML], [libgtkhtml-3.14 >= libgtkhtml_minimum_version]) AC_SUBST(GTKHTML_CFLAGS) AC_SUBST(GTKHTML_LIBS) @@ -716,21 +718,21 @@ AM_CONDITIONAL(ENABLE_PILOT_CONDUITS, [test x$enable_pilot_conduits = xyes]) dnl ****************************** dnl If pilot conduits are enabled, check version of pilot-link dnl ****************************** - if test x$enable_pilot_conduits = xyes; then - msg_pilot=yes - - PILOT_LINK_CHECK(0.11.4) - AC_SUBST(PILOT_LINK_MAJOR) - AC_SUBST(PILOT_LINK_MINOR) - AC_SUBST(PILOT_LINK_MICRO) - AC_SUBST(PILOT_LINK_PATCH) - AC_SUBST(PILOT_LINK_VERSION) - - if test $PILOT_LINK_MINOR -ge 12; then - AC_DEFINE(PILOT_LINK_0_12,,[Building against pilot-link 0.12.0 or greater]) - fi +if test x$enable_pilot_conduits = xyes; then + msg_pilot=yes + + PILOT_LINK_CHECK(0.11.4) + AC_SUBST(PILOT_LINK_MAJOR) + AC_SUBST(PILOT_LINK_MINOR) + AC_SUBST(PILOT_LINK_MICRO) + AC_SUBST(PILOT_LINK_PATCH) + AC_SUBST(PILOT_LINK_VERSION) + + if test $PILOT_LINK_MINOR -ge 12; then + AC_DEFINE(PILOT_LINK_0_12,,[Building against pilot-link 0.12.0 or greater]) + fi else - msg_pilot=no + msg_pilot=no fi AC_SUBST(GNOME_PILOT_CFLAGS) AC_SUBST(GNOME_PILOT_LIBS) @@ -823,16 +825,18 @@ else AC_MSG_RESULT([$with_krb5]) fi -AC_CHECK_HEADER([et/com_err.h],,, -[[#if HAVE_ET_COM_ERR_H -#include -#endif -]]) -AC_CHECK_HEADER([com_err.h],,, -[[#if HAVE_ET_COM_ERR_H -#include -#endif -]]) +AC_CHECK_HEADER([et/com_err.h], + [AC_DEFINE([HAVE_ET_COM_ERR_H], 1, [Have ])],, + [[ #if HAVE_ET_COM_ERR_H + #include + #endif + ]]) +AC_CHECK_HEADER([com_err.h], + [AC_DEFINE([HAVE_COM_ERR_H], 1, [Have ])],, + [[ #if HAVE_COM_ERR_H + #include + #endif + ]]) msg_krb4="no" if test "x${with_krb4}" != "xno"; then @@ -842,19 +846,19 @@ if test "x${with_krb4}" != "xno"; then ac_cv_lib_kerberos4="no" mitcompatlibs="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err" - # Look for MIT krb5 compat krb4 + dnl Look for MIT krb5 compat krb4 LDFLAGS="$LDFLAGS -L$with_krb4_libs $mitcompatlibs" AC_LINK_IFELSE([AC_LANG_CALL([], [krb_mk_req])], [ac_cv_lib_kerberos4="$mitcompatlibs"]) if test "$ac_cv_lib_kerberos4" = "no"; then - # Look for KTH krb4 + dnl Look for KTH krb4 LDFLAGS="$LDFLAGS_save -L$with_krb4_libs -lkrb -lcrypto -lcom_err -lroken" AC_LINK_IFELSE([AC_LANG_CALL([], [krb_mk_req])], [ac_cv_lib_kerberos4="-lkrb -lcrypto -lcom_err -lroken"]) fi if test "$ac_cv_lib_kerberos4" = "no"; then - # Look for old MIT krb4 + dnl Look for old MIT krb4 LDFLAGS="$LDFLAGS_save -L$with_krb4_libs -lkrb" AC_LINK_IFELSE([AC_LANG_CALL([], [krb_mk_req])], [ac_cv_lib_kerberos4="-lkrb"], @@ -1202,7 +1206,8 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then msg_ssl="yes (Mozilla NSS:static)" else msg_ssl="yes (Mozilla NSS)" - fi # static_nss + fi + dnl static_nss if test "$enable_smime" = "yes"; then AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled]) msg_smime="yes (Mozilla NSS)" @@ -1242,9 +1247,9 @@ AC_MSG_RESULT([$use_gweather]) if test $use_gweather = yes; then PKG_CHECK_MODULES([LIBGWEATHER], - [gweather >= gweather_minimum_version], - [CALENDAR_WEATHER="calendar-weather"], - [AC_MSG_ERROR([The weather calendar setup plugin requires GWeather >= gweather_minimum_version. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin.])]) + [gweather >= gweather_minimum_version], + [CALENDAR_WEATHER="calendar-weather"], + [AC_MSG_ERROR([The weather calendar setup plugin requires GWeather >= gweather_minimum_version. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin.])]) else CALENDAR_WEATHER="" fi @@ -1298,19 +1303,19 @@ dnl Check for X libs and -lX11 dnl ************************** PKG_CHECK_MODULES([X], [x11], [:], [ -# pkg-config modules not found (only present since X11R7 aka Xorg); use -# old-style detection +dnl pkg-config modules not found (only present since X11R7 aka Xorg); use +dnl old-style detection AC_PATH_XTRA -# X found +dnl X found if test x$no_x != xyes ; then - evolution_save_cflags="$CFLAGS" - evolution_save_libs="$LIBS" - CFLAGS="$X_CFLAGS" - LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS" - AC_CHECK_LIB(X11, XFree, :, AC_MSG_ERROR([libX11 not found])) - CFLAGS="$evolution_save_cflags" - LIBS="$evolution_save_libs" - X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" + evolution_save_cflags="$CFLAGS" + evolution_save_libs="$LIBS" + CFLAGS="$X_CFLAGS" + LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS" + AC_CHECK_LIB(X11, XFree, :, AC_MSG_ERROR([libX11 not found])) + CFLAGS="$evolution_save_cflags" + LIBS="$evolution_save_libs" + X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" fi ]) @@ -1320,20 +1325,18 @@ dnl if it's X11, we -lX11 dnl ************************* evolution_save_cflags="$CFLAGS" -# pull in the CFLAGS to locate gdkconfig.h +dnl pull in the CFLAGS to locate gdkconfig.h CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0` AC_COMPILE_IFELSE([ -#include - -int main(void) { -#ifndef GDK_WINDOWING_X11 -#error GDK_WINDOWING_X11 not defined -#endif - return 0; -} -], - GDK_BACKEND_X11=yes, - GDK_BACKEND_X11=no) + #include + int main(void){ + #ifndef GDK_WINDOWING_X11 + #error GDK_WINDOWING_X11 not defined + #endif + return 0; + }], + GDK_BACKEND_X11=yes, + GDK_BACKEND_X11=no) CFLAGS="$evolution_save_cflags" @@ -1341,12 +1344,12 @@ CFLAGS="$evolution_save_cflags" AM_PATH_ORBIT2(2.9.8) AC_MSG_CHECKING([for CORBA include paths]) -IDL_INCLUDES="-I "`pkg-config --variable=idldir libbonobo-2.0`" -I "`pkg-config --variable=idldir bonobo-activation-2.0`" -I "`pkg-config --variable=idldir evolution-data-server-1.2` +IDL_INCLUDES="-I "`${PKG_CONFIG} --variable=idldir libbonobo-2.0`" -I "`${PKG_CONFIG} --variable=idldir bonobo-activation-2.0`" -I "`${PKG_CONFIG} --variable=idldir evolution-data-server-1.2` AC_MSG_RESULT([$IDL_INCLUDES]) AC_SUBST(IDL_INCLUDES) dnl Utility macro to set compiler flags for a specific lib. -dnl EVO_SET_COMPILE_FLAGS(VAR-PREFIX, DEPS, EXTRA-CFLAGS, EXTRA-LIBS) +dnl EVO_SET_COMPILE_FLAGS(VAR-PREFIX, DEPS, EXTRA-CFLAGS, EXTRA-LIBS) AC_DEFUN([EVO_SET_COMPILE_FLAGS], [ PKG_CHECK_MODULES([$1], [$2]) $1_CFLAGS="[$]$1_CFLAGS $3" @@ -1364,12 +1367,12 @@ FULL_GNOME_DEPS="libbonoboui-2.0 gconf-2.0 gthread-2.0 gobject-2.0 libgnomeui-2. PKG_CHECK_MODULES([HAL], [hal >= hal_minimum_version], [HAVE_HAL="yes"], [HAVE_HAL="no"]) if test "x$HAVE_HAL" = "xyes"; then - AC_DEFINE(HAVE_HAL, 1, [hal available]) - HAL_REQUIREMENT="hal" - IPOD_SYNC="ipod-sync" + AC_DEFINE(HAVE_HAL, 1, [hal available]) + HAL_REQUIREMENT="hal" + IPOD_SYNC="ipod-sync" else - HAL_REQUIREMENT="" - IPOD_SYNC="" + HAL_REQUIREMENT="" + IPOD_SYNC="" fi AC_MSG_CHECKING([for yTNEF]) @@ -1462,17 +1465,15 @@ AC_SUBST(CAMEL_GROUPWISE_CFLAGS) AC_SUBST(CAMEL_GROUPWISE_LIBS) if test "x$mozilla_nss" != "x"; then - EVO_SET_COMPILE_FLAGS(MOZILLA_NSS, $mozilla_nss) - MOZILLA_L_DIR=`pkg-config --libs-only-L $mozilla_nss` + EVO_SET_COMPILE_FLAGS(MOZILLA_NSS, $mozilla_nss) + MOZILLA_L_DIR=`${PKG_CONFIG} --libs-only-L $mozilla_nss` else if test "x$MOZILLA_MANUAL_LIBS" != "x"; then - MOZILLA_L_DIR="-L$with_nss_lib" + MOZILLA_L_DIR="-L$with_nss_lib" fi fi -EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-$EDS_PACKAGE libglade-2.0 gthread-2.0, - $MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS, - $MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS) +EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-$EDS_PACKAGE libglade-2.0 gthread-2.0, $MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS, $MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS) AC_SUBST(CERT_UI_CFLAGS) AC_SUBST(CERT_UI_LIBS) @@ -1480,8 +1481,8 @@ EVO_SET_COMPILE_FLAGS(E_NAME, libgnomeui-2.0 libbonoboui-2.0) AC_SUBST(E_NAME_CFLAGS) AC_SUBST(E_NAME_LIBS) -# If Gtk/Gdk is built against X11, e-util uses some -# X11-specific code so link with X11. +dnl If Gtk/Gdk is built against X11, e-util uses some +dnl X11-specific code so link with X11. if test "x$GDK_BACKEND_X11" = "xyes"; then E_UTIL_X11_CFLAGS="$X_CFLAGS" E_UTIL_X11_LIBS="$X_LIBS" @@ -1567,13 +1568,13 @@ AC_SUBST(EVOLUTION_MAIL_LIBS) dnl -- evolution-data-server IDL and version AC_DEFINE(DATASERVER_API_VERSION, "1.2", evolution-data-server API version) -AC_DEFINE_UNQUOTED(DATASERVER_VERSION, "`pkg-config --modversion evolution-data-server-1.2`", evolution-data-server version) +AC_DEFINE_UNQUOTED(DATASERVER_VERSION, "`${PKG_CONFIG} --modversion evolution-data-server-1.2`", evolution-data-server version) -DATASERVER_EXEC_VERSION=`pkg-config --variable=execversion evolution-data-server-1.2` +DATASERVER_EXEC_VERSION=`${PKG_CONFIG} --variable=execversion evolution-data-server-1.2` AC_SUBST(DATASERVER_EXEC_VERSION) AC_MSG_CHECKING([for evolution-data-server IDL]) -DATASERVER_IDL=`pkg-config --variable=idldir evolution-data-server-1.2`/Evolution-DataServer.idl +DATASERVER_IDL=`${PKG_CONFIG} --variable=idldir evolution-data-server-1.2`/Evolution-DataServer.idl if test -f "$DATASERVER_IDL"; then AC_MSG_RESULT([$DATASERVER_IDL]) AC_SUBST(DATASERVER_IDL) @@ -1638,23 +1639,23 @@ images16dir="$privdatadir/images/16x16" AC_SUBST(images16dir) if test "$os_win32" = yes; then - # On Win32 there is no "rpath" mechanism. We install the private - # shared libraries in $libdir, meaning the DLLs will actually be in - # $bindir. This means just having $bindir in PATH will be enough. This - # also means gnome_win32_get_prefixes() will be able to deduce the - # installation folder correctly. - privsolibdir=$libdir - # On Win32, use a relative path to the executables in .server - # files. The path is relative to the folder where the .server file - # is, i.e. $prefix/lib/bonobo/servers. - bindir_in_server_file=../../../bin - privlibexecdir_in_server_file=../../../libexec/evolution/$BASE_VERSION - componentdir_in_server_file=../../../lib/evolution/$BASE_VERSION/components + dnl On Win32 there is no "rpath" mechanism. We install the private + dnl shared libraries in $libdir, meaning the DLLs will actually be in + dnl $bindir. This means just having $bindir in PATH will be enough. This + dnl also means gnome_win32_get_prefixes() will be able to deduce the + dnl installation folder correctly. + privsolibdir=$libdir + dnl On Win32, use a relative path to the executables in .server + dnl files. The path is relative to the folder where the .server file + dnl is, i.e. $prefix/lib/bonobo/servers. + bindir_in_server_file=../../../bin + privlibexecdir_in_server_file=../../../libexec/evolution/$BASE_VERSION + componentdir_in_server_file=../../../lib/evolution/$BASE_VERSION/components else - privsolibdir=$privlibdir - bindir_in_server_file="$bindir" - privlibexecdir_in_server_file='${libexecdir}'/evolution/$BASE_VERSION - componentdir_in_server_file="$componentdir" + privsolibdir=$privlibdir + bindir_in_server_file="$bindir" + privlibexecdir_in_server_file='${libexecdir}'/evolution/$BASE_VERSION + componentdir_in_server_file="$componentdir" fi AC_SUBST(privsolibdir) AC_SUBST(bindir_in_server_file) @@ -2064,18 +2065,18 @@ echo " fi echo " - LDAP support: $msg_ldap - HAL: $HAVE_HAL - DBUS: $DBUS_SUPPORT - NetworkManager: $NM_SUPPORT - NNTP support: $msg_nntp - Pilot conduits: $msg_pilot - Libnotify: $HAVE_LIBNOTIFY - Kerberos 4/5: $msg_krb4/$msg_krb5 - SSL support: $msg_ssl - SMIME support: $msg_smime - Plugins: $msg_plugins - User documentation: $with_help - Mono bindings: $enable_mono - Python bindings: $enable_python + LDAP support: $msg_ldap + HAL: $HAVE_HAL + DBUS: $DBUS_SUPPORT + NetworkManager: $NM_SUPPORT + NNTP support: $msg_nntp + Pilot conduits: $msg_pilot + Libnotify: $HAVE_LIBNOTIFY + Kerberos 4/5: $msg_krb4/$msg_krb5 + SSL support: $msg_ssl + SMIME support: $msg_smime + Plugins: $msg_plugins + User documentation: $with_help + Mono bindings: $enable_mono + Python bindings: $enable_python " -- cgit From c8464aecbb1691947d8fd7a54e9b9adac85271ed Mon Sep 17 00:00:00 2001 From: "H.Habighorst" Date: Mon, 10 Aug 2009 15:31:21 -0400 Subject: Bug 591326 – Keep m4 macros in their own folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configure.ac | 1 + 1 file changed, 1 insertion(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 9245e69748..0d457a41fa 100644 --- a/configure.ac +++ b/configure.ac @@ -24,6 +24,7 @@ dnl Autoconf / Automake Initialization AC_PREREQ(2.58) AC_INIT([evolution],[evo_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution]) AM_INIT_AUTOMAKE([gnu 1.9]) +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS(config.h) AC_CONFIG_SRCDIR(README) -- cgit From 5e31896863e915fb2a7f613c029fb91aeaa2e42c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 11 Aug 2009 22:48:14 -0400 Subject: Get the pst-import plugin working. --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 0d457a41fa..6ffa980211 100644 --- a/configure.ac +++ b/configure.ac @@ -1735,7 +1735,7 @@ plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" dnl Temporary KILL-BONOBO hack -enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features mail-notification mail-to-task mark-all-read plugin-manager prefer-plain profiler sa-junk-plugin save-calendar startup-wizard subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" +enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features mail-notification mail-to-task mark-all-read plugin-manager prefer-plain profiler pst-import sa-junk-plugin save-calendar startup-wizard subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" dnl PLUGINS NOT BUILDING YET dnl ------------------------ @@ -1747,7 +1747,6 @@ dnl ipod-sync dnl itip-formatter dnl mailing-list-actions dnl mono -dnl pst-import dnl publish-calendar dnl python -- cgit From e68456f60f37d5d6e18fac95a5a9ddea2e9627fa Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 11 Aug 2009 23:19:03 -0400 Subject: Get the calendar-weather plugin working. --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 6ffa980211..10c9c0db19 100644 --- a/configure.ac +++ b/configure.ac @@ -1735,12 +1735,11 @@ plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" dnl Temporary KILL-BONOBO hack -enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features mail-notification mail-to-task mark-all-read plugin-manager prefer-plain profiler pst-import sa-junk-plugin save-calendar startup-wizard subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" +enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http calendar-weather default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features mail-notification mail-to-task mark-all-read plugin-manager prefer-plain profiler pst-import sa-junk-plugin save-calendar startup-wizard subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" dnl PLUGINS NOT BUILDING YET dnl ------------------------ dnl backup-restore -dnl calendar-weather dnl exchange-operations dnl groupwise-features dnl ipod-sync -- cgit From 9199f2c5b1925b6d1092738bf1a1c026e53d37f0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 12 Aug 2009 09:29:44 -0400 Subject: Get the itip-formatter plugin working. --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 10c9c0db19..c4a468c719 100644 --- a/configure.ac +++ b/configure.ac @@ -1735,7 +1735,7 @@ plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" dnl Temporary KILL-BONOBO hack -enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http calendar-weather default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features mail-notification mail-to-task mark-all-read plugin-manager prefer-plain profiler pst-import sa-junk-plugin save-calendar startup-wizard subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" +enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http calendar-weather default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features itip-formatter mail-notification mail-to-task mark-all-read plugin-manager prefer-plain profiler pst-import sa-junk-plugin save-calendar startup-wizard subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" dnl PLUGINS NOT BUILDING YET dnl ------------------------ @@ -1743,7 +1743,6 @@ dnl backup-restore dnl exchange-operations dnl groupwise-features dnl ipod-sync -dnl itip-formatter dnl mailing-list-actions dnl mono dnl publish-calendar -- cgit From 2febb125d6abd0e9f485a13ae99281112a97416a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 12 Aug 2009 11:37:59 -0400 Subject: Get the backup-restore plugin working. --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c4a468c719..fa397c32e2 100644 --- a/configure.ac +++ b/configure.ac @@ -1735,11 +1735,10 @@ plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" dnl Temporary KILL-BONOBO hack -enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http calendar-weather default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features itip-formatter mail-notification mail-to-task mark-all-read plugin-manager prefer-plain profiler pst-import sa-junk-plugin save-calendar startup-wizard subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" +enable_plugins="attachment-reminder addressbook-file audio-inline backup-restore bbdb bogo-junk-plugin caldav calendar-file calendar-http calendar-weather default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features itip-formatter mail-notification mail-to-task mark-all-read plugin-manager prefer-plain profiler pst-import sa-junk-plugin save-calendar startup-wizard subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" dnl PLUGINS NOT BUILDING YET dnl ------------------------ -dnl backup-restore dnl exchange-operations dnl groupwise-features dnl ipod-sync -- cgit From d3dce7a7788d79c7976fefb3a6cc069d8f2317fd Mon Sep 17 00:00:00 2001 From: "H.Habighorst" Date: Thu, 13 Aug 2009 14:28:46 -0400 Subject: Bug 591321 – Cosmetic changes and fixes in configure.ac MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configure.ac | 219 ++++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 149 insertions(+), 70 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index fa397c32e2..3b0f3755d4 100644 --- a/configure.ac +++ b/configure.ac @@ -72,8 +72,9 @@ m4_define([libnotify_minimum_version], [0.3.0]) m4_define([gnome_pilot_minimum_version], [2.0.15]) m4_define([gweather_minimum_version], [2.25.3]) +dnl ****************************** dnl Compiler Warning Flags - +dnl ****************************** AS_COMPILER_FLAGS(WARNING_FLAGS, "-DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED @@ -104,10 +105,14 @@ CFLAGS="$CFLAGS $WARNING_FLAGS" AC_CANONICAL_HOST AC_DEFINE_UNQUOTED(VERSION_COMMENT, "", [Define if you want a comment appended to the version number]) +dnl ************************************* dnl Put the ACLOCAL flags in the Makefile +dnl ************************************* ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" +dnl ****************************** dnl Initialize maintainer mode +dnl ****************************** AM_MAINTAINER_MODE if test "$evo_version" != "$evo_stable_version"; then @@ -140,7 +145,9 @@ case $YACC in esac AC_ARG_PROGRAM +dnl ****************************** dnl Test whether jw is installed +dnl ****************************** AC_PATH_PROG(JW,jw,no) if test x$JW = xno; then HAVE_JW="no" @@ -150,7 +157,9 @@ fi AM_CONDITIONAL(HAVE_JW, [test x$HAVE_JW = xyes]) AC_SUBST(HAVE_JW) +dnl ****************************** dnl I18N stuff +dnl ****************************** IT_PROG_INTLTOOL([0.35.5]) AM_GLIB_GNU_GETTEXT @@ -162,10 +171,12 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettex localedir='$(prefix)/$(DATADIRNAME)/locale' AC_SUBST(localedir) -dnl Initialize libtool +dnl ****************************** +dnl Initialize libtool \ DOLT dnl if switch to libtool >= 2.2, replace existing with following: dnl LT_PREREQ(2.2) dnl LT_INIT(disable-static win32-dll) +dnl ****************************** AM_DISABLE_STATIC AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL @@ -173,7 +184,9 @@ DOLT PKG_PROG_PKG_CONFIG +dnl ****************************** dnl Win32 +dnl ****************************** AC_MSG_CHECKING([for Win32]) case "$host" in *-mingw*) @@ -215,7 +228,9 @@ AM_CONDITIONAL(HAVE_WINDRES, test "x$WINDRES" != "x:") AC_SUBST(WINDRES) +dnl ********************************** dnl Check for base dependencies early. +dnl ********************************** PKG_CHECK_MODULES([GNOME_PLATFORM], [glib-2.0 >= glib_minimum_version gtk+-2.0 >= gtk_minimum_version @@ -363,15 +378,19 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ CFLAGS="$save_CFLAGS" LIBS="$save_LIBS" +dnl *********** dnl alloca() +dnl *********** AC_FUNC_ALLOCA +dnl ************** dnl waitpid() etc +dnl ************** AC_HEADER_SYS_WAIT -dnl +dnl *************** dnl Purify support -dnl +dnl *************** EVO_PURIFY_SUPPORT dnl ************** @@ -526,19 +545,19 @@ AC_CHECK_HEADER([sys/mount.h], AC_CHECK_FUNCS(statfs) dnl ************************************************** -dnl * Gnome Icon Theme +dnl Gnome Icon Theme dnl ************************************************** PKG_CHECK_MODULES([GIT], [gnome-icon-theme >= gnome_icon_theme_minimum_version]) dnl ************************************************** -dnl * Accessibility support +dnl Accessibility support dnl ************************************************** PKG_CHECK_MODULES([A11Y], [atk]) AC_SUBST(A11Y_CFLAGS) AC_SUBST(A11Y_LIBS) dnl ************************************************** -dnl * XF86 multimedia keys support +dnl XF86 multimedia keys support dnl ************************************************** have_xfree=no AC_COMPILE_IFELSE([AC_LANG_PROGRAM( @@ -555,40 +574,40 @@ dnl ************************************************** dnl LDAP support. dnl ************************************************** if test "$os_win32" != yes; then -EVO_LDAP_CHECK(no) -case $with_openldap in -no) - msg_ldap=no - ;; -*) - case $with_static_ldap in - yes) - msg_ldap="yes (static)" + EVO_LDAP_CHECK(no) + case $with_openldap in + no) + msg_ldap=no ;; *) - msg_ldap="yes (dynamic)" + case $with_static_ldap in + yes) + msg_ldap="yes (static)" ;; + *) + msg_ldap="yes (dynamic)" + ;; + esac esac -esac -SAVE_CFLAGS="$CFLAGS" -SAVE_LIBS="$LIBS" -LDAP_CFLAGS="$LDAP_CFLAGS -DLDAP_DEPRECATED" -CFLAGS="$CFLAGS $LDAP_CFLAGS" -LIBS="$LIBS $LDAP_LIBS" -AC_CHECK_FUNCS(ldap_ntlm_bind) -CFLAGS="$SAVE_CFLAGS" -LIBS="$SAVE_LIBS" - -else dnl Win32 -LDAP_CFLAGS="-DLDAP_DEPRECATED" -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_ldap="yes" -fi dnl Win32 + SAVE_CFLAGS="$CFLAGS" + SAVE_LIBS="$LIBS" + LDAP_CFLAGS="$LDAP_CFLAGS -DLDAP_DEPRECATED" + CFLAGS="$CFLAGS $LDAP_CFLAGS" + LIBS="$LIBS $LDAP_LIBS" + AC_CHECK_FUNCS(ldap_ntlm_bind) + CFLAGS="$SAVE_CFLAGS" + LIBS="$SAVE_LIBS" +dnl Win32 support +else + LDAP_CFLAGS="-DLDAP_DEPRECATED" + 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_ldap="yes" +fi dnl ************************************************** dnl SunLDAP support, but if OpenLDAP support, skip check SunLDAP. @@ -632,7 +651,7 @@ AM_CONDITIONAL(ENABLE_NNTP, [test x$enable_nntp = xyes]) AC_DEFINE(HANDLE_LIBICAL_MEMORY, 1, [Define it once memory returned by libical is free'ed properly]) dnl ************************************************** -dnl * Posix thread support +dnl Posix thread support dnl ************************************************** dnl GLIB_CONFIG=${GLIB_CONFIG-glib-config} @@ -657,17 +676,19 @@ AC_SUBST(THREADS_CFLAGS) AC_DEFINE(ENABLE_THREADS,1,[Required]) -dnl ********* -dnl Libraries -dnl ********* - +dnl ************ +dnl regex check +dnl ************ AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(regex,regexec, [REGEX_LIBS=-lregex AC_DEFINE(HAVE_REGEXEC,1,[Define to 1 if you have the regexec function.])], [AC_MSG_ERROR([No regex library found])])]) AC_SUBST(REGEX_LIBS) +dnl ************************* +dnl GTKHTML check dnl XXX Drop the version from the package name? +dnl ************************* PKG_CHECK_MODULES([GTKHTML], [libgtkhtml-3.14 >= libgtkhtml_minimum_version]) AC_SUBST(GTKHTML_CFLAGS) AC_SUBST(GTKHTML_LIBS) @@ -766,6 +787,9 @@ AC_ARG_WITH([krb4-includes], [Location of Kerberos 4 headers]), [with_krb4_includes=$withval],[with_krb4_includes=""]) +dnl ************ +dnl Kerberos 5 +dnl ************ msg_krb5="no" if test "x${with_krb5}" != "xno"; then LDFLAGS_save="$LDFLAGS" @@ -839,6 +863,9 @@ AC_CHECK_HEADER([com_err.h], #endif ]]) +dnl *********** +dnl Kerberos 4 +dnl *********** msg_krb4="no" if test "x${with_krb4}" != "xno"; then LDFLAGS_save="$LDFLAGS" @@ -906,10 +933,10 @@ AC_SUBST(KRB5_LIBS) AC_SUBST(KRB4_CFLAGS) AC_SUBST(KRB4_LIBS) +dnl ****************************** dnl Mono hooks -dnl This should just define mono CFLAGS etc here, it is used later to -dnl turn on the mono plugin or not. - +dnl This should just define mono CFLAGS etc here, it is used later to turn on the mono plugin or not. +dnl ****************************** MONO_CFLAGS= MONO_LIBS= AC_ARG_ENABLE([mono], @@ -924,10 +951,11 @@ fi AC_SUBST(MONO_CFLAGS) AC_SUBST(MONO_LIBS) +dnl ****************************** dnl Python hooks -dnl This should just define python CFLAGS etc here, it is used later to -dnl turn on the python plugin or not. +dnl This should just define python CFLAGS etc here, it is used later to turn on the python plugin or not. dnl (Thanks to Pidgin) +dnl ****************************** AC_ARG_ENABLE([python], AS_HELP_STRING([--enable-python], @@ -1341,7 +1369,9 @@ AC_COMPILE_IFELSE([ CFLAGS="$evolution_save_cflags" - +dnl ************************* +dnl Orbit / Bonobo +dnl ************************* AM_PATH_ORBIT2(2.9.8) AC_MSG_CHECKING([for CORBA include paths]) @@ -1349,20 +1379,25 @@ IDL_INCLUDES="-I "`${PKG_CONFIG} --variable=idldir libbonobo-2.0`" -I "`${PKG_CO AC_MSG_RESULT([$IDL_INCLUDES]) AC_SUBST(IDL_INCLUDES) +dnl ***************************************************************** dnl Utility macro to set compiler flags for a specific lib. dnl EVO_SET_COMPILE_FLAGS(VAR-PREFIX, DEPS, EXTRA-CFLAGS, EXTRA-LIBS) +dnl ***************************************************************** AC_DEFUN([EVO_SET_COMPILE_FLAGS], [ PKG_CHECK_MODULES([$1], [$2]) $1_CFLAGS="[$]$1_CFLAGS $3" $1_LIBS="[$]$1_LIBS $4" ]) -dnl --- Required version numbers - +dnl ************************ +dnl Required version numbers +dnl ************************ BONOBOUI_REQUIRED=libbonoboui_minimum_version AC_SUBST(BONOBOUI_REQUIRED) -dnl --- Flags to get all the GNOME stuff +dnl ******************************** +dnl Flags to get all the GNOME stuff +dnl ******************************** FULL_GNOME_DEPS="libbonoboui-2.0 gconf-2.0 gthread-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0" @@ -1376,6 +1411,9 @@ else IPOD_SYNC="" fi +dnl ****************************** +dnl TNEF implementation +dnl ****************************** AC_MSG_CHECKING([for yTNEF]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [[ @@ -1408,7 +1446,9 @@ else fi AC_SUBST(TNEF_CFLAGS) +dnl ****************************** dnl Check for dbus-glib-1 and dbus +dnl ****************************** AC_ARG_ENABLE([dbus], [AS_HELP_STRING([--enable-dbus], [enable DBUS support (default=yes)])], @@ -1434,7 +1474,9 @@ else fi AM_CONDITIONAL([DBUS_SUPPORT], [test "$DBUS_SUPPORT" = yes]) +dnl ****************************** dnl Check for NetworkManager +dnl ****************************** AC_ARG_ENABLE([nm], [AS_HELP_STRING([--enable-nm], [enable NetworkManager support (default=yes)])], @@ -1455,8 +1497,9 @@ fi AM_CONDITIONAL([NM_SUPPORT], [test "$NM_SUPPORT" = yes]) -dnl --- Flags for the various libraries we build - +dnl ****************************** +dnl Camel Flags +dnl ****************************** EVO_SET_COMPILE_FLAGS(CAMEL, camel-provider-$EDS_PACKAGE) AC_SUBST(CAMEL_CFLAGS) AC_SUBST(CAMEL_LIBS) @@ -1474,16 +1517,23 @@ else fi fi +dnl ****************************** +dnl CERT_UI Flags +dnl ****************************** EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-$EDS_PACKAGE libglade-2.0 gthread-2.0, $MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS, $MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS) AC_SUBST(CERT_UI_CFLAGS) AC_SUBST(CERT_UI_LIBS) +dnl ****************************** +dnl E_NAME Flags +dnl ****************************** EVO_SET_COMPILE_FLAGS(E_NAME, libgnomeui-2.0 libbonoboui-2.0) AC_SUBST(E_NAME_CFLAGS) AC_SUBST(E_NAME_LIBS) -dnl If Gtk/Gdk is built against X11, e-util uses some -dnl X11-specific code so link with X11. +dnl ****************************** +dnl If Gtk/Gdk is built against X11, e-util uses some X11-specific code so link with X11. +dnl ****************************** if test "x$GDK_BACKEND_X11" = "xyes"; then E_UTIL_X11_CFLAGS="$X_CFLAGS" E_UTIL_X11_LIBS="$X_LIBS" @@ -1491,38 +1541,56 @@ else E_UTIL_X11_CFLAGS="" E_UTIL_X11_LIBS="" fi + +dnl ************ +dnl E_UTIL Flags +dnl ************ EVO_SET_COMPILE_FLAGS(E_UTIL, libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gnome-desktop-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $E_UTIL_X11_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $E_UTIL_X11_LIBS) AC_SUBST(E_UTIL_CFLAGS) AC_SUBST(E_UTIL_LIBS) E_UTIL_LIBS="$E_UTIL_LIBS $MATH_LIB" +dnl ************** +dnl TZDIALOG Flags +dnl ************** EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-$EDS_PACKAGE, $GNOME_PLATFORM_CFLAGS, $GNOME_PLATFORM_LIBS) AC_SUBST(TZDIALOG_CFLAGS) AC_SUBST(TZDIALOG_LIBS) +dnl *************** +dnl E_WIDGETS Flags +dnl *************** EVO_SET_COMPILE_FLAGS(E_WIDGETS, libbonoboui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE gtkhtml-editor) AC_SUBST(E_WIDGETS_CFLAGS) AC_SUBST(E_WIDGETS_LIBS) +dnl *************** +dnl IMPORTERS Flags +dnl *************** EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-$EDS_PACKAGE camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE libglade-2.0 libbonoboui-2.0 libgnomeui-2.0 libebook-$EDS_PACKAGE) AC_SUBST(IMPORTERS_CFLAGS) AC_SUBST(IMPORTERS_LIBS) +dnl *************** +dnl LIBFILTER Flags +dnl *************** EVO_SET_COMPILE_FLAGS(LIBFILTER, libgnomeui-2.0 libglade-2.0 libedataserver-$EDS_PACKAGE) AC_SUBST(LIBFILTER_CFLAGS) AC_SUBST(LIBFILTER_LIBS) -dnl --- evolution (shell) flags +dnl *********** +dnl Shell Flags +dnl *********** EVO_SET_COMPILE_FLAGS(SHELL, libgnomeui-2.0 libbonoboui-2.0 gnome-desktop-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE unique-1.0 libedataserverui-$EDS_PACKAGE) AC_SUBST(SHELL_CFLAGS) AC_SUBST(SHELL_LIBS) -dnl --- evolution-addressbook flags - +dnl ***************** +dnl Addressbook Flags +dnl ***************** EVOLUTION_ADDRESSBOOK_DEPS="libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE gtkhtml-editor unique-1.0" - EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS) AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS) AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS) @@ -1533,6 +1601,9 @@ AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS) AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS) fi +dnl *************** +dnl Libnotify Flags +dnl *************** LIBNOTIFY_CFLAGS= LIBNOTIFY_LIBS= PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= libnotify_minimum_version], [HAVE_LIBNOTIFY="yes"], [HAVE_LIBNOTIFY="no"]) @@ -1545,7 +1616,9 @@ fi AC_SUBST(LIBNOTIFY_CFLAGS) AC_SUBST(LIBNOTIFY_LIBS) -dnl --- evolution-calendar flags +dnl ************** +dnl Calendar Flags +dnl ************** EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-2.4 >= 2.3.0) AC_SUBST(LIBSOUP_CFLAGS) AC_SUBST(LIBSOUP_LIBS) @@ -1560,14 +1633,16 @@ AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_CFLAGS) AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_LIBS) fi -dnl --- evolution-mail flags - +dnl ********** +dnl Mail Flags +dnl ********** EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE gtkhtml-editor bonobo-activation-2.0 $mozilla_nss libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE unique-1.0) AC_SUBST(EVOLUTION_MAIL_CFLAGS) AC_SUBST(EVOLUTION_MAIL_LIBS) -dnl -- evolution-data-server IDL and version - +dnl *************************** +dnl Evolution-Data-Server Flags +dnl *************************** AC_DEFINE(DATASERVER_API_VERSION, "1.2", evolution-data-server API version) AC_DEFINE_UNQUOTED(DATASERVER_VERSION, "`${PKG_CONFIG} --modversion evolution-data-server-1.2`", evolution-data-server version) @@ -1583,14 +1658,16 @@ else AC_MSG_ERROR([no]) fi -dnl --- evolution-test flags - +dnl ********** +dnl Test Flags +dnl ********** EVO_SET_COMPILE_FLAGS(EVOLUTION_TEST, gtk+-2.0 gconf-2.0 libxml-2.0 unique-1.0) AC_SUBST(EVOLUTION_TEST_CFLAGS) AC_SUBST(EVOLUTION_TEST_LIBS) -dnl --- eggsmclient flags - +dnl ***************** +dnl EggSMClient Flags +dnl ***************** EVO_SET_COMPILE_FLAGS(EGG_SMCLIENT, gtk+-2.0) AC_SUBST(EGG_SMCLIENT_CFLAGS) AC_SUBST(EGG_SMCLIENT_LIBS) @@ -1599,9 +1676,8 @@ dnl ******************* dnl Special directories dnl ******************* -dnl --- If you add something here, consider whether or not you also -dnl --- need to add it to one or more .pc.in files (for Connector, -dnl --- etc) +dnl If you add something here, consider whether or not you also need to add it to one or more .pc.in +dnl files (for Connector, etc) privlibdir='${libdir}'/evolution/$BASE_VERSION AC_SUBST(privlibdir) @@ -1770,6 +1846,9 @@ xexperimental) ;; esac +dnl ****************************** +dnl Profiling support +dnl ****************************** AC_ARG_ENABLE([profiling], AS_HELP_STRING([--enable-profiling], [Enable profiling plugin.]), -- cgit From ff3e7d4f75898b5854618203d4ee675dca2c38af Mon Sep 17 00:00:00 2001 From: "H.Habighorst" Date: Thu, 13 Aug 2009 17:27:59 -0400 Subject: Bug 591377 – Fails to detect krb5 in configure with -as-needed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configure.ac | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 3b0f3755d4..938fea054d 100644 --- a/configure.ac +++ b/configure.ac @@ -792,27 +792,27 @@ dnl Kerberos 5 dnl ************ msg_krb5="no" if test "x${with_krb5}" != "xno"; then - LDFLAGS_save="$LDFLAGS" + LIBS_save="$LIBS" mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" sunlibs="-lkrb5 -lgss" AC_CACHE_CHECK([for Kerberos 5], [ac_cv_lib_kerberos5], [ - LDFLAGS="$LDFLAGS -L$with_krb5_libs $mitlibs" - AC_LINK_IFELSE([AC_LANG_CALL([], [krb5_init_context,])], + LIBS="$LIBS -L$with_krb5_libs $mitlibs" + AC_LINK_IFELSE([AC_LANG_CALL([], [krb5_init_context])], [ac_cv_lib_kerberos5="$mitlibs"], [ - LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $heimlibs" + LIBS="$LIBS_save -L$with_krb5_libs $heimlibs" AC_LINK_IFELSE([AC_LANG_CALL([], [krb5_init_context])], [ac_cv_lib_kerberos5="$heimlibs"], [ - LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $sunlibs" + LIBS="$LIBS_save -L$with_krb5_libs $sunlibs" AC_LINK_IFELSE([AC_LANG_CALL([], [krb5_init_context])], [ac_cv_lib_kerberos5="$sunlibs"], [ac_cv_lib_kerberos5="no"]) ]) ]) - LDFLAGS="$LDFLAGS_save" + LIBS="$LIBS_save" ]) if test "$ac_cv_lib_kerberos5" != "no"; then AC_DEFINE(HAVE_KRB5,1,[Define if you have Krb5]) @@ -868,36 +868,35 @@ dnl Kerberos 4 dnl *********** msg_krb4="no" if test "x${with_krb4}" != "xno"; then - LDFLAGS_save="$LDFLAGS" + LIBS_save="$LIBS" AC_CACHE_CHECK([for Kerberos 4], [ac_cv_lib_kerberos4], [ ac_cv_lib_kerberos4="no" - mitcompatlibs="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err" dnl Look for MIT krb5 compat krb4 - LDFLAGS="$LDFLAGS -L$with_krb4_libs $mitcompatlibs" + LIBS="$LIBS_save -L$with_krb4_libs $mitcompatlibs" AC_LINK_IFELSE([AC_LANG_CALL([], [krb_mk_req])], [ac_cv_lib_kerberos4="$mitcompatlibs"]) if test "$ac_cv_lib_kerberos4" = "no"; then dnl Look for KTH krb4 - LDFLAGS="$LDFLAGS_save -L$with_krb4_libs -lkrb -lcrypto -lcom_err -lroken" + LIBS="$LIBS_save -L$with_krb4_libs -lkrb -lcrypto -lcom_err -lroken" AC_LINK_IFELSE([AC_LANG_CALL([], [krb_mk_req])], [ac_cv_lib_kerberos4="-lkrb -lcrypto -lcom_err -lroken"]) fi if test "$ac_cv_lib_kerberos4" = "no"; then dnl Look for old MIT krb4 - LDFLAGS="$LDFLAGS_save -L$with_krb4_libs -lkrb" + LIBS="$LIBS_save -L$with_krb4_libs -lkrb" AC_LINK_IFELSE([AC_LANG_CALL([], [krb_mk_req])], [ac_cv_lib_kerberos4="-lkrb"], [ - LDFLAGS="$LDFLAGS -ldes" + LIBS="$LIBS_save -ldes" AC_LINK_IFELSE([AC_LANG_CALL([], [krb_mk_req])], [ac_cv_lib_kerberos4="-lkrb -ldes"]) ]) fi ]) - LDFLAGS="$LDFLAGS_save" + LIBS="$LIBS_save" if test "$ac_cv_lib_kerberos4" != "no"; then AC_DEFINE(HAVE_KRB4,1,[Define if you have Krb4]) msg_krb4="yes" -- cgit From c4716bf2e904a4bcf573ee30841378c1f53092ee Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 16 Aug 2009 10:08:09 -0400 Subject: Don't stomp on the warning flags. --- configure.ac | 1 + 1 file changed, 1 insertion(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 938fea054d..535d982e7f 100644 --- a/configure.ac +++ b/configure.ac @@ -341,6 +341,7 @@ if test "$have_iconv" = no; then fi AC_SUBST(ICONV_LIBS) +save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -I$srcdir" AC_MSG_CHECKING([preferred charset name formats for system iconv]) -- cgit From 672adf12a0923437e90d08ab7925bd9329fcce0d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 16 Aug 2009 11:25:08 -0400 Subject: Fix compiler warnings and deprecated GTK+ API usage. --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 535d982e7f..d78715cb90 100644 --- a/configure.ac +++ b/configure.ac @@ -81,7 +81,6 @@ AS_COMPILER_FLAGS(WARNING_FLAGS, -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES - -DGTK_DISABLE_SINGLE_INCLUDES -Wall -Wextra -Wno-missing-field-initializers -Wno-sign-compare @@ -100,6 +99,10 @@ dnl -Wmissing-format-attribute dnl -Wshadow dnl -Wformat-nonliteral +dnl Disabled until libunique fixes its headers. Think it's +dnl already fixed in git, just waiting for a formal release. +dnl -DGTK_DISABLE_SINGLE_INCLUDES + CFLAGS="$CFLAGS $WARNING_FLAGS" AC_CANONICAL_HOST -- cgit From c83b2b819578571d9d5f346eb01dc416ccafe3a5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 22 Aug 2009 20:15:25 -0400 Subject: Kill ECalPopup. --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index d78715cb90..41ea74d6a9 100644 --- a/configure.ac +++ b/configure.ac @@ -1814,7 +1814,7 @@ plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" dnl Temporary KILL-BONOBO hack -enable_plugins="attachment-reminder addressbook-file audio-inline backup-restore bbdb bogo-junk-plugin caldav calendar-file calendar-http calendar-weather default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features itip-formatter mail-notification mail-to-task mark-all-read plugin-manager prefer-plain profiler pst-import sa-junk-plugin save-calendar startup-wizard subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" +enable_plugins="attachment-reminder addressbook-file audio-inline backup-restore bbdb bogo-junk-plugin caldav calendar-file calendar-http calendar-weather default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features itip-formatter mail-notification mail-to-task mark-all-read plugin-manager prefer-plain profiler pst-import sa-junk-plugin startup-wizard subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup" dnl PLUGINS NOT BUILDING YET dnl ------------------------ @@ -1825,6 +1825,7 @@ dnl mailing-list-actions dnl mono dnl publish-calendar dnl python +dnl save-calendar case x"$enable_plugins" in xno) -- cgit From ff7084ffe4a935a4cfafc9cd44a9b9daf43cb976 Mon Sep 17 00:00:00 2001 From: "H.Habighorst" Date: Sun, 23 Aug 2009 08:31:14 -0400 Subject: Bug 571488 - Migrate from deprecated gnome_sound to libcanberra --- configure.ac | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 41ea74d6a9..ad5521c885 100644 --- a/configure.ac +++ b/configure.ac @@ -259,6 +259,12 @@ PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER], libgdata-$EDS_PACKAGE >= eds_minimum_version libgdata-google-$EDS_PACKAGE >= eds_minimum_version]) +dnl ****************************** +dnl Canberra / Canberra-GTK Sound +dnl ****************************** +PKG_CHECK_MODULES([CANBERRA],[libcanberra-gtk]) +AC_SUBST(CANBERRA_CFLAGS) +AC_SUBST(CANBERRA_LIBS) dnl ****************** dnl User Documentation -- cgit From 94c361bd824ba41de7b2d29fabf542aaa02420bc Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 23 Aug 2009 23:32:02 -0400 Subject: Bump version to match gnome-2-28 branch. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ad5521c885..fc9aec4454 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Evolution Versions m4_define([evo_major_version], [2]) m4_define([evo_minor_version], [27]) -m4_define([evo_micro_version], [90]) +m4_define([evo_micro_version], [91]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit From 1b706132cf01c2a42cc9a012472b71675cc0902e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 25 Aug 2009 13:49:58 -0400 Subject: Deal with untracked files in git. --- configure.ac | 1 + 1 file changed, 1 insertion(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index fc9aec4454..efcf2548a7 100644 --- a/configure.ac +++ b/configure.ac @@ -2059,6 +2059,7 @@ calendar/gui/Makefile calendar/gui/alarm-notify/Makefile calendar/gui/dialogs/Makefile composer/Makefile +m4/Makefile mail/Makefile mail/default/Makefile mail/default/C/Makefile -- cgit From 890f9cb46f771cb3784766d2237e70cd14970418 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 28 Aug 2009 07:43:58 -0400 Subject: Whitespace cleanup in configure.ac. --- configure.ac | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index efcf2548a7..309491cf3a 100644 --- a/configure.ac +++ b/configure.ac @@ -983,7 +983,7 @@ if test "x${enable_python}" = "xyes"; then changequote([, ])dnl if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h -a "$PY_MAJOR" = "2."; then - PY_LIBS="-lpython$PY_VERSION -L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config" + PY_LIBS="-lpython$PY_VERSION -L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config" PY_INCLUDES="-I$PY_PREFIX/include/python$PY_VERSION" AC_MSG_RESULT([ok]) python_package="python-devel" @@ -1135,22 +1135,22 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then AC_CACHE_CHECK([for Mozilla nspr libraries], [ac_cv_moz_nspr_libs], [ - LIBS_save="$LIBS" + LIBS_save="$LIBS" CFLAGS="$CFLAGS $MANUAL_NSPR_CFLAGS" if test "x${with_nspr_libs}" != "x"; then - LIBS="$nsprlibs" - LDFLAGS="$LDFLAGS -L$with_nspr_libs" + LIBS="$nsprlibs" + LDFLAGS="$LDFLAGS -L$with_nspr_libs" else - LIBS="$nsprlibs" - LDFLAGS="$LDFLAGS" + LIBS="$nsprlibs" + LDFLAGS="$LDFLAGS" fi AC_LINK_IFELSE([AC_LANG_CALL([], [PR_Init])], [ac_cv_moz_nspr_libs="yes"], [ac_cv_moz_nspr_libs="no"]) CFLAGS="$CFLAGS_save" LDFLAGS="$LDFLAGS_save" - LIBS="$LIBS_save" + LIBS="$LIBS_save" ]) if test "x$ac_cv_moz_nspr_libs" != "xno"; then have_nspr_libs="yes" @@ -1204,7 +1204,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then LDFLAGS_save="$LDFLAGS" if test "$enable_nss" = "static"; then - if test -z "${with_nss_libs}"; then + if test -z "${with_nss_libs}"; then AC_MSG_ERROR([Static linkage requested, but path to nss libraries not set.] [Please specify the path to libnss3.a] [Example: --with-nspr-libs=/usr/lib/mozilla]) @@ -1217,14 +1217,14 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then esac fi else - nsslibs="-lssl3 -lsmime3 -lnss3" + nsslibs="-lssl3 -lsmime3 -lnss3" fi AC_CACHE_CHECK([for Mozilla nss libraries], [ac_cv_moz_nss_libs], [ - LIBS_save="$LIBS" + LIBS_save="$LIBS" LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs" - LIBS="$nsslibs $nsprlibs" + LIBS="$nsslibs $nsprlibs" AC_LINK_IFELSE([AC_LANG_CALL([], [NSS_Init])], [ac_cv_moz_nss_libs="yes"], [ac_cv_moz_nss_libs="no"]) if test "$ac_cv_moz_nss_libs" = no; then @@ -1234,7 +1234,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then [ac_cv_moz_nss_libs="yes"], [ac_cv_moz_nss_libs="no"]) fi LDFLAGS="$LDFLAGS_save" - LIBS="$LIBS_save" + LIBS="$LIBS_save" ]) if test "$ac_cv_moz_nss_libs" != no; then AC_DEFINE(HAVE_NSS) @@ -1242,7 +1242,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,"$with_nss_libs", [Define to the full path of mozilla nss library]) if test "$enable_nss" = "static"; then msg_ssl="yes (Mozilla NSS:static)" - else + else msg_ssl="yes (Mozilla NSS)" fi dnl static_nss @@ -1529,7 +1529,7 @@ fi dnl ****************************** dnl CERT_UI Flags dnl ****************************** -EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-$EDS_PACKAGE libglade-2.0 gthread-2.0, $MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS, $MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS) +EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-$EDS_PACKAGE libglade-2.0 gthread-2.0, $MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS, $MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS) AC_SUBST(CERT_UI_CFLAGS) AC_SUBST(CERT_UI_LIBS) -- cgit From 520d90a9cc9fb24551a28116c81ab6b963cac5c9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 28 Aug 2009 08:09:02 -0400 Subject: Build with -Wl,--no-undefined and fix linker errors. --- configure.ac | 1 + 1 file changed, 1 insertion(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 309491cf3a..8a2400ae84 100644 --- a/configure.ac +++ b/configure.ac @@ -104,6 +104,7 @@ dnl already fixed in git, just waiting for a formal release. dnl -DGTK_DISABLE_SINGLE_INCLUDES CFLAGS="$CFLAGS $WARNING_FLAGS" +LDFLAGS="$LDFLAGS -Wl,--no-undefined" AC_CANONICAL_HOST AC_DEFINE_UNQUOTED(VERSION_COMMENT, "", [Define if you want a comment appended to the version number]) -- cgit From 32f545cdf031ebe3718791f18e8fb6b6141fd081 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 28 Aug 2009 20:21:54 -0400 Subject: Simplify EPlugin loading at startup. - Require all EPlugin and EPluginHook subtypes be registered before loading plugins. This drastically simplifies the EPlugin/EPluginHook negotiation. - Turn most EPluginHook subtypes into GTypeModules and register their types from an e_module_load() function (does not include shell hooks). - Convert EPluginLib and the Mono and Python bindings to GTypeModules and register their types from an e_module_load() function, and kill EPluginTypeHook. --- configure.ac | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 8a2400ae84..e26fe6953d 100644 --- a/configure.ac +++ b/configure.ac @@ -956,11 +956,12 @@ AC_ARG_ENABLE([mono], if test "x${enable_mono}" = "xyes"; then PKG_CHECK_MODULES([MONO], ["mono"]) AC_DEFINE(ENABLE_MONO,1,[Define if Mono embedding should be enabled]) - MONO_PLUGIN="mono" fi AC_SUBST(MONO_CFLAGS) AC_SUBST(MONO_LIBS) +AM_CONDITIONAL(ENABLE_MONO, [test "x$enable_mono" = "xyes"]) + dnl ****************************** dnl Python hooks dnl This should just define python CFLAGS etc here, it is used later to turn on the python plugin or not. @@ -988,19 +989,19 @@ if test "x${enable_python}" = "xyes"; then PY_INCLUDES="-I$PY_PREFIX/include/python$PY_VERSION" AC_MSG_RESULT([ok]) python_package="python-devel" - PYTHON_PLUGIN="python" else AC_MSG_ERROR([Can't find Python.h]) PY_LIBS="" PY_INCLUDES="" python_package="" - PYTHON_PLUGIN="" fi fi AC_SUBST(PY_LIBS) AC_SUBST(PY_INCLUDES) fi +AM_CONDITIONAL(ENABLE_PYTHON, [test "x$enable_python" = "xyes"]) + dnl ******************************************************************************** dnl security extension support (SSL and S/MIME) @@ -1808,8 +1809,8 @@ AC_ARG_ENABLE([plugins], dnl Add any new plugins here plugins_base_always="calendar-file calendar-http $CALENDAR_WEATHER itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup publish-calendar caldav imap-features google-account-setup webdav-account-setup" -plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " -all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono" +plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN" +all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations" plugins_standard_always="bbdb subject-thread save-calendar mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder backup-restore email-custom-header templates pst-import vcard-inline" @@ -1817,7 +1818,7 @@ plugins_standard="$plugins_standard_always" all_plugins_standard="$plugins_standard" plugins_experimental_always="face external-editor hula-account-setup" -plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN" +plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS" all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" dnl Temporary KILL-BONOBO hack @@ -1829,9 +1830,7 @@ dnl exchange-operations dnl groupwise-features dnl ipod-sync dnl mailing-list-actions -dnl mono dnl publish-calendar -dnl python dnl save-calendar case x"$enable_plugins" in @@ -1873,17 +1872,6 @@ x | xyes) ;; esac -if test "x${enable_mono}" = "xyes"; then - plugins_enabled="$plugins_enabled mono" - msg_plugins="$msg_plugins (and mono)" -fi - - -if test "x${enable_python}" = "xyes"; then - plugins_enabled="$plugins_enabled python" - msg_plugins="$msg_plugins (and python)" -fi - AC_SUBST(plugins_enabled) AC_SUBST(all_plugins_base) AC_SUBST(all_plugins_standard) @@ -2088,6 +2076,9 @@ modules/Makefile modules/addressbook/Makefile modules/calendar/Makefile modules/mail/Makefile +modules/plugin-lib/Makefile +modules/plugin-mono/Makefile +modules/plugin-python/Makefile plugins/Makefile plugins/addressbook-file/Makefile plugins/attachment-reminder/Makefile @@ -2116,13 +2107,11 @@ plugins/mail-notification/Makefile plugins/mail-to-task/Makefile plugins/mailing-list-actions/Makefile plugins/mark-all-read/Makefile -plugins/mono/Makefile plugins/plugin-manager/Makefile plugins/prefer-plain/Makefile plugins/profiler/Makefile plugins/pst-import/Makefile plugins/publish-calendar/Makefile -plugins/python/Makefile plugins/sa-junk-plugin/Makefile plugins/save-calendar/Makefile plugins/startup-wizard/Makefile -- cgit From 82bc7f0b36b5e951817307e96e1e0be3a8ee34cc Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 30 Aug 2009 00:45:41 -0400 Subject: Drop libbonoboui from configure.ac and pkg-config files. --- configure.ac | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index e26fe6953d..b4a63822d6 100644 --- a/configure.ac +++ b/configure.ac @@ -53,7 +53,6 @@ m4_define([eds_minimum_version], [evo_version]) m4_define([gnome_icon_theme_minimum_version], [2.19.91]) m4_define([gnome_desktop_minimum_version], [2.26.0]) m4_define([libbonobo_minimum_version], [2.20.3]) -m4_define([libbonoboui_minimum_version], [2.4.2]) m4_define([libgtkhtml_minimum_version], [3.27.90]) m4_define([gconf_minimum_version], [2.0.0]) dnl XXX Just a Guess m4_define([libglade_minimum_version], [2.0.0]) dnl XXX Just a Guess @@ -240,7 +239,6 @@ PKG_CHECK_MODULES([GNOME_PLATFORM], gtk+-2.0 >= gtk_minimum_version gconf-2.0 >= gconf_minimum_version libbonobo-2.0 >= libbonobo_minimum_version - libbonoboui-2.0 >= libbonoboui_minimum_version libglade-2.0 >= libglade_minimum_version libgnomecanvas-2.0 >= libgnomecanvas_minimum_version libgnomeui-2.0 >= libgnomeui_minimum_version @@ -1400,17 +1398,11 @@ AC_DEFUN([EVO_SET_COMPILE_FLAGS], [ $1_LIBS="[$]$1_LIBS $4" ]) -dnl ************************ -dnl Required version numbers -dnl ************************ -BONOBOUI_REQUIRED=libbonoboui_minimum_version -AC_SUBST(BONOBOUI_REQUIRED) - dnl ******************************** dnl Flags to get all the GNOME stuff dnl ******************************** -FULL_GNOME_DEPS="libbonoboui-2.0 gconf-2.0 gthread-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0" +FULL_GNOME_DEPS="gconf-2.0 gthread-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0" PKG_CHECK_MODULES([HAL], [hal >= hal_minimum_version], [HAVE_HAL="yes"], [HAVE_HAL="no"]) if test "x$HAVE_HAL" = "xyes"; then @@ -1535,13 +1527,6 @@ EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-$EDS_PACKAGE libglade-2.0 gthrea AC_SUBST(CERT_UI_CFLAGS) AC_SUBST(CERT_UI_LIBS) -dnl ****************************** -dnl E_NAME Flags -dnl ****************************** -EVO_SET_COMPILE_FLAGS(E_NAME, libgnomeui-2.0 libbonoboui-2.0) -AC_SUBST(E_NAME_CFLAGS) -AC_SUBST(E_NAME_LIBS) - dnl ****************************** dnl If Gtk/Gdk is built against X11, e-util uses some X11-specific code so link with X11. dnl ****************************** @@ -1556,7 +1541,7 @@ fi dnl ************ dnl E_UTIL Flags dnl ************ -EVO_SET_COMPILE_FLAGS(E_UTIL, libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gnome-desktop-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $E_UTIL_X11_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $E_UTIL_X11_LIBS) +EVO_SET_COMPILE_FLAGS(E_UTIL, libglade-2.0 libgnomeui-2.0 gnome-desktop-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $E_UTIL_X11_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $E_UTIL_X11_LIBS) AC_SUBST(E_UTIL_CFLAGS) AC_SUBST(E_UTIL_LIBS) @@ -1572,14 +1557,14 @@ AC_SUBST(TZDIALOG_LIBS) dnl *************** dnl E_WIDGETS Flags dnl *************** -EVO_SET_COMPILE_FLAGS(E_WIDGETS, libbonoboui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE gtkhtml-editor) +EVO_SET_COMPILE_FLAGS(E_WIDGETS, gio-2.0 gconf-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE gtkhtml-editor) AC_SUBST(E_WIDGETS_CFLAGS) AC_SUBST(E_WIDGETS_LIBS) dnl *************** dnl IMPORTERS Flags dnl *************** -EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-$EDS_PACKAGE camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE libglade-2.0 libbonoboui-2.0 libgnomeui-2.0 libebook-$EDS_PACKAGE) +EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-$EDS_PACKAGE camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE libglade-2.0 libgnomeui-2.0 libebook-$EDS_PACKAGE) AC_SUBST(IMPORTERS_CFLAGS) AC_SUBST(IMPORTERS_LIBS) @@ -1593,7 +1578,7 @@ AC_SUBST(LIBFILTER_LIBS) dnl *********** dnl Shell Flags dnl *********** -EVO_SET_COMPILE_FLAGS(SHELL, libgnomeui-2.0 libbonoboui-2.0 gnome-desktop-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE unique-1.0 libedataserverui-$EDS_PACKAGE) +EVO_SET_COMPILE_FLAGS(SHELL, libgnomeui-2.0 gnome-desktop-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE unique-1.0 libedataserverui-$EDS_PACKAGE) AC_SUBST(SHELL_CFLAGS) AC_SUBST(SHELL_LIBS) @@ -1601,7 +1586,7 @@ AC_SUBST(SHELL_LIBS) dnl ***************** dnl Addressbook Flags dnl ***************** -EVOLUTION_ADDRESSBOOK_DEPS="libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE gtkhtml-editor unique-1.0" +EVOLUTION_ADDRESSBOOK_DEPS="libglade-2.0 libgnomeui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE gtkhtml-editor unique-1.0" EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS) AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS) AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS) @@ -1634,7 +1619,7 @@ EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-2.4 >= 2.3.0) AC_SUBST(LIBSOUP_CFLAGS) AC_SUBST(LIBSOUP_LIBS) -EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libecal-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libebackend-$EDS_PACKAGE $HAL_REQUIREMENT $libnotify gtkhtml-editor libgdata-$EDS_PACKAGE libgdata-google-$EDS_PACKAGE unique-1.0) +EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnomeui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libecal-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libebackend-$EDS_PACKAGE $HAL_REQUIREMENT $libnotify gtkhtml-editor libgdata-$EDS_PACKAGE libgdata-google-$EDS_PACKAGE unique-1.0) AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) AC_SUBST(EVOLUTION_CALENDAR_LIBS) @@ -1647,7 +1632,7 @@ fi dnl ********** dnl Mail Flags dnl ********** -EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE gtkhtml-editor bonobo-activation-2.0 $mozilla_nss libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE unique-1.0) +EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE libgnomeui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE gtkhtml-editor bonobo-activation-2.0 $mozilla_nss libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE unique-1.0) AC_SUBST(EVOLUTION_MAIL_CFLAGS) AC_SUBST(EVOLUTION_MAIL_LIBS) @@ -1900,7 +1885,7 @@ if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then dnl ************************************************** dnl * Exchange Operations plugin dnl ************************************************** - EVO_SET_COMPILE_FLAGS(CAMEL_EXCHANGE, libbonoboui-2.0 libglade-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE libecal-$EDS_PACKAGE) + EVO_SET_COMPILE_FLAGS(CAMEL_EXCHANGE, libglade-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE libecal-$EDS_PACKAGE) AC_SUBST(CAMEL_EXCHANGE_CFLAGS) AC_SUBST(CAMEL_EXCHANGE_LIBS) else -- cgit