From 4dd73e4e34b57685d8a85e041f6a0b4a65200e30 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 26 Jan 2009 19:30:33 +0100 Subject: build: upgrade build system - add .gitignore files - replace outdated autoconf macros by new constructs, including autogen.sh - and use AC_CONFIG_MACRO_DIR as suggested by libtool2: 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: Jan Engelhardt Signed-off-by: Pablo Neira Ayuso --- Makefile.am | 1 + autogen.sh | 18 ++---------------- configure.in | 6 ++++-- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7383328..fde65aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,7 @@ include Make_global.am # not a GNU package. You can remove this line, if # have all needed files, that a GNU package needs +ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 man_MANS = conntrack.8 conntrackd.8 diff --git a/autogen.sh b/autogen.sh index e76d3ef..36b2a2a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,18 +1,4 @@ #!/bin/sh -run () -{ - echo "running: $*" - eval $* - - if test $? != 0 ; then - echo "error: while running '$*'" - exit 1 - fi -} - -run aclocal -run libtoolize -f -#run autoheader -run automake -a -run autoconf +autoreconf -fi; +rm -Rf autom4te.cache; diff --git a/configure.in b/configure.in index c430df7..cd2e7d5 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,8 @@ AC_INIT(conntrack-tools, 0.9.10, pablo@netfilter.org) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE +AC_CONFIG_MACRO_DIR([m4]) +AM_INIT_AUTOMAKE([-Wall]) AC_PROG_CC AM_PROG_LIBTOOL @@ -130,4 +131,5 @@ CFLAGS="$CFLAGS $LIBNETFILTER_CONNTRACK_CFLAGS" AC_SUBST(LIBNETFILTER_CONNTRACK_LIBS) -AC_OUTPUT(Makefile src/Makefile include/Makefile extensions/Makefile) +AC_CONFIG_FILES([Makefile src/Makefile include/Makefile extensions/Makefile]) +AC_OUTPUT -- cgit v1.2.3