summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2010-11-01 22:32:35 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2010-11-01 22:32:35 +0100
commitc4692e02d4fc804f7aa31f407d7d2f31861753bc (patch)
tree1f38fbe970c16fb68356e2d94aec0898500b0615
parent81284db9f861f964cc0a5c756a1fa375e586c309 (diff)
parentddd8ea0add4eb4390763d066d0673c6d94dec1f3 (diff)
Merge branch 'master' of git://dev.medozas.de/libnetfilter_queue
-rw-r--r--.gitignore33
-rw-r--r--Makefile.am6
-rwxr-xr-xautogen.sh20
-rw-r--r--configure.ac (renamed from configure.in)18
-rw-r--r--libnetfilter_queue.pc.in1
-rw-r--r--src/Makefile.am6
-rw-r--r--utils/.gitignore1
-rw-r--r--utils/Makefile.am2
8 files changed, 32 insertions, 55 deletions
diff --git a/.gitignore b/.gitignore
index 99e943d..dbd9ac7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,20 @@
-doxygen.cfg
-doxygen
+.deps
+.libs
+Makefile
+Makefile.in
+*.o
+*.la
+*.lo
-config.guess
-config.log
-config.sub
-config.status
-configure
-autom4te.cache
-libtool
-ltmain.sh
-missing
-install-sh
-depcomp
-aclocal.m4
+/aclocal.m4
+/autom4te.cache
+/config.*
+/configure
+/depcomp
+/install-sh
+/libtool
+/ltmain.sh
+/missing
-libnetfilter_queue.pc
+/doxygen.cfg
+/libnetfilter_queue.pc
diff --git a/Makefile.am b/Makefile.am
index 28641f8..576a69b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
-
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = $(man_MANS)
@@ -10,7 +8,3 @@ man_MANS = #nfnetlink_queue.3 nfnetlink_queue.7
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libnetfilter_queue.pc
-
-$(OBJECTS): libtool
-libtool: $(LIBTOOL_DEPS)
- $(SHELL) ./config.status --recheck
diff --git a/autogen.sh b/autogen.sh
index cf697c6..57c3532 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
include ()
{
@@ -34,20 +34,6 @@ include ()
fi
}
-run ()
-{
- echo "running: $*"
- eval $*
-
- if test $? != 0 ; then
- echo "error: while running '$*'"
- exit 1
- fi
-}
-
[ "x$1" = "xdistrib" ] && include
-run libtoolize
-run aclocal
-#run autoheader
-run automake -a
-run autoconf
+autoreconf -fi
+rm -Rf autom4te.cache
diff --git a/configure.in b/configure.ac
index a82c9f1..c4cc36e 100644
--- a/configure.in
+++ b/configure.ac
@@ -1,10 +1,10 @@
dnl Process this file with autoconf to create configure.
-AC_INIT
-AC_CANONICAL_SYSTEM
+AC_INIT([libnetfilter_queue], [1.0.0])
+AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE(libnetfilter_queue, 1.0.0)
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-bzip2 1.6])
AC_PROG_CC
AC_EXEEXT
@@ -13,21 +13,13 @@ AC_PROG_INSTALL
AC_SUBST(LIBTOOL_DEPS)
-case $target in
+case "$host" in
*-*-linux*) ;;
*) AC_MSG_ERROR([Linux only, dude!]);;
esac
dnl Dependencies
-LIBNFNETLINK_REQUIRED=0.0.41
-
-PKG_CHECK_MODULES(LIBNFNETLINK, libnfnetlink >= $LIBNFNETLINK_REQUIRED,,
- AC_MSG_ERROR(Cannot find libnfnetlink >= $LIBNFNETLINK_REQUIRED))
-
-CFLAGS="$CFLAGS $LIBNFNETLINK_CFLAGS"
-LIBNFQUEUE_LIBS="$LIBNFNETLINK_LIBS"
-
-AC_SUBST(LIBNFQUEUE_LIBS)
+PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 0.0.41])
dnl Output the makefiles
AC_OUTPUT(Makefile include/Makefile include/libnetfilter_queue/Makefile src/Makefile utils/Makefile libnetfilter_queue.pc doxygen.cfg)
diff --git a/libnetfilter_queue.pc.in b/libnetfilter_queue.pc.in
index 962c686..9c6c2c4 100644
--- a/libnetfilter_queue.pc.in
+++ b/libnetfilter_queue.pc.in
@@ -12,4 +12,5 @@ Version: @VERSION@
Requires: libnfnetlink
Conflicts:
Libs: -L${libdir} -lnetfilter_queue
+Libs.private: @LIBNFNETLINK_LIBS@
Cflags: -I${includedir}
diff --git a/src/Makefile.am b/src/Makefile.am
index 63d5bc8..a745129 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,12 +20,12 @@
#
LIBVERSION=2:0:1
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR}
-AM_CFLAGS = -fPIC -Wall
-LIBS = @LIBNFQUEUE_LIBS@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I${KERNELDIR}
+AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS}
lib_LTLIBRARIES = libnetfilter_queue.la
libnetfilter_queue_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink \
-version-info $(LIBVERSION)
libnetfilter_queue_la_SOURCES = libnetfilter_queue.c
+libnetfilter_queue_la_LIBADD = ${LIBNFNETLINK_LIBS}
diff --git a/utils/.gitignore b/utils/.gitignore
new file mode 100644
index 0000000..10fe6e9
--- /dev/null
+++ b/utils/.gitignore
@@ -0,0 +1 @@
+/nfqnl_test
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 9a5e9d6..1f52864 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR}
+AM_CPPFLAGS = -I$(top_srcdir)/include -I${KERNELDIR}
check_PROGRAMS = nfqnl_test