build: update configure.ac

Some constructs in there are old-fashioned. Replace them by their
modern counterparts.

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

diff --git a/autogen.sh b/autogen.sh
index 189e2f45d16da577ec95f43533d4e739be340eb4..36b2a2a3afc21c5c672078f3df9324c7744e2924 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,4 @@
 #!/bin/sh
 
-aclocal
-autoheader
-libtoolize -c --force 
-automake -c --add-missing
-autoconf
+autoreconf -fi;
+rm -Rf autom4te.cache;

diff --git a/configure.in b/configure.ac
similarity index 91%
rename from configure.in
rename to configure.ac
index 141fa7d6677a9943d738c32fe8bd2fe047b27c8b..4429d5ce2704e8923ab34a49428c99f4c21a9195 100644 (file)
--- a/configure.in
+++ b/configure.ac
@@ -1,16 +1,16 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_PREQ(2.50)
-AC_INIT
+AC_PREREQ([2.50])
+AC_INIT([ulogd], [2.0.0beta2])
 
-AM_INIT_AUTOMAKE(ulogd, 2.0.0beta2)
-AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE([-Wall])
+AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
 AC_PROG_CC
 AC_PROG_INSTALL
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 
 dnl Checks for libraries.
 AC_CHECK_LIB(dl, dlopen)
@@ -74,10 +74,11 @@ dnl AC_SUBST(HAVE_PCAP_H)
 dnl AM_CONDITIONAL(HAVE_MYSQL, test x$mysqldir != x)
 dnl AM_CONDITIONAL(HAVE_PGSQL, test x$pgsqldir != x)
 
-AC_OUTPUT(include/Makefile include/ulogd/Makefile include/libipulog/Makefile \
+AC_CONFIG_FILES(include/Makefile include/ulogd/Makefile include/libipulog/Makefile \
          libipulog/Makefile \
          input/Makefile input/packet/Makefile input/flow/Makefile \
          filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile \
          output/Makefile output/pcap/Makefile output/mysql/Makefile output/pgsql/Makefile output/sqlite3/Makefile \
          output/dbi/Makefile \
          src/Makefile Makefile Rules.make)
+AC_OUTPUT