summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2010-07-14 18:53:23 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2010-07-14 18:53:23 +0200
commite5781ad635db7c260ed61f5816a7737105b220f4 (patch)
treee781cb63bacf4b833135dc769db7a4f62000fe80
parentbf1e4f179c18f341e6ddd9a83a37549592e547b4 (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 3101500..348cfc6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,8 @@ INCLUDES =$(all_includes) -I$(top_srcdir)/include
SUBDIRS = include src utils
LINKOPTS = -lnfnetlink
+ACLOCAL_AMFLAGS = -I m4
+
EXTRA_DIST = $(man_MANS)
man_MANS = #nfnetlink_log.3 nfnetlink_log.7
diff --git a/configure.in b/configure.in
index 87bd4a4..94bf52e 100644
--- a/configure.in
+++ b/configure.in
@@ -3,6 +3,7 @@ dnl Process this file with autoconf to create configure.
AC_INIT
AC_CANONICAL_SYSTEM
+AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE(libnetfilter_log, 0.0.16)
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