diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-01 22:47:10 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-01 22:47:10 +0800 |
| commit | 1351c8e4fb443a9705bb1225c3c574c05a36f8ca (patch) | |
| tree | e049bafefac361ae66dfa43abdb956f1f3a730e0 /configure.ac | |
| parent | 624f48121f523101fe26c3d3a8b51a4eeda90990 (diff) | |
| parent | 42e75c9162402078ac629740821c3533925ee342 (diff) | |
| download | gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.tar.gz gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.tar.zst gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.zip | |
Merge branch 'master' into kill-bonobo
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 565499187c..4975ff1d3c 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], [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], @@ -52,7 +52,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]) m4_define([unique_minimum_version], [1.0]) # XXX Just a Guess @@ -261,12 +261,9 @@ AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv, AC_TRY_LINK([ #include <iconv.h> #include <stdlib.h>],[ -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 |