From 3a58197366e31f0f70c2da45fdb30358617fdd79 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Tue, 6 Nov 2018 22:26:15 +0000 Subject: [PATCH] Readd autogen.sh Some old autoconf versions do not work properly when using autoreconf, but work fine when calling aclocal, autoconf and autoheader manually. FossilOrigin-Name: 92aea1ca9097351c103bb5b995095da6c2158ce65c63464fe8d4b2a0d63967c0 --- autogen.sh | 10 ++++++++++ {m4 => build-aux/m4}/buildsys.m4 | 0 configure.ac | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100755 autogen.sh rename {m4 => build-aux/m4}/buildsys.m4 (100%) diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..218fb7c --- /dev/null +++ b/autogen.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +# Set a version for OpenBSD +: ${AUTOCONF_VERSION:=2.69} +: ${AUTOMAKE_VERSION:=1.16} +export AUTOCONF_VERSION AUTOMAKE_VERSION + +aclocal -I build-aux/m4 +autoconf diff --git a/m4/buildsys.m4 b/build-aux/m4/buildsys.m4 similarity index 100% rename from m4/buildsys.m4 rename to build-aux/m4/buildsys.m4 diff --git a/configure.ac b/configure.ac index 7d9a048..935aa46 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_INIT(ObjIRC, 0.1, js@heap.zone) BUILDSYS_INIT AC_CONFIG_SRCDIR(src) -AC_CONFIG_MACRO_DIR(m4) +AC_CONFIG_MACRO_DIR(build-aux/m4) AC_CONFIG_AUX_DIR(build-aux) AC_CHECK_TOOL(OBJFW_CONFIG, objfw-config)