diff options
| author | Jason Gunthorpe <jgunthorpe@obsidianresearch.com> | 2010-10-07 22:38:33 +0000 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2010-12-08 17:34:27 -0800 |
| commit | 0e76392ce8281b6464ee8366128388ad4779ba2b (patch) | |
| tree | 864e3bcae3470a90a77d3095d92e44c4e606bfd6 | |
| parent | 2984b2069e521ff3183598e572111cf99bcadbb9 (diff) | |
| download | libibverbs-0e76392ce8281b6464ee8366128388ad4779ba2b.tar.gz | |
Fix autotools to include the necessary m4 files
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. The fix changes the autogen.sh output from:
+ aclocal -I config
+ libtoolize --force --copy
libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `config'.
libtoolize: copying file `config/ltmain.sh'
libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.in and
libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
+ autoheader
+ automake --foreign --add-missing --copy
+ autoconf
to:
+ aclocal -I config
+ libtoolize --force --copy
libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `config'.
libtoolize: copying file `config/ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `config'.
libtoolize: copying file `config/libtool.m4'
libtoolize: copying file `config/ltoptions.m4'
libtoolize: copying file `config/ltsugar.m4'
libtoolize: copying file `config/ltversion.m4'
libtoolize: copying file `config/lt~obsolete.m4'
+ autoheader
+ automake --foreign --add-missing --copy
+ autoconf
And fixes various build problems in weird cases.
This is how GNU envisions this mess works at least...
Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.in | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 5aa1289..e6a50ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,7 @@ INCLUDES = -I$(srcdir)/include lib_LTLIBRARIES = src/libibverbs.la +ACLOCAL_AMFLAGS = -I config AM_CFLAGS = -g -Wall src_libibverbs_la_CFLAGS = $(AM_CFLAGS) -DIBV_CONFIG_DIR=\"$(sysconfdir)/libibverbs.d\" diff --git a/configure.in b/configure.in index 927c406..cc93e00 100644 --- a/configure.in +++ b/configure.in @@ -4,6 +4,7 @@ AC_PREREQ(2.57) AC_INIT(libibverbs, 1.1.4, general@lists.openfabrics.org) AC_CONFIG_SRCDIR([src/ibverbs.h]) AC_CONFIG_AUX_DIR(config) +AC_CONFIG_MACRO_DIR(config) AC_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE(libibverbs, 1.1.4) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |