From 66650cfcde862d02c58c19c980f90109bfcc0f74 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 30 Oct 2010 23:04:32 +0200 Subject: [PATCH] build: use modern call syntax for AC_INIT, AM_INIT_AUTOMAKE automake options also need to definitely go into configure.ac, otherwise they only apply to a single directory. Signed-off-by: Jan Engelhardt --- Makefile.am | 2 -- configure.ac | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 28641f8..b4e604b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 - ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = $(man_MANS) diff --git a/configure.ac b/configure.ac index a82c9f1..3bd3e1c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ dnl Process this file with autoconf to create configure. -AC_INIT +AC_INIT([libnetfilter_queue], [1.0.0]) AC_CANONICAL_SYSTEM AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE(libnetfilter_queue, 1.0.0) +AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-bzip2 1.6]) AC_PROG_CC AC_EXEEXT -- 2.7.4