diff options
author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-10-25 12:03:27 +0200 |
---|---|---|
committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-10-25 12:03:27 +0200 |
commit | f2a0643f55af5ac826c65706ee133dd251bccd05 (patch) | |
tree | 3461e620e6ebfd5b7d46c98628a13f8530e8b3a9 | |
parent | 0d32c5c070f817229110f92d7b31df9a3e4eeec5 (diff) |
Rollback to fix commit history
-rw-r--r-- | .gitignore | 20 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rwxr-xr-x | autogen.sh | 19 | ||||
-rw-r--r-- | configure.ac | 40 | ||||
-rw-r--r-- | lib/Makefile.am | 4 | ||||
-rw-r--r-- | src/.gitignore | 1 |
6 files changed, 33 insertions, 53 deletions
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 9f6660e..0000000 --- a/.gitignore +++ /dev/null @@ -1,20 +0,0 @@ -*~ -*.la -*.lo -*.o -.deps -.libs -Makefile -Makefile.in - -/aclocal.m4 -/autom4te.cache -/compile -/config.* -/configure -/depcomp -/install-sh -/libtool -/ltmain.sh -/missing -/stamp-h1 diff --git a/Makefile.am b/Makefile.am index c68544a..2ddb5c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,5 @@ ## Process this file with automake to produce Makefile.in -ACLOCAL_AMFLAGS = -I m4 - include $(top_srcdir)/Make_global.am if ! WITH_KBUILDDIR @@ -1,5 +1,18 @@ #!/bin/sh -mkdir -p m4 -autoreconf -fi -rm -rf autom4te.cache +run () +{ + echo "running: $*" + eval $* + + if test $? != 0 ; then + echo "error: while running '$*'" + exit 1 + fi +} + +run aclocal +run autoheader +run libtoolize -f +run automake -a +run autoconf diff --git a/configure.ac b/configure.ac index 38164cf..7622ac4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,8 @@ dnl Boilerplate AC_INIT([ipset], [5.0], [kadlec@blackhole.kfki.hu]) -AC_CANONICAL_TARGET -AC_CONFIG_MACRO_DIR([m4]) +AC_CANONICAL_SYSTEM AC_CONFIG_HEADER([config.h]) -AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) +AM_INIT_AUTOMAKE([-Wall -Werror foreign]) dnl Shortcut: Linux supported alone case $target in @@ -13,14 +12,10 @@ esac dnl Additional arguments dnl Kernel build directory or source tree -AC_ARG_WITH([kbuild], - AS_HELP_STRING([--with-kbuild=PATH], - [Path to kernel build directory]), - [KBUILDDIR="$withval";]) -AC_ARG_WITH([ksource], - AS_HELP_STRING([--with-ksource=PATH], - [Path to kernel source directory, if not the same as the kernel build directory]), - [KSOURCEDIR="$withval";]) +AC_ARG_WITH([kernel], + AS_HELP_STRING([--with-kernel=PATH], + [Path to kernel source/build directory]), + [KBUILDDIR="$withval";]) AM_CONDITIONAL(WITH_KBUILDDIR, test "$KBUILDDIR" != "") AC_SUBST(KBUILDDIR) @@ -32,16 +27,9 @@ else kbuilddir="/lib/modules/`uname -r`/build" fi -if test -n "$KSOURCEDIR"; then - ksourcedir="$KSOURCEDIR" -elif test -e "$kbuilddir/include/linux/netfilter/nfnetlink.h"; then - ksourcedir="$kbuilddir" -else - ksourcedir="/lib/modules/$(uname -r)/source" -fi -if test ! -e "$ksourcedir/include/linux/netfilter/nfnetlink.h" +if test ! -e "$kbuilddir/include/linux/netfilter/nfnetlink.h" then - AC_MSG_ERROR([Invalid kernel source directory $ksourcedir]) + AC_MSG_ERROR([Invalid kernel build directory $kbuilddir]) fi if test ! -e "$kbuilddir/.config" @@ -57,11 +45,11 @@ then fi dnl Check kernel dependencies: nfnetlink.h -NFNL_CB_CONST="`./check_const $ksourcedir/include/linux/netfilter/nfnetlink.h`" +NFNL_CB_CONST="`./check_const $kbuilddir/include/linux/netfilter/nfnetlink.h`" AC_SUBST(NFNL_CB_CONST) dnl Check kernel dependencies: netlink.h -NETLINK_DUMP_CONST="`./check_const $ksourcedir/include/linux/netlink.h`" +NETLINK_DUMP_CONST="`./check_const $kbuilddir/include/linux/netlink.h`" AC_SUBST(NETLINK_DUMP_CONST) dnl Maximal number of sets supported by the kernel, default 256 @@ -110,13 +98,15 @@ AM_CONDITIONAL([DISABLE_EXTRA_FLAGS], [test "x$extra_flags" = xno]) dnl Checks for programs AC_PROG_CC -AM_PROG_CC_C_O -LT_INIT +AC_PROG_LIBTOOL AC_PROG_INSTALL AC_PROG_LN_S dnl Checks for libraries -PKG_CHECK_MODULES([libmnl], [libmnl >= 1]) +AC_CHECK_LIB([mnl], [mnl_socket_open]) +if test x"${ac_cv_lib_mnl_mnl_socket_open}" = xno; then + AC_MSG_ERROR(libmnl not found) +fi dnl Checks for header files diff --git a/lib/Makefile.am b/lib/Makefile.am index 7913877..2d3df03 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,11 +1,11 @@ include $(top_srcdir)/Make_global.am -AM_CFLAGS += ${libmnl_CFLAGS} +AM_CFLAGS += -fPIC +LIBS = lib_LTLIBRARIES = libipset.la libipset_la_LDFLAGS = -version-info $(LIBVERSION) -libipset_la_LIBADD = ${libmnl_LIBS} libipset_la_SOURCES = \ data.c \ icmp.c \ diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 6166aba..0000000 --- a/src/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/ipset |