summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2010-10-19 11:54:21 +0200
committerJan Engelhardt <jengelh@medozas.de>2010-10-19 11:54:21 +0200
commitb9db7e1adc2ae58b6b851fed9cef045fd06d3144 (patch)
tree629cb88e632d3eeaa33eb55608d4b8c56770543d
parent9475fc45474d9bb57f2f138ad9575fd2593cf2df (diff)
build: automake options should be in AM_INIT_AUTOMAKE
Automake options set in Makefile.am are not always propagated to subdirecties. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac2
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index baeae1a..35bfbe2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
include $(top_srcdir)/Make_global.am
-AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src include examples
diff --git a/configure.ac b/configure.ac
index 5cbbdfd..dfdd098 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to create configure.
AC_INIT([libmnl], [1.0.0-beta0])
AC_CANONICAL_SYSTEM
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign dist-bzip2 1.6])
AC_PROG_CC
AC_EXEEXT