diff --git configure.ac configure.ac index 85d8e72..5cb6cd6 100644 --- configure.ac +++ configure.ac @@ -18,25 +18,6 @@ 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 1.9]) -AC_CONFIG_HEADERS(config.h) -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? -EDS_PACKAGE=1.2 -GTKHTML_PACKAGE=3.14 - # Required Packages m4_define([glib_minimum_version], [2.20.0]) m4_define([gtk_minimum_version], [2.16.0]) @@ -62,6 +43,25 @@ 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]) +# Automake 1.11 - Silent Build Rules +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +# 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) + +# Gnome Doc Initialization +GNOME_DOC_INIT + +# Some requirements have versioned package names +# XXX In the spirit of getting rid of versioned +# files, can we please drop these suffixes? +EDS_PACKAGE=1.2 +GTKHTML_PACKAGE=3.14 + # Compiler Warning Flags AS_COMPILER_FLAGS(WARNING_FLAGS,