From a3c20813990e6f5cab3746c20dad7d4f230cbe4d Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Mon, 2 Mar 2020 17:51:08 -0500 Subject: [PATCH] LP#1375296 - Quiet deprecation warnings in autoreconf -i step. Thanks to Warren Layton for suggesting this fix to the community! Signed-off-by: Chris Sharp Signed-off-by: Jason Stephenson --- Makefile.am | 1 + configure.ac | 7 ++++--- m4/.gitignore | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 m4/.gitignore diff --git a/Makefile.am b/Makefile.am index e11134c790..a732c8e4f0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,6 +25,7 @@ export PID=@localstatedir@/run export LOG=@localstatedir@/log export PERL_BASE=@PERL_BASE@ +ACLOCAL_AMFLAGS = -I m4 # Derived from autoconf: diff --git a/configure.ac b/configure.ac index 9917a658d9..d807121082 100644 --- a/configure.ac +++ b/configure.ac @@ -20,10 +20,11 @@ export PATH=${PATH}:/usr/sbin AC_PREREQ(2.61) -AC_INIT(Open-ILS, 3.4.1, open-ils-dev@list.georgialibraries.org) -AM_INIT_AUTOMAKE([OpenILS], [3.4.1]) -AC_REVISION($Revision: 0.1 $) +AC_INIT(Open-ILS, trunk, open-ils-dev@list.georgialibraries.org) AC_CONFIG_SRCDIR([configure.ac]) +AC_CONFIG_MACRO_DIR([m4]) +AM_INIT_AUTOMAKE +AC_REVISION($Revision: 0.1 $) AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar]) AC_SUBST(prefix) AC_SUBST([abs_top_builddir]) diff --git a/m4/.gitignore b/m4/.gitignore new file mode 100644 index 0000000000..0f4126cd67 --- /dev/null +++ b/m4/.gitignore @@ -0,0 +1 @@ +*.m4 -- 2.11.0