From 7b3f6d38e5f72d6eb34fc1ffbb4cac979b2ea62e Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Wed, 15 Jul 2009 14:50:15 +0530 Subject: Update the LD_CFLAGS. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 254ee9f01f..1f9f6585c9 100644 --- a/configure.ac +++ b/configure.ac @@ -558,7 +558,7 @@ esac SAVE_CFLAGS="$CFLAGS" SAVE_LIBS="$LIBS" -LDAP_CFLAGS="-DLDAP_DEPRECATED" +LDAP_CFLAGS="$LDAP_CFLAGS -DLDAP_DEPRECATED" CFLAGS="$CFLAGS $LDAP_CFLAGS" LIBS="$LIBS $LDAP_LIBS" AC_CHECK_FUNCS(ldap_ntlm_bind) -- cgit v1.2.3 From 5cc01f17a337d125257a8dc3e248a4ae6b66ac92 Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Wed, 15 Jul 2009 16:54:50 +0530 Subject: Post release version bump. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 1f9f6585c9..ba8fda5338 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], [5]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], @@ -20,7 +20,7 @@ m4_define([upgrade_revision], [0]) # Autoconf / Automake Initialization AC_PREREQ(2.58) -AC_INIT([evolution],[evo_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution]) +AC_INIT([evolution],[evo_version.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution]) AM_INIT_AUTOMAKE([gnu 1.9]) AC_CONFIG_HEADERS(config.h) AC_CONFIG_SRCDIR(README) -- cgit v1.2.3 From 69f8088dd5ab8b586a1b702b3d567482a93afdde Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 22 Jul 2009 09:27:41 -0400 Subject: Don't warn when NM support is explicitly disabled. --- configure.ac | 1 - 1 file changed, 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ba8fda5338..2424cc2115 100644 --- a/configure.ac +++ b/configure.ac @@ -1450,7 +1450,6 @@ if test "$enable_nm" = yes; then AC_SUBST(HAVE_NM) AC_SUBST(NM_CFLAGS) else - AC_MSG_WARN([NetworkManager support disabled!]) NM_SUPPORT="no" fi -- cgit v1.2.3