aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH.Habighorst <tearofadragon@googlemail.com>2009-06-19 21:24:25 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-06-24 22:29:13 +0800
commitb7bf7ae3af4b831e05b212dec0962ff51daf696a (patch)
treed9c0117d752f2ab0dbd8bc3af81c9af49d98fec2
parent5aa431a5e2db2959c6e503ffaa4e1a05bc335cf2 (diff)
downloadgsoc2013-evolution-b7bf7ae3af4b831e05b212dec0962ff51daf696a.tar.gz
gsoc2013-evolution-b7bf7ae3af4b831e05b212dec0962ff51daf696a.tar.zst
gsoc2013-evolution-b7bf7ae3af4b831e05b212dec0962ff51daf696a.zip
Bug 586378 - Various build cleanups
-rw-r--r--configure.ac8
-rw-r--r--help/Makefile.am3
2 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index b16d4bd9e7..04f936f097 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.52)
+AC_PREREQ(2.54)
m4_define([evo_major_version], [2])
m4_define([evo_minor_version], [27])
@@ -81,10 +81,10 @@ GTK_DOC_CHECK(1.10)
# The extra brackets are to foil regex-based scans.
m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-AM_CONFIG_HEADER(config.h)
-
+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
diff --git a/help/Makefile.am b/help/Makefile.am
index 7654cee5f7..2428de150a 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,3 +1,6 @@
+# Suppress the Posix / GNU Make Warnings
+AUTOMAKE_OPTIONS=-Wno-portability
+
SUBDIRS = quickref
include $(top_srcdir)/gnome-doc-utils.make