Ulogd patch series

Ulogd patch series

[Jan Engelhardt]

Hi,


here are a bunch of patches that seemed to come in handy whilst 
packaging ulogd as rpm.

Please pull from
	git://dev.medozas.de/ulogd master

to recieve:
Jan Engelhardt (5):
      build: compile fix
      Update .gitignore and remove install-sh
      build: use -avoid-version for modules
      build: resolve autotools suggestions to use AC_CONFIG_MACRO_DIR
      build: update configure.ac


Patches will be posted for review as replies.

[1/5] build: compile fix

[Jan Engelhardt]

parent 75b3becf5b95c4ab5ddcef88b6565de716e5c230
commit 00f879a81e898b37b9c17c878dc90327ca84684e
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Sun Jan 18 18:50:04 2009 +0100

build: compile fix

ulogd_inpflow_NFCT.c: In function 'propagate_ct':
ulogd_inpflow_NFCT.c:483: error: 'IPPROTO_UDPLITE' undeclared (first use in this function)

(and more for IPPROTO_SCTP)

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 input/flow/ulogd_inpflow_NFCT.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/input/flow/ulogd_inpflow_NFCT.c b/input/flow/ulogd_inpflow_NFCT.c
index 244454b..4605fd9 100644
--- a/input/flow/ulogd_inpflow_NFCT.c
+++ b/input/flow/ulogd_inpflow_NFCT.c
@@ -35,6 +35,7 @@
 
 #include <sys/time.h>
 #include <time.h>
+#include <netinet/in.h>
 #include <ulogd/linuxlist.h>
 #include <ulogd/jhash.h>
 #include <ulogd/hash.h>

[2/5] Update .gitignore and remove install-sh

[Jan Engelhardt]

parent 00f879a81e898b37b9c17c878dc90327ca84684e
commit a04c67dfc98bffef3b00b8ed04e54ca92eedfa1c
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Tue Jan 20 09:00:53 2009 +0100

Update .gitignore and remove install-sh

install-sh is autogenerated.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 .gitignore     |   24 +++++
 install-sh     |  251 ------------------------------------------------
 src/.gitignore |    1 +
 3 files changed, 25 insertions(+), 251 deletions(-)
 create mode 100644 .gitignore
 delete mode 100755 install-sh
 create mode 100644 src/.gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6c7f08c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,24 @@
+# global
+*.la
+*.lo
+*.o
+.deps
+.libs
+Makefile
+Makefile.in
+
+# this dir
+/Rules.make
+/ulogd.conf
+
+# build system
+/aclocal.m4
+/autom4te.cache
+/config.*
+/configure
+/depcomp
+/install-sh
+/libtool
+/ltmain.sh
+/missing
+/stamp-h1
diff --git a/install-sh b/install-sh
deleted file mode 100755
index e9de238..0000000
--- a/install-sh
+++ /dev/null
@@ -1,251 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..fa6a16e
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1 @@
+/ulogd

[3/5] build: use -avoid-version for modules

[Jan Engelhardt]

parent a04c67dfc98bffef3b00b8ed04e54ca92eedfa1c
commit 433135f373edde9cc9c129b28257844eb1b3642c
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Tue Jan 20 09:04:03 2009 +0100

build: use -avoid-version for modules

The modules are pretty much bound to ulogd, and it does not seem
to make sense to specially version these.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 filter/Makefile.am            |   16 ++++++++--------
 filter/raw2packet/Makefile.am |    2 +-
 input/flow/Makefile.am        |    4 ++--
 input/packet/Makefile.am      |    4 ++--
 output/Makefile.am            |   10 +++++-----
 output/dbi/Makefile.am        |    2 +-
 output/mysql/Makefile.am      |    2 +-
 output/pcap/Makefile.am       |    2 +-
 output/pgsql/Makefile.am      |    2 +-
 output/sqlite3/Makefile.am    |    2 +-
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/filter/Makefile.am b/filter/Makefile.am
index 556705c..5c4e4ab 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -8,25 +8,25 @@ pkglib_LTLIBRARIES = ulogd_filter_IFINDEX.la ulogd_filter_PWSNIFF.la \
 		     ulogd_filter_HWHDR.la ulogd_filter_MARK.la
 
 ulogd_filter_IFINDEX_la_SOURCES = ulogd_filter_IFINDEX.c
-ulogd_filter_IFINDEX_la_LDFLAGS = -module -lnfnetlink
+ulogd_filter_IFINDEX_la_LDFLAGS = -avoid-version -module -lnfnetlink
 
 ulogd_filter_PWSNIFF_la_SOURCES = ulogd_filter_PWSNIFF.c
-ulogd_filter_PWSNIFF_la_LDFLAGS = -module
+ulogd_filter_PWSNIFF_la_LDFLAGS = -avoid-version -module
 
 ulogd_filter_IP2STR_la_SOURCES = ulogd_filter_IP2STR.c
-ulogd_filter_IP2STR_la_LDFLAGS = -module
+ulogd_filter_IP2STR_la_LDFLAGS = -avoid-version -module
 
 ulogd_filter_IP2BIN_la_SOURCES = ulogd_filter_IP2BIN.c
-ulogd_filter_IP2BIN_la_LDFLAGS = -module
+ulogd_filter_IP2BIN_la_LDFLAGS = -avoid-version -module
 
 ulogd_filter_HWHDR_la_SOURCES = ulogd_filter_HWHDR.c
-ulogd_filter_HWHDR_la_LDFLAGS = -module
+ulogd_filter_HWHDR_la_LDFLAGS = -avoid-version -module
 
 ulogd_filter_MARK_la_SOURCES = ulogd_filter_MARK.c
-ulogd_filter_MARK_la_LDFLAGS = -module
+ulogd_filter_MARK_la_LDFLAGS = -avoid-version -module
 
 ulogd_filter_PRINTPKT_la_SOURCES = ulogd_filter_PRINTPKT.c ../util/printpkt.c
-ulogd_filter_PRINTPKT_la_LDFLAGS = -module
+ulogd_filter_PRINTPKT_la_LDFLAGS = -avoid-version -module
 
 ulogd_filter_PRINTFLOW_la_SOURCES = ulogd_filter_PRINTFLOW.c ../util/printflow.c
-ulogd_filter_PRINTFLOW_la_LDFLAGS = -module
+ulogd_filter_PRINTFLOW_la_LDFLAGS = -avoid-version -module
diff --git a/filter/raw2packet/Makefile.am b/filter/raw2packet/Makefile.am
index 94adb3c..25111a8 100644
--- a/filter/raw2packet/Makefile.am
+++ b/filter/raw2packet/Makefile.am
@@ -4,4 +4,4 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include
 pkglib_LTLIBRARIES = ulogd_raw2packet_BASE.la 
 
 ulogd_raw2packet_BASE_la_SOURCES = ulogd_raw2packet_BASE.c
-ulogd_raw2packet_BASE_la_LDFLAGS = -module
+ulogd_raw2packet_BASE_la_LDFLAGS = -avoid-version -module
diff --git a/input/flow/Makefile.am b/input/flow/Makefile.am
index 288d335..012feb8 100644
--- a/input/flow/Makefile.am
+++ b/input/flow/Makefile.am
@@ -5,8 +5,8 @@ AM_CFLAGS=-fPIC -Wall
 pkglib_LTLIBRARIES = ulogd_inpflow_NFCT.la # ulogd_inpflow_IPFIX.la
 
 ulogd_inpflow_NFCT_la_SOURCES = ulogd_inpflow_NFCT.c
-ulogd_inpflow_NFCT_la_LDFLAGS = -module $(LIBNETFILTER_CONNTRACK_LIBS)
+ulogd_inpflow_NFCT_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS)
 ulogd_inpflow_NFCT_la_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS)
 
 #ulogd_inpflow_IPFIX_la_SOURCES = ulogd_inpflow_IPFIX.c
-#ulogd_inpflow_IPFIX_la_LDFLAGS = -module
+#ulogd_inpflow_IPFIX_la_LDFLAGS = -avoid-version -module
diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am
index a07f724..716ed38 100644
--- a/input/packet/Makefile.am
+++ b/input/packet/Makefile.am
@@ -6,9 +6,9 @@ LIBS=
 pkglib_LTLIBRARIES = ulogd_inppkt_NFLOG.la ulogd_inppkt_ULOG.la
 
 ulogd_inppkt_NFLOG_la_SOURCES = ulogd_inppkt_NFLOG.c
-ulogd_inppkt_NFLOG_la_LDFLAGS = -module $(LIBNETFILTER_LOG_LIBS)
+ulogd_inppkt_NFLOG_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_LOG_LIBS)
 ulogd_inppkt_NFLOG_la_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_LOG_CFLAGS)
 
 ulogd_inppkt_ULOG_la_SOURCES = ulogd_inppkt_ULOG.c
-ulogd_inppkt_ULOG_la_LDFLAGS = -module
+ulogd_inppkt_ULOG_la_LDFLAGS = -avoid-version -module
 ulogd_inppkt_ULOG_la_LIBADD = ../../libipulog/libipulog.la
diff --git a/output/Makefile.am b/output/Makefile.am
index 69578a0..beceb6b 100644
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -8,16 +8,16 @@ pkglib_LTLIBRARIES = ulogd_output_LOGEMU.la ulogd_output_SYSLOG.la \
 		     ulogd_output_NACCT.la
 
 ulogd_output_LOGEMU_la_SOURCES = ulogd_output_LOGEMU.c
-ulogd_output_LOGEMU_la_LDFLAGS = -module
+ulogd_output_LOGEMU_la_LDFLAGS = -avoid-version -module
 
 ulogd_output_SYSLOG_la_SOURCES = ulogd_output_SYSLOG.c
-ulogd_output_SYSLOG_la_LDFLAGS = -module
+ulogd_output_SYSLOG_la_LDFLAGS = -avoid-version -module
 
 ulogd_output_OPRINT_la_SOURCES = ulogd_output_OPRINT.c
-ulogd_output_OPRINT_la_LDFLAGS = -module
+ulogd_output_OPRINT_la_LDFLAGS = -avoid-version -module
 
 ulogd_output_IPFIX_la_SOURCES = ulogd_output_IPFIX.c
-ulogd_output_IPFIX_la_LDFLAGS = -module
+ulogd_output_IPFIX_la_LDFLAGS = -avoid-version -module
 
 ulogd_output_NACCT_la_SOURCES = ulogd_output_NACCT.c
-ulogd_output_NACCT_la_LDFLAGS = -module
+ulogd_output_NACCT_la_LDFLAGS = -avoid-version -module
diff --git a/output/dbi/Makefile.am b/output/dbi/Makefile.am
index d127587..382e698 100644
--- a/output/dbi/Makefile.am
+++ b/output/dbi/Makefile.am
@@ -7,6 +7,6 @@ if HAVE_DBI
 pkglib_LTLIBRARIES = ulogd_output_DBI.la
 
 ulogd_output_DBI_la_SOURCES = ulogd_output_DBI.c ../../util/db.c
-ulogd_output_DBI_la_LDFLAGS = -module
+ulogd_output_DBI_la_LDFLAGS = -avoid-version -module
 
 endif
diff --git a/output/mysql/Makefile.am b/output/mysql/Makefile.am
index 35ebd63..b807a4d 100644
--- a/output/mysql/Makefile.am
+++ b/output/mysql/Makefile.am
@@ -6,6 +6,6 @@ if HAVE_MYSQL
 pkglib_LTLIBRARIES = ulogd_output_MYSQL.la
 
 ulogd_output_MYSQL_la_SOURCES = ulogd_output_MYSQL.c ../../util/db.c
-ulogd_output_MYSQL_la_LDFLAGS = -module
+ulogd_output_MYSQL_la_LDFLAGS = -avoid-version -module
 
 endif
diff --git a/output/pcap/Makefile.am b/output/pcap/Makefile.am
index 98a222b..5e2019f 100644
--- a/output/pcap/Makefile.am
+++ b/output/pcap/Makefile.am
@@ -7,6 +7,6 @@ if HAVE_PCAP
 pkglib_LTLIBRARIES = ulogd_output_PCAP.la
 
 ulogd_output_PCAP_la_SOURCES = ulogd_output_PCAP.c
-ulogd_output_PCAP_la_LDFLAGS = -module
+ulogd_output_PCAP_la_LDFLAGS = -avoid-version -module
 
 endif
diff --git a/output/pgsql/Makefile.am b/output/pgsql/Makefile.am
index 5452455..e1e0d9f 100644
--- a/output/pgsql/Makefile.am
+++ b/output/pgsql/Makefile.am
@@ -7,6 +7,6 @@ if HAVE_PGSQL
 pkglib_LTLIBRARIES = ulogd_output_PGSQL.la
 
 ulogd_output_PGSQL_la_SOURCES = ulogd_output_PGSQL.c ../../util/db.c
-ulogd_output_PGSQL_la_LDFLAGS = -module
+ulogd_output_PGSQL_la_LDFLAGS = -avoid-version -module
 
 endif
diff --git a/output/sqlite3/Makefile.am b/output/sqlite3/Makefile.am
index 9920c22..736ecd4 100644
--- a/output/sqlite3/Makefile.am
+++ b/output/sqlite3/Makefile.am
@@ -6,6 +6,6 @@ if HAVE_SQLITE3
 pkglib_LTLIBRARIES = ulogd_output_SQLITE3.la
 
 ulogd_output_SQLITE3_la_SOURCES = ulogd_output_SQLITE3.c ../../util/db.c
-ulogd_output_SQLITE3_la_LDFLAGS = -module
+ulogd_output_SQLITE3_la_LDFLAGS = -avoid-version -module
 
 endif

[4/5] build: resolve autotools suggestions to use AC_CONFIG_MACRO_DIR

[Jan Engelhardt]

parent 433135f373edde9cc9c129b28257844eb1b3642c
commit d3ced9d5dcdb6b42a4c887b3afbfaaaa2bc09419
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Tue Jan 20 12:05:54 2009 +0100

build: resolve autotools suggestions to use AC_CONFIG_MACRO_DIR

libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac 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 <jengelh@medozas.de>
---
 Makefile.am   |    1 +
 configure.in  |    1 +
 m4/.gitignore |    2 ++
 3 files changed, 4 insertions(+), 0 deletions(-)
 create mode 100644 m4/.gitignore

diff --git a/Makefile.am b/Makefile.am
index e8b1154..ac35ce3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
 
+ACLOCAL_AMFLAGS  = -I m4
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
 
 man_MANS = ulogd.8
diff --git a/configure.in b/configure.in
index 9d3f02a..141fa7d 100644
--- a/configure.in
+++ b/configure.in
@@ -4,6 +4,7 @@ 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
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 0000000..64d9bbc
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,2 @@
+/libtool.m4
+/lt*.m4

[5/5] build: update configure.ac

[Jan Engelhardt]

parent d3ced9d5dcdb6b42a4c887b3afbfaaaa2bc09419
commit 71d45403400bdb18bc6ae5efaf4772f6b847c351
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Tue Jan 20 12:08:06 2009 +0100

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>
---
 autogen.sh                   |    7 ++-----
 configure.in => configure.ac |   13 +++++++------
 2 files changed, 9 insertions(+), 11 deletions(-)
 rename configure.in => configure.ac (91%)

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.in b/configure.ac
similarity index 91%
rename from configure.in
rename to configure.ac
index 141fa7d..4429d5c 100644
--- 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

Re: Ulogd patch series

[Eric Leblond]

[-- Attachment #1: Type: text/plain, Size: 798 bytes --]

Hi,

Le mardi 20 janvier 2009 à 12:16 +0100, Jan Engelhardt a écrit :
> Hi,
> 
> 
> here are a bunch of patches that seemed to come in handy whilst 
> packaging ulogd as rpm.
> 
> Please pull from
> 	git://dev.medozas.de/ulogd master
> 
> to recieve:
> Jan Engelhardt (5):
>       build: compile fix

This one seems to be linked with your distro but the fix is harmless so
I've applied it.

>       Update .gitignore and remove install-sh
>       build: use -avoid-version for modules
>       build: resolve autotools suggestions to use AC_CONFIG_MACRO_DIR
>       build: update configure.ac
> 
> 
> Patches will be posted for review as replies.

All applied.

Thanks Jan.

BR,
-- 
Éric Leblond <eric@inl.fr>
INL, http://www.inl.fr/
NuFW, http://www.nufw.org

[-- Attachment #2: Ceci est une partie de message numériquement signée --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

Re: Ulogd patch series

[Jan Engelhardt]

On Thursday 2009-01-22 14:16, Eric Leblond wrote:
>Le mardi 20 janvier 2009 à 12:16 +0100, Jan Engelhardt a écrit :
>> 
>> here are a bunch of patches that seemed to come in handy whilst 
>> packaging ulogd as rpm.
>> 
>> Please pull from
>> 	git://dev.medozas.de/ulogd master
>> 
>> to recieve:
>> Jan Engelhardt (5):
>>       build: compile fix
>
>This one seems to be linked with your distro but the fix is harmless so
>I've applied it.

Well, one should not really rely on some other header file
including it for you. Such is always a great surprise on,
say, BSD, which seems to have much less inter-header
dependencies. (Though this I tried on glibc 2.9.)
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html