libibcm: 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 4b2ad7489016eaf68d20571f895aa981acba0a22..2333930db54861c1b5be2a985e564dd45105dee3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES = -I$(srcdir)/include
 
 lib_LTLIBRARIES = src/libibcm.la
 
+ACLOCAL_AMFLAGS = -I config
 AM_CFLAGS = -g -Wall -D_GNU_SOURCE
 
 src_libibcm_la_CFLAGS = $(AM_CFLAGS)

diff --git a/configure.in b/configure.in
index 27129694091432ba9cc75795b34e8add1828e030..145e3a4cebf23902de195aaaac2e12e38f5ba050 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,6 +4,7 @@ AC_PREREQ(2.57)
 AC_INIT(libibcm, 1.0.5, general@lists@openfabrics.org)
 AC_CONFIG_SRCDIR([src/cm.c])
 AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR(config)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(libibcm, 1.0.5)