Skip to content
Snippets Groups Projects
Commit 4f60c2ab authored by Christoph Grüninger's avatar Christoph Grüninger
Browse files

[autotools] Add AC_PREREQ autoconf version test for dune-common.

Update minimal required versions to these mentioned in the documentation.
Quote argument in AC_PREREQ.
(Thanks to Bård Skaflestad for the heads-up)
parent b9073e97
No related branches found
No related tags found
No related merge requests found
...@@ -4,9 +4,9 @@ Preparing the SVN-sources ...@@ -4,9 +4,9 @@ Preparing the SVN-sources
Additional to the software mentioned in README you'll need the Additional to the software mentioned in README you'll need the
following programs installed on your system: following programs installed on your system:
automake >= 1.5 automake >= 1.9
autoconf >= 2.50 autoconf >= 2.52
libtool libtool
...@@ -23,6 +23,3 @@ provide external components! The Dune-library and -headers are ...@@ -23,6 +23,3 @@ provide external components! The Dune-library and -headers are
independent of other libraries, instead the applications can choose independent of other libraries, instead the applications can choose
which parts to use. which parts to use.
$Id$
...@@ -1049,7 +1049,7 @@ case "$command" in ...@@ -1049,7 +1049,7 @@ case "$command" in
m4_define([DUNE_AC_INIT],[ m4_define([DUNE_AC_INIT],[
AC_INIT([$name], [$version], [$maintainer]) 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])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
AC_SUBST([DUNE_MOD_VERSION], [$version]) AC_SUBST([DUNE_MOD_VERSION], [$version])
AC_SUBST([DUNE_MOD_NAME], [$name]) AC_SUBST([DUNE_MOD_NAME], [$name])
......
...@@ -319,7 +319,7 @@ echo "- $PROJECT/configure.ac" ...@@ -319,7 +319,7 @@ echo "- $PROJECT/configure.ac"
cat > "$PROJECT/configure.ac" <<C_DELIM cat > "$PROJECT/configure.ac" <<C_DELIM
# -*- Autoconf -*- # -*- Autoconf -*-
# Process this file with autoconf to produce a configure script. # 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 DUNE_AC_INIT # gets module version from dune.module file
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src/$CMODULE.cc]) AC_CONFIG_SRCDIR([src/$CMODULE.cc])
...@@ -363,9 +363,9 @@ Preparing the Sources ...@@ -363,9 +363,9 @@ Preparing the Sources
Additional to the software mentioned in README you'll need the Additional to the software mentioned in README you'll need the
following programs installed on your system: following programs installed on your system:
automake >= 1.5 automake >= 1.9
autoconf >= 2.50 autoconf >= 2.62
libtool libtool
...@@ -654,8 +654,8 @@ ${CMODULE}_LDFLAGS = \$(AM_LDFLAGS) \\ ...@@ -654,8 +654,8 @@ ${CMODULE}_LDFLAGS = \$(AM_LDFLAGS) \\
\$(DUNE_LDFLAGS) \$(DUNE_LDFLAGS)
# don't follow the full GNU-standard # don't follow the full GNU-standard
# we need automake 1.5 # we need automake 1.9
AUTOMAKE_OPTIONS = foreign 1.5 AUTOMAKE_OPTIONS = foreign 1.9
# pass most important options when "make distcheck" is used # pass most important options when "make distcheck" is used
DISTCHECK_CONFIGURE_FLAGS = $DISTCHECK_CONFIGURE_FLAGS CXX="\$(CXX)" CC="\$(CC)" DISTCHECK_CONFIGURE_FLAGS = $DISTCHECK_CONFIGURE_FLAGS CXX="\$(CXX)" CC="\$(CC)"
......
#! /bin/bash #! /bin/bash
# $Id$
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ([2.62])
DUNE_AC_INIT # gets module version from dune.module file DUNE_AC_INIT # gets module version from dune.module file
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([dune/common/stdstreams.cc]) AC_CONFIG_SRCDIR([dune/common/stdstreams.cc])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment