From 71d45403400bdb18bc6ae5efaf4772f6b847c351 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 20 Jan 2009 12:08:06 +0100 Subject: build: update configure.ac Some constructs in there are old-fashioned. Replace them by their modern counterparts. Signed-off-by: Jan Engelhardt --- autogen.sh | 7 ++--- configure.ac | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.in | 83 ----------------------------------------------------------- 3 files changed, 86 insertions(+), 88 deletions(-) create mode 100644 configure.ac delete mode 100644 configure.in diff --git a/autogen.sh b/autogen.sh index 189e2f4..36b2a2a 100755 --- 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.ac b/configure.ac new file mode 100644 index 0000000..4429d5c --- /dev/null +++ b/configure.ac @@ -0,0 +1,84 @@ +dnl Process this file with autoconf to produce a configure script. +AC_PREREQ([2.50]) +AC_INIT([ulogd], [2.0.0beta2]) + +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 +AC_PROG_LIBTOOL + +dnl Checks for libraries. +AC_CHECK_LIB(dl, dlopen) +AC_CHECK_HEADER(pcap.h,HAVE_PCAP_H=true) + +dnl Checks for header files. +AC_HEADER_DIRENT +AC_HEADER_STDC +AC_CHECK_HEADERS(fcntl.h unistd.h) + +dnl Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_TYPE_SIZE_T +AC_STRUCT_TM +AC_SYS_LARGEFILE + +dnl Checks for library functions. +AC_FUNC_VPRINTF +AC_CHECK_FUNCS(socket strerror) + +CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter" + +dnl Check for the right nfnetlink version +LIBNFNETLINK_REQUIRED=0.0.39 +LIBNETFILTER_CONNTRACK_REQUIRED=0.0.95 +LIBNETFILTER_LOG_REQUIRED=0.0.15 + +PKG_CHECK_MODULES(LIBNFNETLINK, libnfnetlink >= $LIBNFNETLINK_REQUIRED,, AC_MSG_ERROR(Cannot find libnfnetlink >= $LIBNFNETLINK_REQUIRED)) + +PKG_CHECK_MODULES(LIBNETFILTER_CONNTRACK, libnetfilter_conntrack >= $LIBNETFILTER_CONNTRACK_REQUIRED,, AC_MSG_ERROR(Cannot find libnetfilter_conntrack >= $LIBNETFILTER_CONNTRACK_REQUIRED)) + +PKG_CHECK_MODULES(LIBNETFILTER_LOG, libnetfilter_log >= $LIBNETFILTER_LOG_REQUIRED,, AC_MSG_ERROR(Cannot find libnetfilter_log >= $LIBNETFILTER_LOG_REQUIRED)) + + +CT_CHECK_POSTGRES_DB() +AM_CONDITIONAL(HAVE_PGSQL, test "x$PQLIBPATH" != "x") + +CT_CHECK_MYSQL_DB() +AM_CONDITIONAL(HAVE_MYSQL, test "x$MYSQL_LIB" != "x") + +CT_CHECK_SQLITE3_DB() +AM_CONDITIONAL(HAVE_SQLITE3, test "x$SQLITE3_LIB" != "x") + +CT_CHECK_DBI() +AM_CONDITIONAL(HAVE_DBI, test "x$DBI_LIB" != "x") + +CT_CHECK_PCAP() +AM_CONDITIONAL(HAVE_PCAP, test "x$PCAP_LIB" != "x") + + +dnl AC_SUBST(DATABASE_DIR) +dnl AC_SUBST(DATABASE_LIB) +dnl AC_SUBST(DATABASE_LIB_DIR) +dnl AC_SUBST(DB_DEF) +dnl AC_SUBST(EXTRA_MYSQL_DEF) +dnl AC_SUBST(EXTRA_PGSQL_DEF) + +dnl AC_SUBST(DATABASE_DRIVERS) +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_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 diff --git a/configure.in b/configure.in deleted file mode 100644 index 141fa7d..0000000 --- a/configure.in +++ /dev/null @@ -1,83 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_PREQ(2.50) -AC_INIT - -AM_INIT_AUTOMAKE(ulogd, 2.0.0beta2) -AM_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 - -dnl Checks for libraries. -AC_CHECK_LIB(dl, dlopen) -AC_CHECK_HEADER(pcap.h,HAVE_PCAP_H=true) - -dnl Checks for header files. -AC_HEADER_DIRENT -AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h unistd.h) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_TYPE_SIZE_T -AC_STRUCT_TM -AC_SYS_LARGEFILE - -dnl Checks for library functions. -AC_FUNC_VPRINTF -AC_CHECK_FUNCS(socket strerror) - -CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter" - -dnl Check for the right nfnetlink version -LIBNFNETLINK_REQUIRED=0.0.39 -LIBNETFILTER_CONNTRACK_REQUIRED=0.0.95 -LIBNETFILTER_LOG_REQUIRED=0.0.15 - -PKG_CHECK_MODULES(LIBNFNETLINK, libnfnetlink >= $LIBNFNETLINK_REQUIRED,, AC_MSG_ERROR(Cannot find libnfnetlink >= $LIBNFNETLINK_REQUIRED)) - -PKG_CHECK_MODULES(LIBNETFILTER_CONNTRACK, libnetfilter_conntrack >= $LIBNETFILTER_CONNTRACK_REQUIRED,, AC_MSG_ERROR(Cannot find libnetfilter_conntrack >= $LIBNETFILTER_CONNTRACK_REQUIRED)) - -PKG_CHECK_MODULES(LIBNETFILTER_LOG, libnetfilter_log >= $LIBNETFILTER_LOG_REQUIRED,, AC_MSG_ERROR(Cannot find libnetfilter_log >= $LIBNETFILTER_LOG_REQUIRED)) - - -CT_CHECK_POSTGRES_DB() -AM_CONDITIONAL(HAVE_PGSQL, test "x$PQLIBPATH" != "x") - -CT_CHECK_MYSQL_DB() -AM_CONDITIONAL(HAVE_MYSQL, test "x$MYSQL_LIB" != "x") - -CT_CHECK_SQLITE3_DB() -AM_CONDITIONAL(HAVE_SQLITE3, test "x$SQLITE3_LIB" != "x") - -CT_CHECK_DBI() -AM_CONDITIONAL(HAVE_DBI, test "x$DBI_LIB" != "x") - -CT_CHECK_PCAP() -AM_CONDITIONAL(HAVE_PCAP, test "x$PCAP_LIB" != "x") - - -dnl AC_SUBST(DATABASE_DIR) -dnl AC_SUBST(DATABASE_LIB) -dnl AC_SUBST(DATABASE_LIB_DIR) -dnl AC_SUBST(DB_DEF) -dnl AC_SUBST(EXTRA_MYSQL_DEF) -dnl AC_SUBST(EXTRA_PGSQL_DEF) - -dnl AC_SUBST(DATABASE_DRIVERS) -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 \ - 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) -- cgit v1.2.3