diff --git a/INSTALL b/INSTALL index 9e5d7396..be170053 100644 --- a/INSTALL +++ b/INSTALL @@ -19,7 +19,7 @@ Prerequisites In case you need to (re-)generate the script "configure" (see next section), you have to have the GNU autoconf/automake programs installed on your system. You -should have at least autoconf version >= 2.59 and automake version >= 1.7. +should have at least autoconf version >= 2.69 and automake version >= 1.11. For generating the configure script from a GIT repository, you also need Git. To compile the sources you need reasonably modern C and C++ compilers, like for diff --git a/configure.ac b/configure.ac index bf23772e..d40185a5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,3 @@ -# m4_esyscmd_s implementation for autoconf < 2.64. -# (Taken from m4sugar.m4 in autoconf 2.69.) -m4_ifndef([m4_esyscmd_s], [m4_define([m4_esyscmd_s], -[m4_chomp_all(m4_esyscmd([$1]))])]) -m4_ifndef([m4_chomp_all], [m4_define([m4_chomp_all], -[m4_format([[%.*s]], m4_bregexp(m4_translit([[$1]], [ -/], [/ ]), [/*$]), [$1])])]) - # Get the version from # (1) .version file available in a tarball, or # (2) the latest tag in the repository. @@ -76,28 +68,17 @@ m4_define([subdir_objects], [m4_esyscmd_s([ awk '{split ($NF,a,"."); if (a[1] >= 2 || (a[1] == 1 && a[2] >= 14)) { print "subdir-objects" }}' ])]) -AC_PREREQ([2.59]) +AC_PREREQ([2.69]) AC_INIT([FORM], [FORM_VERSION], [https://github.com/form-dev/form/issues]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([sources/form3.h]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([1.7 foreign -Wall dist-bzip2] serial_tests subdir_objects) +AM_INIT_AUTOMAKE([1.11 foreign -Wall dist-bzip2] serial_tests subdir_objects) # Check for .version file AM_CONDITIONAL([FIXED_VERSION], [test -f $srcdir/.version]) -# Check for automake >= 1.10 -flag=false -case $am__api_version in - 1.6|1.7|1.8|1.9) - ;; - *) - flag=: - ;; -esac -AM_CONDITIONAL([AUTOMAKE_GE_110], [$flag]) - # Check for programs : ${CFLAGS=''} # avoid autoconf's default CFLAGS/CXXFLAGS : ${CXXFLAGS=''} diff --git a/sources/Makefile.am b/sources/Makefile.am index ec0e5cfe..d8c3caef 100644 --- a/sources/Makefile.am +++ b/sources/Makefile.am @@ -158,10 +158,6 @@ DISTHOOK_VERSION_H = \ endif -# NOTE: maude_CXXFLAGS is not used while linking maude by default -# in automake < 1.10. A workaround is to define maude_LINK -# explicitly in all cases. (TU 22 Sep 2011) - bin_PROGRAMS = if BUILD_FORM @@ -172,11 +168,6 @@ form_CFLAGS = $(COMPILEFLAGS) form_CXXFLAGS = $(COMPILEFLAGS) form_LDFLAGS = $(LINKFLAGS) $(STATIC_LDFLAGS) form_LDADD = $(TOOL_LIBS) -if AUTOMAKE_GE_110 -form_LINK = $(CXXLD) $(form_CXXFLAGS) $(CXXFLAGS) $(form_LDFLAGS) $(LDFLAGS) -o $@ -else -form_LINK = $(CXXLD) $(form_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ -endif endif if BUILD_VORM @@ -187,11 +178,6 @@ vorm_CFLAGS = $(DEBUGCOMPILEFLAGS) vorm_CXXFLAGS = $(DEBUGCOMPILEFLAGS) vorm_LDFLAGS = $(DEBUGLINKFLAGS) vorm_LDADD = $(DEBUGTOOL_LIBS) -if AUTOMAKE_GE_110 -vorm_LINK = $(CXXLD) $(vorm_CXXFLAGS) $(CXXFLAGS) $(vorm_LDFLAGS) $(LDFLAGS) -o $@ -else -vorm_LINK = $(CXXLD) $(vorm_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ -endif endif if BUILD_TFORM @@ -202,11 +188,6 @@ tform_CFLAGS = $(COMPILEFLAGS) $(PTHREAD_CFLAGS) tform_CXXFLAGS = $(COMPILEFLAGS) $(PTHREAD_CFLAGS) tform_LDFLAGS = $(LINKFLAGS) $(STATIC_LDFLAGS) tform_LDADD = $(PTHREAD_LIBS) $(TOOL_LIBS) -if AUTOMAKE_GE_110 -tform_LINK = $(CXXLD) $(tform_CXXFLAGS) $(CXXFLAGS) $(tform_LDFLAGS) $(LDFLAGS) -o $@ -else -tform_LINK = $(CXXLD) $(tform_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ -endif endif if BUILD_TVORM @@ -217,11 +198,6 @@ tvorm_CFLAGS = $(DEBUGCOMPILEFLAGS) $(PTHREAD_CFLAGS) tvorm_CXXFLAGS = $(DEBUGCOMPILEFLAGS) $(PTHREAD_CFLAGS) tvorm_LDFLAGS = $(DEBUGLINKFLAGS) tvorm_LDADD = $(PTHREAD_LIBS) $(DEBUGTOOL_LIBS) -if AUTOMAKE_GE_110 -tvorm_LINK = $(CXXLD) $(tvorm_CXXFLAGS) $(CXXFLAGS) $(tvorm_LDFLAGS) $(LDFLAGS) -o $@ -else -tvorm_LINK = $(CXXLD) $(tvorm_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ -endif endif if BUILD_PARFORM @@ -232,11 +208,7 @@ parform_CFLAGS = $(COMPILEFLAGS) $(MPI_CFLAGS) parform_CXXFLAGS = $(COMPILEFLAGS) $(MPI_CXXFLAGS) parform_LDFLAGS = $(LINKFLAGS) $(MPI_STATIC_LDFLAGS) parform_LDADD = $(TOOL_LIBS) -if AUTOMAKE_GE_110 parform_LINK = $(MPICXX) $(parform_CXXFLAGS) $(CXXFLAGS) $(parform_LDFLAGS) $(LDFLAGS) -o $@ -else -parform_LINK = $(MPICXX) $(parform_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ -endif endif if BUILD_PARVORM @@ -247,9 +219,5 @@ parvorm_CFLAGS = $(DEBUGCOMPILEFLAGS) $(MPI_CFLAGS) parvorm_CXXFLAGS = $(DEBUGCOMPILEFLAGS) $(MPI_CXXFLAGS) parvorm_LDFLAGS = $(DEBUGLINKFLAGS) parvorm_LDADD = $(DEBUGTOOL_LIBS) -if AUTOMAKE_GE_110 parvorm_LINK = $(MPICXX) $(parvorm_CXXFLAGS) $(CXXFLAGS) $(parvorm_LDFLAGS) $(LDFLAGS) -o $@ -else -parvorm_LINK = $(MPICXX) $(parvorm_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ -endif endif