diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-28 10:31:47 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-28 23:24:49 +0800 |
| commit | 2c4510e858fcf96e8f3d02f3f92564460752e983 (patch) | |
| tree | 777c673d5fdaf649fb1c9eabd9357eac622b15f6 /configure.ac | |
| parent | 3fe8269156da1b57b0fc7391f5cf07cab6f61606 (diff) | |
| parent | 067ef5580fc287809958d4503691bfcba2b29ee5 (diff) | |
| download | gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.tar gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.tar.gz gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.tar.bz2 gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.tar.lz gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.tar.xz gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.tar.zst gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.zip | |
Merge commit 'EVOLUTION_2_27_5' into kill-bonobo
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 032cfe5c10..a38b478223 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], @@ -563,7 +563,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) @@ -1455,7 +1455,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 |