From 4f60c2ab5626870b53055e33cf14e4e8aa6627b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich@dune-project.org>
Date: Mon, 2 Dec 2013 09:04:32 +0100
Subject: [PATCH] [autotools] Add AC_PREREQ autoconf version test for
dune-common.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Update minimal required versions to these mentioned in the documentation.
Quote argument in AC_PREREQ.
(Thanks to BÃ¥rd Skaflestad for the heads-up)
---
README.SVN | 7 ++-----
bin/dunecontrol | 2 +-
bin/duneproject | 10 +++++-----
configure.ac | 2 +-
4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/README.SVN b/README.SVN
index 16a62660a..cadd4c890 100644
--- a/README.SVN
+++ b/README.SVN
@@ -4,9 +4,9 @@ Preparing the SVN-sources
Additional to the software mentioned in README you'll need the
following programs installed on your system:
- automake >= 1.5
+ automake >= 1.9
- autoconf >= 2.50
+ autoconf >= 2.52
libtool
@@ -23,6 +23,3 @@ provide external components! The Dune-library and -headers are
independent of other libraries, instead the applications can choose
which parts to use.
-$Id$
-
-
diff --git a/bin/dunecontrol b/bin/dunecontrol
index e429dc023..5e750b69d 100755
--- a/bin/dunecontrol
+++ b/bin/dunecontrol
@@ -1049,7 +1049,7 @@ case "$command" in
m4_define([DUNE_AC_INIT],[
AC_INIT([$name], [$version], [$maintainer])
- AM_INIT_AUTOMAKE([foreign 1.5 tar-pax])
+ AM_INIT_AUTOMAKE([foreign 1.9 tar-pax])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
AC_SUBST([DUNE_MOD_VERSION], [$version])
AC_SUBST([DUNE_MOD_NAME], [$name])
diff --git a/bin/duneproject b/bin/duneproject
index 88dbeaaed..5f73aab81 100755
--- a/bin/duneproject
+++ b/bin/duneproject
@@ -319,7 +319,7 @@ echo "- $PROJECT/configure.ac"
cat > "$PROJECT/configure.ac" <<C_DELIM
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.50)
+AC_PREREQ([2.62])
DUNE_AC_INIT # gets module version from dune.module file
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src/$CMODULE.cc])
@@ -363,9 +363,9 @@ Preparing the Sources
Additional to the software mentioned in README you'll need the
following programs installed on your system:
- automake >= 1.5
+ automake >= 1.9
- autoconf >= 2.50
+ autoconf >= 2.62
libtool
@@ -654,8 +654,8 @@ ${CMODULE}_LDFLAGS = \$(AM_LDFLAGS) \\
\$(DUNE_LDFLAGS)
# don't follow the full GNU-standard
-# we need automake 1.5
-AUTOMAKE_OPTIONS = foreign 1.5
+# we need automake 1.9
+AUTOMAKE_OPTIONS = foreign 1.9
# pass most important options when "make distcheck" is used
DISTCHECK_CONFIGURE_FLAGS = $DISTCHECK_CONFIGURE_FLAGS CXX="\$(CXX)" CC="\$(CC)"
diff --git a/configure.ac b/configure.ac
index b836e3033..0fdd69e6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
#! /bin/bash
-# $Id$
# Process this file with autoconf to produce a configure script.
+AC_PREREQ([2.62])
DUNE_AC_INIT # gets module version from dune.module file
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([dune/common/stdstreams.cc])
--
GitLab