summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2010-07-11 17:19:54 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2010-07-11 17:27:52 +0200
commit895c800290f447d042ce0f70e49e2bf0dbe0c6fc (patch)
tree3ca465e6c5c4c805fa48aec6a7e1f539454d718b
parent75a4358ed831c215a68358a387d69f7cf90ad33a (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.am2
-rw-r--r--configure.in1
-rw-r--r--m4/.gitignore2
3 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index ad27038..28641f8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
+ACLOCAL_AMFLAGS = -I m4
+
EXTRA_DIST = $(man_MANS)
SUBDIRS = include src utils
diff --git a/configure.in b/configure.in
index 597a520..a06e5e9 100644
--- a/configure.in
+++ b/configure.in
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to create configure.
AC_INIT
AC_CANONICAL_SYSTEM
+AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE(libnetfilter_queue, 0.0.17)
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