[OpenSRF-GIT] OpenSRF branch master updated. 982b22ad470653790617ca53a4125018ee8c4979

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, master has been updated
       via  982b22ad470653790617ca53a4125018ee8c4979 (commit)
      from  3fb939657f350774f6b4216c9d416eff1745a1b3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 982b22ad470653790617ca53a4125018ee8c4979
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Mon Mar 2 17:29:12 2020 -0500

    LP#1272937 - Quiet warnings from autoreconf -i
    
    We change INCLUDES to AM_CPPFLAGS and change
    the syntax for AM_INIT_AUTOMAKE to match current
    recommendations.  Also, add an m4 directory.
    
    Thanks to Warren Layton for direction towards these
    solutions.
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Jason Stephenson <jason at sigio.com>

diff --git a/Makefile.am b/Makefile.am
index 385115d..f091593 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@ export APR_HEADERS              = @APR_HEADERS@
 export ETCDIR                   = @sysconfdir@
 export APXS2                    = @APXS2@
 export APACHE2_HEADERS          = @APACHE2_HEADERS@
-export DEF_CFLAGS               = -D_LARGEFILE64_SOURCE $(MAYBE_DEBUG) -pipe -g -Wall -O2 -fPIC -I at abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) @INCLUDES@
+export DEF_CFLAGS               = -D_LARGEFILE64_SOURCE $(MAYBE_DEBUG) -pipe -g -Wall -O2 -fPIC -I at abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) @AM_CPPFLAGS@
 export DEF_LDLIBS               = -lopensrf
 export VAR                      = @localstatedir@
 export PID                      = @localstatedir@/run/opensrf
@@ -34,6 +34,7 @@ export PERL_BASE                = @PERL_BASE@
 opensrfincludedir               = @includedir@/opensrf
 
 AM_CFLAGS = $(DEF_CFLAGS)
+ACLOCAL_AMFLAGS = -I m4
 
 DISTCLEANFILES = Makefile.in Makefile aclocal.m4 config.guess config.log config.sub config.status configure depcomp install-sh ltmain.sh missing
 
diff --git a/configure.ac b/configure.ac
index 48ffab8..3169958 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,11 @@
 # Initialization
 #-------------------------------
 
+libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([m4])' to configure.ac,
+libtoolize: and rerunning libtoolize and aclocal.
+libtoolize: Consider adding '-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
+
+
 export PATH=${PATH}:/usr/sbin
 AC_PREREQ(2.59)
 
@@ -26,11 +31,12 @@ AC_PREREQ(2.59)
 m4_include([version.m4])
 
 # Version number gets turned into @PACKAGE_VERSION@
-AC_INIT([OpenSRF],m4_defn([VERSION_NUMBER]),[open-ils-dev at list.georgialibraries.org])
-AM_INIT_AUTOMAKE([OpenSRF], m4_defn([VERSION_NUMBER]))
+AC_INIT([OpenSRF], [VERSION_NUMBER])
+AC_CONFIG_SRCDIR([configure.ac])
+AM_INIT_AUTOMAKE
+AC_CONFIG_MACRO_DIRS([m4])
 
 AC_REVISION($Revision: 0.1 $)
-AC_CONFIG_SRCDIR([configure.ac])
 
 # Enable $prefix to resolve to a reasonable value in substitutions in
 # scripts if no explict value was passed in to configure
@@ -267,12 +273,12 @@ IFS="${IFS}:"
 
 for dir in $EXTRA_USER_INCLUDES; do
 	if test -d "$dir"; then
-	  INCLUDES="$INCLUDES -I$dir"
+	  AM_CPPFLAGS="$AM_CPPFLAGS -I$dir"
 	else
 	  AC_MSG_WARN([*** Include directory $dir does not exist.])
 	fi
 done
-AC_SUBST(INCLUDES)
+AC_SUBST(AM_CPPFLAGS)
 
 for dir in $EXTRA_USER_LIBRARIES; do
 	if test -d "$dir"; then
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 0000000..0f4126c
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1 @@
+*.m4

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am   |  3 ++-
 configure.ac  | 16 +++++++++++-----
 m4/.gitignore |  1 +
 3 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 m4/.gitignore


hooks/post-receive
-- 
OpenSRF