From dadfda10cfc0a25bec9865f5517c398e072a67c6 Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Tue, 16 Jun 2009 22:13:00 +0530 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 035f38d09e..f9d110e055 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.52) m4_define([evo_major_version], [2]) m4_define([evo_minor_version], [27]) -m4_define([evo_micro_version], [3]) +m4_define([evo_micro_version], [4]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit From bbdb03cc99a393667636c371a04413b0fd4710ec 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 | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index f9d110e055..881c56afb5 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]) @@ -79,10 +79,10 @@ GNOME_DOC_INIT # 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 @@ -1131,7 +1131,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then nsprlibs="$DL_LIB -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" fi - AC_CACHE_CHECK([for Mozilla nspr libraries], moz_nspr_libs, + AC_CACHE_CHECK([for Mozilla nspr libraries], ac_cv_moz_nspr_libs, [ LIBS_save="$LIBS" CFLAGS="$CFLAGS $MANUAL_NSPR_CFLAGS" @@ -1144,12 +1144,12 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then LDFLAGS="$LDFLAGS" fi - AC_TRY_LINK_FUNC(PR_Init, moz_nspr_libs="yes", moz_nspr_libs="no") + AC_TRY_LINK_FUNC(PR_Init, ac_cv_moz_nspr_libs="yes", ac_cv_moz_nspr_libs="no") CFLAGS="$CFLAGS_save" LDFLAGS="$LDFLAGS_save" LIBS="$LIBS_save" ]) - if test "x$moz_nspr_libs" != "xno"; then + if test "x$ac_cv_moz_nspr_libs" != "xno"; then have_nspr_libs="yes" MANUAL_NSPR_LIBS="-L$with_nspr_libs $nsprlibs" else @@ -1210,21 +1210,21 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then nsslibs="-lssl3 -lsmime3 -lnss3" fi - AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs, + AC_CACHE_CHECK([for Mozilla nss libraries], ac_cv_moz_nss_libs, [ LIBS_save="$LIBS" LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs" LIBS="$nsslibs $nsprlibs" - AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no") - if test "$moz_nss_libs" = no; then + 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" LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs" - AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", 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" ]) - if test "$moz_nss_libs" != no; then + if test "$ac_cv_moz_nss_libs" != no; then AC_DEFINE(HAVE_NSS) AC_DEFINE(HAVE_SSL) AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,"$with_nss_libs", [Define to the full path of mozilla nss library]) -- cgit From 966d067c0d79551b2cdb10a96a2a716744b8bd65 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 881c56afb5..234f9b61b5 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) @@ -96,26 +104,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 @@ -133,7 +125,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 32fc333d574bfaab498d705cd7bb9f085a3365a0 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 234f9b61b5..3c2e95b6e5 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) @@ -104,11 +105,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 639c1b0bfe9eadb4d36ddb373843f1ff72337bd5 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 | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 3c2e95b6e5..5260460841 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], [4]) @@ -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? @@ -82,16 +91,7 @@ AC_SUBST(WARNING_FLAGS) CFLAGS="$CFLAGS $WARNING_FLAGS" -# GNOME Documentation -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])]) - -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 461eb9e6aa231edc12686b94a46b9fb52e04f020 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 5260460841..e5fde04804 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 8064f0c1b638864e40208f83671046b9290adcf8 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 | 122 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 61 insertions(+), 61 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index e5fde04804..8f6e53e071 100644 --- a/configure.ac +++ b/configure.ac @@ -174,7 +174,7 @@ case "$host" in *) os_win32=no 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' SOFTOKN3_LIB='-lsoftokn3' @@ -453,7 +453,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 @@ -486,7 +486,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 @@ -519,7 +519,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 @@ -747,7 +747,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); @@ -818,7 +818,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" @@ -828,7 +828,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") @@ -886,7 +886,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" @@ -918,7 +918,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" @@ -997,7 +997,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 @@ -1007,21 +1007,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.])) @@ -1039,7 +1039,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" @@ -1050,7 +1050,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 @@ -1060,7 +1060,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 @@ -1080,20 +1080,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" @@ -1102,12 +1102,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.] @@ -1119,12 +1119,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" @@ -1132,7 +1132,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" @@ -1148,26 +1148,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 @@ -1178,10 +1178,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.] @@ -1197,8 +1197,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" @@ -1208,7 +1208,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" @@ -1236,7 +1236,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 @@ -1253,18 +1253,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 @@ -1314,14 +1314,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" @@ -1332,17 +1332,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 [ @@ -1366,8 +1366,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) @@ -1466,7 +1466,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 @@ -1474,7 +1474,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 @@ -1540,7 +1540,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) 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) @@ -1555,17 +1555,17 @@ 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) -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 $NM_SUPPORT_PACKAGES) +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 $NM_SUPPORT_PACKAGES) AC_SUBST(SHELL_CFLAGS) AC_SUBST(SHELL_LIBS) @@ -1764,7 +1764,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 mail-account-disable 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 select-one-source copy-tool 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" @@ -1860,7 +1860,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 9d9226188eeeffea82c676c4355e6fb169dd0782 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 8f6e53e071..f008de36e9 100644 --- a/configure.ac +++ b/configure.ac @@ -240,7 +240,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 696a97ae5fae8f3ddfece0432a753e6bb34b1858 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 f008de36e9..719497029e 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 b1892df4c9dd5757880fdc95fdacf0f9dd9e2f4d Mon Sep 17 00:00:00 2001 From: Yavor Doganov Date: Sat, 27 Jun 2009 11:42:34 -0400 Subject: Bug 587138 - Require libxml2 2.7.3 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 719497029e..fd49b43868 100644 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,7 @@ 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([libxml_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]) # Optional Packages -- cgit From fc94699abb73ac79b4676214ac965a93ea3b0986 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 30 Jun 2009 09:23:43 -0400 Subject: Bug 587374 - iconv test broken on some gcc --- configure.ac | 3 --- 1 file changed, 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index fd49b43868..85d8e72ff9 100644 --- a/configure.ac +++ b/configure.ac @@ -256,12 +256,9 @@ AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv, AC_TRY_LINK([ #include #include ],[ -int main (int argc, char **argv) -{ iconv_t cd; cd = iconv_open ("UTF-8", "ISO-8859-1"); exit (0); -} ], [ac_cv_libiconv=yes], [ac_cv_libiconv=no])) if test $ac_cv_libiconv = yes; then -- cgit