diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2010-09-04 13:25:32 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2010-09-04 13:25:32 +0200 |
commit | 9b04f2f352edbabdaab57b6176390d6facfc2e85 (patch) | |
tree | f22bba01517bf1b2d3e70e970affc16916a6a687 | |
parent | af3062777d3f99e9371aeeded872a2cbeb0b5a0c (diff) |
build: add libtool m4 support
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.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | m4/.gitignore | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index ba27482..80294cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,8 @@ include $(top_srcdir)/Make_global.am AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = include src utils qa man_MANS = #nfnetlink_conntrack.3 nfnetlink_conntrack.7 diff --git a/configure.in b/configure.in index 3368f41..6451847 100644 --- a/configure.in +++ b/configure.in @@ -1,8 +1,8 @@ dnl Process this file with autoconf to create configure. AC_INIT - AC_CANONICAL_SYSTEM +AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE(libnetfilter_conntrack, 0.0.102) diff --git a/m4/.gitignore b/m4/.gitignore new file mode 100644 index 0000000..64d9bbc --- /dev/null +++ b/m4/.gitignore @@ -0,0 +1,2 @@ +/libtool.m4 +/lt*.m4 |