[evolution] Bug 586631 – Rearrange autotool initialization in configure.ac
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Subject: [evolution] Bug 586631 – Rearrange autotool initialization in configure.ac
- Date: Tue, 23 Jun 2009 11:12:38 -0400 (EDT)
commit 639c1b0bfe9eadb4d36ddb373843f1ff72337bd5
Author: H.Habighorst <tearofadragon googlemail com>
Date: Tue Jun 23 11:11:32 2009 -0400
Bug 586631 â?? Rearrange autotool initialization in configure.ac
configure.ac | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3c2e95b..5260460 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], [4])
@@ -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?
@@ -82,16 +91,7 @@ AC_SUBST(WARNING_FLAGS)
CFLAGS="$CFLAGS $WARNING_FLAGS"
-# GNOME Documentation
-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])])
-
-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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]