From: Jan Engelhardt <jengelh@medozas.de>
Date: Fri, 5 Nov 2010 18:03:28 +0000 (+0100)
Subject: build: move global automake options into configure.ac
X-Git-Tag: ulogd-2.0.0~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9dfce83a3c849ec5f20dc5c18063eb3b0774e1ef;p=thirdparty%2Fulogd2.git

build: move global automake options into configure.ac

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---

diff --git a/Makefile.am b/Makefile.am
index 5965387..cf74fca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 
 ACLOCAL_AMFLAGS  = -I m4
-AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
 
 man_MANS = ulogd.8
 
diff --git a/configure.ac b/configure.ac
index e5a64fe..370b4b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.50])
 AC_INIT([ulogd], [2.0.0beta4])
 
-AM_INIT_AUTOMAKE([-Wall])
+AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2 1.6])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])