From 6ac8e971a327d750e35c41efd2928629c0ee8c9d Mon Sep 17 00:00:00 2001 From: Nick Gasson Date: Sun, 7 Apr 2024 10:31:47 +0100 Subject: [PATCH] Bump minimum autoconf and automake versions --- configure.ac | 20 ++++---------------- m4/autoconf-2.63_compat.m4 | 14 -------------- 2 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 m4/autoconf-2.63_compat.m4 diff --git a/configure.ac b/configure.ac index 304e6cc7..5cb91ea1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,26 +1,14 @@ -AC_INIT([nvc], [1.12.0], +AC_INIT([nvc], [1.13-devel], [https://github.com/nickg/nvc/issues], [nvc], [https://www.nickg.me.uk/nvc/]) -AC_PREREQ([2.63]) +AC_PREREQ([2.69]) AC_CANONICAL_HOST AC_CANONICAL_TARGET -dnl Automake 1.11 does not support the serial-tests option -dnl Remove this when 1.11 no longer in common use -m4_define([serial_tests], [ - m4_esyscmd([ - automake --version | - head -1 | - awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { print "serial-tests" }}' - ]) -]) - -m4_include([m4/autoconf-2.63_compat.m4]) - -AM_INIT_AUTOMAKE([1.11 -Wall -Wno-portability color-tests - foreign subdir-objects] serial_tests) +AM_INIT_AUTOMAKE([1.12 -Wall -Wno-portability color-tests + foreign subdir-objects serial-tests]) AM_SILENT_RULES([yes]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/m4/autoconf-2.63_compat.m4 b/m4/autoconf-2.63_compat.m4 deleted file mode 100644 index 42bbe21d..00000000 --- a/m4/autoconf-2.63_compat.m4 +++ /dev/null @@ -1,14 +0,0 @@ -##rhinton: stolen from http://hg.savannah.gnu.org/hgweb/octave/rev/691545147aca -dnl -dnl If needed, define the m4_ifblank and m4_ifnblank macros from autoconf 2.64 -dnl This allows us to run with earlier Autoconfs as well. -ifdef([m4_ifblank],[],[ -m4_define([m4_ifblank], -[m4_if(m4_translit([[$1]], [ ][ ][ -]), [], [$2], [$3])])]) -dnl -ifdef([m4_ifnblank],[],[ -m4_define([m4_ifnblank], -[m4_if(m4_translit([[$1]], [ ][ ][ -]), [], [$3], [$2])])]) -dnl -- 2.39.2