diff options
| author | H.Habighorst <tearofadragon@googlemail.com> | 2009-06-23 23:11:32 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-06-24 22:31:01 +0800 |
| commit | bf4a3e68f70587f34e9cef264dc2869a7e9ffd28 (patch) | |
| tree | 78a75d034267cdfbd22bd64d2ab0401ccbbf2a74 | |
| parent | 44bffbc712735c12215deaf1e22e1030efdb671c (diff) | |
| download | gsoc2013-evolution-bf4a3e68f70587f34e9cef264dc2869a7e9ffd28.tar.gz gsoc2013-evolution-bf4a3e68f70587f34e9cef264dc2869a7e9ffd28.tar.zst gsoc2013-evolution-bf4a3e68f70587f34e9cef264dc2869a7e9ffd28.zip | |
Bug 586631 – Rearrange autotool initialization in configure.ac
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 886f8fdaec..48f6e2fdd5 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], [3]) @@ -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? @@ -83,17 +92,7 @@ AC_SUBST(WARNING_FLAGS) CFLAGS="$CFLAGS $WARNING_FLAGS" -# GNOME Documentation -GNOME_DOC_INIT -GTK_DOC_CHECK(1.10) -# 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 |