librdmacm: Fix autotools to include the necessary M4 files

Otherwise running autogen.sh with a new version of autotools and then
building on a system with an older version tends to explode.
Unfortunately this is sometimes necessary since the new version is
required by the package.

This is how GNU envisions this mess works at least..

Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Sean Hefty <sean.hefty@intel.com>

diff --git a/Makefile.am b/Makefile.am
index 2668aa33677544f974bc3f6f1c6ecbef57435bde..434cb6b803b2794136c5f33bc0dbfc147b42be58 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES = -I$(srcdir)/include
 
 lib_LTLIBRARIES = src/librdmacm.la
 
+ACLOCAL_AMFLAGS = -I config
 AM_CFLAGS = -g -Wall -D_GNU_SOURCE
 
 src_librdmacm_la_CFLAGS = $(AM_CFLAGS)

diff --git a/configure.in b/configure.in
index 37d18518293c33d70adff4a5100f28dc85eb68a4..e63211fc6d4a847169dd85ece23ba0bfbb784bb0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,6 +4,7 @@ AC_PREREQ(2.57)
 AC_INIT(librdmacm, 1.0.13, general@lists.openfabrics.org)
 AC_CONFIG_SRCDIR([src/cma.c])
 AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR(config)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(librdmacm, 1.0.13)