* libnetfilter_conntrack: build system cleanup
@ 2010-10-30 22:08 Jan Engelhardt
2010-10-30 22:08 ` [PATCH 1/7] build: set Libs.private for pkgconfig file Jan Engelhardt
` (7 more replies)
0 siblings, 8 replies; 11+ messages in thread
From: Jan Engelhardt @ 2010-10-30 22:08 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
The following changes since commit f52f7122c72515b21472e72f99b5fd7c0060dc87:
conntrack: fix independent metadata checkings in XML output (2010-10-28 16:56:42 +0200)
are available in the git repository at:
git://dev.medozas.de/libnetfilter_conntrack master
Jan Engelhardt (7):
build: set Libs.private for pkgconfig file
build: use sh -e, remove autom4te.cache
build: remove statements without effect
build: remove unused $(all_includes)
build: remove -fPIC flag
build: no need for error message in PKG_CHECK_MODULES
Update .gitignore
Make_global.am | 2 +-
Makefile.am | 4 ----
autogen.sh | 3 ++-
configure.ac | 13 -------------
libnetfilter_conntrack.pc.in | 1 +
qa/.gitignore | 2 ++
src/Makefile.am | 6 +++---
src/conntrack/Makefile.am | 3 +--
src/expect/Makefile.am | 3 +--
utils/.gitignore | 18 ++++++++++++++++++
10 files changed, 29 insertions(+), 26 deletions(-)
create mode 100644 qa/.gitignore
create mode 100644 utils/.gitignore
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 1/7] build: set Libs.private for pkgconfig file 2010-10-30 22:08 libnetfilter_conntrack: build system cleanup Jan Engelhardt @ 2010-10-30 22:08 ` Jan Engelhardt 2010-10-30 22:08 ` [PATCH 2/7] build: use sh -e, remove autom4te.cache Jan Engelhardt ` (6 subsequent siblings) 7 siblings, 0 replies; 11+ messages in thread From: Jan Engelhardt @ 2010-10-30 22:08 UTC (permalink / raw) To: pablo; +Cc: netfilter-devel Similar to the commit in iptables, add Libs.private to tell about dependencies for static linking. Signed-off-by: Jan Engelhardt <jengelh@medozas.de> --- libnetfilter_conntrack.pc.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libnetfilter_conntrack.pc.in b/libnetfilter_conntrack.pc.in index e706c0a..857f993 100644 --- a/libnetfilter_conntrack.pc.in +++ b/libnetfilter_conntrack.pc.in @@ -12,4 +12,5 @@ Version: @VERSION@ Requires: libnfnetlink Conflicts: Libs: -L${libdir} -lnetfilter_conntrack +Libs.private: @LIBNFNETLINK_LIBS@ Cflags: -I${includedir} -- 1.7.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/7] build: use sh -e, remove autom4te.cache 2010-10-30 22:08 libnetfilter_conntrack: build system cleanup Jan Engelhardt 2010-10-30 22:08 ` [PATCH 1/7] build: set Libs.private for pkgconfig file Jan Engelhardt @ 2010-10-30 22:08 ` Jan Engelhardt 2010-10-30 22:08 ` [PATCH 3/7] build: remove statements without effect Jan Engelhardt ` (5 subsequent siblings) 7 siblings, 0 replies; 11+ messages in thread From: Jan Engelhardt @ 2010-10-30 22:08 UTC (permalink / raw) To: pablo; +Cc: netfilter-devel sh -e (-x) will provide the same functionality as the run function previously. Signed-off-by: Jan Engelhardt <jengelh@medozas.de> --- autogen.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/autogen.sh b/autogen.sh index 4989ed9..3b111ce 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e include () { @@ -35,3 +35,4 @@ run () [ "x$1" = "xdistrib" ] && include autoreconf -fi +rm -Rf autom4te.cache -- 1.7.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/7] build: remove statements without effect 2010-10-30 22:08 libnetfilter_conntrack: build system cleanup Jan Engelhardt 2010-10-30 22:08 ` [PATCH 1/7] build: set Libs.private for pkgconfig file Jan Engelhardt 2010-10-30 22:08 ` [PATCH 2/7] build: use sh -e, remove autom4te.cache Jan Engelhardt @ 2010-10-30 22:08 ` Jan Engelhardt 2010-10-30 22:08 ` [PATCH 4/7] build: remove unused $(all_includes) Jan Engelhardt ` (4 subsequent siblings) 7 siblings, 0 replies; 11+ messages in thread From: Jan Engelhardt @ 2010-10-30 22:08 UTC (permalink / raw) To: pablo; +Cc: netfilter-devel Signed-off-by: Jan Engelhardt <jengelh@medozas.de> --- Makefile.am | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3878a8d..ac90888 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,3 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libnetfilter_conntrack.pc EXTRA_DIST = Make_global.am - -$(OBJECTS): libtool -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck -- 1.7.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/7] build: remove unused $(all_includes) 2010-10-30 22:08 libnetfilter_conntrack: build system cleanup Jan Engelhardt ` (2 preceding siblings ...) 2010-10-30 22:08 ` [PATCH 3/7] build: remove statements without effect Jan Engelhardt @ 2010-10-30 22:08 ` Jan Engelhardt 2010-10-30 22:08 ` [PATCH 5/7] build: remove -fPIC flag Jan Engelhardt ` (3 subsequent siblings) 7 siblings, 0 replies; 11+ messages in thread From: Jan Engelhardt @ 2010-10-30 22:08 UTC (permalink / raw) To: pablo; +Cc: netfilter-devel Signed-off-by: Jan Engelhardt <jengelh@medozas.de> --- Make_global.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Make_global.am b/Make_global.am index 0ef055e..955a626 100644 --- a/Make_global.am +++ b/Make_global.am @@ -4,4 +4,4 @@ # http://sources.redhat.com/autobook/autobook/autobook_91.html LIBVERSION=3:2:0 -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -- 1.7.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 5/7] build: remove -fPIC flag 2010-10-30 22:08 libnetfilter_conntrack: build system cleanup Jan Engelhardt ` (3 preceding siblings ...) 2010-10-30 22:08 ` [PATCH 4/7] build: remove unused $(all_includes) Jan Engelhardt @ 2010-10-30 22:08 ` Jan Engelhardt 2010-10-30 22:08 ` [PATCH 6/7] build: no need for error message in PKG_CHECK_MODULES Jan Engelhardt ` (2 subsequent siblings) 7 siblings, 0 replies; 11+ messages in thread From: Jan Engelhardt @ 2010-10-30 22:08 UTC (permalink / raw) To: pablo; +Cc: netfilter-devel libtool automatically adds PIC flags as needed. Signed-off-by: Jan Engelhardt <jengelh@medozas.de> --- src/Makefile.am | 2 +- src/conntrack/Makefile.am | 2 +- src/expect/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 96446fb..7816f07 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,7 @@ include $(top_srcdir)/Make_global.am SUBDIRS=conntrack expect -AM_CFLAGS = -fPIC -Wall +AM_CFLAGS = -Wall LIBS = @LIBNFCONNTRACK_LIBS@ lib_LTLIBRARIES = libnetfilter_conntrack.la diff --git a/src/conntrack/Makefile.am b/src/conntrack/Makefile.am index d989d10..51d03c0 100644 --- a/src/conntrack/Makefile.am +++ b/src/conntrack/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Make_global.am -AM_CFLAGS = -fPIC -Wall +AM_CFLAGS = -Wall LIBS = @LIBNFCONNTRACK_LIBS@ noinst_LTLIBRARIES = libnfconntrack.la diff --git a/src/expect/Makefile.am b/src/expect/Makefile.am index b54e564..719ed23 100644 --- a/src/expect/Makefile.am +++ b/src/expect/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Make_global.am -AM_CFLAGS = -fPIC -Wall +AM_CFLAGS = -Wall LIBS = @LIBNFCONNTRACK_LIBS@ noinst_LTLIBRARIES = libnfexpect.la -- 1.7.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 6/7] build: no need for error message in PKG_CHECK_MODULES 2010-10-30 22:08 libnetfilter_conntrack: build system cleanup Jan Engelhardt ` (4 preceding siblings ...) 2010-10-30 22:08 ` [PATCH 5/7] build: remove -fPIC flag Jan Engelhardt @ 2010-10-30 22:08 ` Jan Engelhardt 2010-10-30 22:08 ` [PATCH 7/7] Update .gitignore Jan Engelhardt 2010-11-01 21:30 ` libnetfilter_conntrack: build system cleanup Pablo Neira Ayuso 7 siblings, 0 replies; 11+ messages in thread From: Jan Engelhardt @ 2010-10-30 22:08 UTC (permalink / raw) To: pablo; +Cc: netfilter-devel PKG_CHECK_MODULES already produces its own (and more verbose) messsage when a module cannot be found. Mucking around with CFLAGS and LIBS is also not needed since pkgconfig takes care of providing variables, so let's use them in Makefile.am. Signed-off-by: Jan Engelhardt <jengelh@medozas.de> --- configure.ac | 13 ------------- src/Makefile.am | 6 +++--- src/conntrack/Makefile.am | 3 +-- src/expect/Makefile.am | 3 +-- 4 files changed, 5 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index d5b65af..429f0a7 100644 --- a/configure.ac +++ b/configure.ac @@ -19,14 +19,6 @@ case "$host" in esac dnl Dependencies -AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes) -if test "x$HAVE_PKG_CONFIG" = "x" -then - echo "*** Error: No suitable pkg-config found. ***" - echo " Please install the 'pkg-config' package." - exit 1 -fi - PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.0]) AC_CHECK_HEADERS(arpa/inet.h) @@ -69,11 +61,6 @@ if test ! -z "$libdir"; then CFLAGS="$CFLAGS -DLIBNETFILTER_CONNTRACK_DIR=$MODULE_DIR" fi -CFLAGS="$CFLAGS $LIBNFNETLINK_CFLAGS" -LIBNFCONNTRACK_LIBS="$LIBNFNETLINK_LIBS" - -AC_SUBST(LIBNFCONNTRACK_LIBS) - dnl Output the makefile AC_OUTPUT(Makefile src/Makefile include/Makefile utils/Makefile qa/Makefile include/libnetfilter_conntrack/Makefile include/internal/Makefile src/conntrack/Makefile src/expect/Makefile libnetfilter_conntrack.pc doxygen.cfg) diff --git a/src/Makefile.am b/src/Makefile.am index 7816f07..2e9ccd0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,13 +6,13 @@ include $(top_srcdir)/Make_global.am SUBDIRS=conntrack expect -AM_CFLAGS = -Wall -LIBS = @LIBNFCONNTRACK_LIBS@ +AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS} lib_LTLIBRARIES = libnetfilter_conntrack.la libnetfilter_conntrack_la_LIBADD = conntrack/libnfconntrack.la \ - expect/libnfexpect.la + expect/libnfexpect.la \ + ${LIBNFNETLINK_LIBS} libnetfilter_conntrack_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink -ldl \ -version-info $(LIBVERSION) libnetfilter_conntrack_la_SOURCES = main.c diff --git a/src/conntrack/Makefile.am b/src/conntrack/Makefile.am index 51d03c0..68c2d72 100644 --- a/src/conntrack/Makefile.am +++ b/src/conntrack/Makefile.am @@ -1,7 +1,6 @@ include $(top_srcdir)/Make_global.am -AM_CFLAGS = -Wall -LIBS = @LIBNFCONNTRACK_LIBS@ +AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS} noinst_LTLIBRARIES = libnfconntrack.la diff --git a/src/expect/Makefile.am b/src/expect/Makefile.am index 719ed23..b0404ba 100644 --- a/src/expect/Makefile.am +++ b/src/expect/Makefile.am @@ -1,7 +1,6 @@ include $(top_srcdir)/Make_global.am -AM_CFLAGS = -Wall -LIBS = @LIBNFCONNTRACK_LIBS@ +AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS} noinst_LTLIBRARIES = libnfexpect.la -- 1.7.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 7/7] Update .gitignore 2010-10-30 22:08 libnetfilter_conntrack: build system cleanup Jan Engelhardt ` (5 preceding siblings ...) 2010-10-30 22:08 ` [PATCH 6/7] build: no need for error message in PKG_CHECK_MODULES Jan Engelhardt @ 2010-10-30 22:08 ` Jan Engelhardt 2010-11-01 21:30 ` libnetfilter_conntrack: build system cleanup Pablo Neira Ayuso 7 siblings, 0 replies; 11+ messages in thread From: Jan Engelhardt @ 2010-10-30 22:08 UTC (permalink / raw) To: pablo; +Cc: netfilter-devel --- qa/.gitignore | 2 ++ utils/.gitignore | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) create mode 100644 qa/.gitignore create mode 100644 utils/.gitignore diff --git a/qa/.gitignore b/qa/.gitignore new file mode 100644 index 0000000..c6d43bb --- /dev/null +++ b/qa/.gitignore @@ -0,0 +1,2 @@ +/test_api +/test_filter diff --git a/utils/.gitignore b/utils/.gitignore new file mode 100644 index 0000000..7dd7bb8 --- /dev/null +++ b/utils/.gitignore @@ -0,0 +1,18 @@ +/conntrack_create +/conntrack_create_nat +/conntrack_delete +/conntrack_dump +/conntrack_events +/conntrack_filter +/conntrack_flush +/conntrack_get +/conntrack_grp_create +/conntrack_master +/conntrack_update +/expect_create +/expect_create_userspace +/expect_delete +/expect_dump +/expect_events +/expect_flush +/expect_get -- 1.7.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: libnetfilter_conntrack: build system cleanup 2010-10-30 22:08 libnetfilter_conntrack: build system cleanup Jan Engelhardt ` (6 preceding siblings ...) 2010-10-30 22:08 ` [PATCH 7/7] Update .gitignore Jan Engelhardt @ 2010-11-01 21:30 ` Pablo Neira Ayuso 7 siblings, 0 replies; 11+ messages in thread From: Pablo Neira Ayuso @ 2010-11-01 21:30 UTC (permalink / raw) To: Jan Engelhardt; +Cc: netfilter-devel On 31/10/10 00:08, Jan Engelhardt wrote: > The following changes since commit f52f7122c72515b21472e72f99b5fd7c0060dc87: > > conntrack: fix independent metadata checkings in XML output (2010-10-28 16:56:42 +0200) > > are available in the git repository at: > git://dev.medozas.de/libnetfilter_conntrack master pulled and pushed, thanks ^ permalink raw reply [flat|nested] 11+ messages in thread
* conntrack-tools: build system cleanups
@ 2010-10-30 22:49 Jan Engelhardt
2010-10-30 22:49 ` [PATCH 6/7] build: no need for error message in PKG_CHECK_MODULES Jan Engelhardt
0 siblings, 1 reply; 11+ messages in thread
From: Jan Engelhardt @ 2010-10-30 22:49 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
The following changes since commit 31ae56a2af1381459e4ec38c31ab810ffa410cf9:
conntrack: allow to listen to all kind of expectation events (2010-10-12 12:56:01 +0200)
are available in the git repository at:
git://dev.medozas.de/conntrack-tools master
Jan Engelhardt (7):
build: use autoconf-suggested naming of files
build: use modern call syntax for AM_INIT_AUTOMAKE
build: drop unused $(all_includes)
build: remove statements without effect
build: remove unused $(all_libraries)
build: no need for error message in PKG_CHECK_MODULES
Add .gitignore files
.gitignore | 18 ++++++++++++++++++
Make_global.am | 5 +++--
Makefile.am | 7 -------
configure.in => configure.ac | 31 +++++--------------------------
src/.gitignore | 6 ++++++
src/Makefile.am | 5 ++---
6 files changed, 34 insertions(+), 38 deletions(-)
create mode 100644 .gitignore
rename configure.in => configure.ac (75%)
create mode 100644 src/.gitignore
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 6/7] build: no need for error message in PKG_CHECK_MODULES 2010-10-30 22:49 conntrack-tools: build system cleanups Jan Engelhardt @ 2010-10-30 22:49 ` Jan Engelhardt 0 siblings, 0 replies; 11+ messages in thread From: Jan Engelhardt @ 2010-10-30 22:49 UTC (permalink / raw) To: pablo; +Cc: netfilter-devel PKG_CHECK_MODULES already produces its own (and more verbose) messsage when a module cannot be found. Mucking around with CFLAGS and LIBS is also not needed since pkgconfig takes care of providing variables, so let's use them in Makefile.am. Signed-off-by: Jan Engelhardt <jengelh@medozas.de> --- Make_global.am | 3 ++- configure.ac | 25 ++----------------------- src/Makefile.am | 5 ++--- 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/Make_global.am b/Make_global.am index 4e9794e..e8f603a 100644 --- a/Make_global.am +++ b/Make_global.am @@ -2,4 +2,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = -std=gnu99 -W -Wall \ -Wmissing-prototypes -Wwrite-strings -Wcast-qual -Wfloat-equal -Wshadow -Wpointer-arith -Wbad-function-cast -Wsign-compare -Waggregate-return -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wstrict-prototypes -Wundef \ - -Wno-unused-parameter + -Wno-unused-parameter ${LIBNFNETLINK_CFLAGS} \ + ${LIBNETFILTER_CONNTRACK_CFLAGS} diff --git a/configure.ac b/configure.ac index e068798..37fbeee 100644 --- a/configure.ac +++ b/configure.ac @@ -18,22 +18,8 @@ case "$host" in esac dnl Dependencies -LIBNFNETLINK_REQUIRED=1.0.0 -LIBNETFILTER_CONNTRACK_REQUIRED=0.0.102 - -AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes) -if test "x$HAVE_PKG_CONFIG" = "x" -then - echo "*** Error: No suitable pkg-config found. ***" - echo " Please install the 'pkg-config' package." - exit 1 -fi - -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([LIBNFNETLINK], [libnfnetlink >= 1.0.0]) +PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 0.0.102]) AC_CHECK_PROGS(XYACC,$YACC bison yacc,none) if test "$XYACC" = "none" @@ -72,9 +58,6 @@ AC_CHECK_HEADERS([linux/capability.h],, [AC_MSG_ERROR([Cannot find linux/capabib dnl AC_CHECK_LIB([c], [main]) # FIXME: Replace `main' with a function in `-ldl': -AC_CHECK_LIB([nfnetlink], [nfnl_query] ,,,[-lnfnetlink]) -AC_CHECK_LIB([netfilter_conntrack], [nfct_query] ,,,[-lnetfilter_conntrack]) - AC_CHECK_HEADERS(arpa/inet.h) dnl check for inet_pton AC_CHECK_FUNCS(inet_pton) @@ -127,9 +110,5 @@ dnl debug/src/Makefile dnl extensions/Makefile dnl src/Makefile]) -CFLAGS="$CFLAGS $LIBNETFILTER_CONNTRACK_CFLAGS" - -AC_SUBST(LIBNETFILTER_CONNTRACK_LIBS) - AC_CONFIG_FILES([Makefile src/Makefile include/Makefile extensions/Makefile]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index 0e9af2e..a85a56f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,8 +7,7 @@ CLEANFILES = read_config_yy.c read_config_lex.c sbin_PROGRAMS = conntrack conntrackd conntrack_SOURCES = conntrack.c -conntrack_LDADD = ../extensions/libct_proto_tcp.la ../extensions/libct_proto_udp.la ../extensions/libct_proto_udplite.la ../extensions/libct_proto_icmp.la ../extensions/libct_proto_icmpv6.la ../extensions/libct_proto_sctp.la ../extensions/libct_proto_dccp.la ../extensions/libct_proto_gre.la ../extensions/libct_proto_unknown.la -conntrack_LDFLAGS = @LIBNETFILTER_CONNTRACK_LIBS@ +conntrack_LDADD = ../extensions/libct_proto_tcp.la ../extensions/libct_proto_udp.la ../extensions/libct_proto_udplite.la ../extensions/libct_proto_icmp.la ../extensions/libct_proto_icmpv6.la ../extensions/libct_proto_sctp.la ../extensions/libct_proto_dccp.la ../extensions/libct_proto_gre.la ../extensions/libct_proto_unknown.la ${LIBNETFILTER_CONNTRACK_LIBS} conntrackd_SOURCES = alarm.c main.c run.c hash.c queue.c rbtree.c \ local.c log.c mcast.c udp.c netlink.c vector.c \ @@ -28,6 +27,6 @@ conntrackd_SOURCES = alarm.c main.c run.c hash.c queue.c rbtree.c \ # yacc and lex generate dirty code read_config_yy.o read_config_lex.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-declarations -Wno-implicit-function-declaration -Wno-nested-externs -Wno-undef -Wno-redundant-decls -conntrackd_LDFLAGS = @LIBNETFILTER_CONNTRACK_LIBS@ +conntrackd_LDADD = ${LIBNETFILTER_CONNTRACK_LIBS} EXTRA_DIST = read_config_yy.h -- 1.7.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* libnetfilter_conntrack autotools updates
@ 2010-09-08 23:32 Jan Engelhardt
2010-09-08 23:32 ` [PATCH 6/7] build: no need for error message in PKG_CHECK_MODULES Jan Engelhardt
0 siblings, 1 reply; 11+ messages in thread
From: Jan Engelhardt @ 2010-09-08 23:32 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
Hi Pablo,
I have here a few commits that update the autotools files to resolve
autotools warnings, use more "modern" constructs, and to shorten them
a little. There is also a gitignore added. Please consider applying.
fatal: The remote end hung up unexpectedly
warn: No branch of git://dev.medozas.de/libnetfilter_conntrack is at:
warn: a9f46ea: Add .gitignore
warn: Are you sure you pushed master there?
The following changes since commit 107d52d3e6bf116314321e6ed7acf2a2cd1c6b34:
build: bump version to 0.9.0 (2010-09-08 11:16:57 +0200)
are available in the git repository at:
git://dev.medozas.de/libnetfilter_conntrack ..BRANCH.NOT.VERIFIED..
Jan Engelhardt (7):
build: use autoconf-suggested naming of files
build: use modern call syntax for AC_INIT, AM_INIT_AUTOMAKE
build: avoid use of deprecated INCLUDES
build: use simpler autoreconf in autogen
build: run AC_CANONICAL_HOST only
build: no need for error message in PKG_CHECK_MODULES
Add .gitignore
.gitignore | 20 ++++++++++++++++++++
Make_global.am | 2 +-
Makefile.am | 2 --
autogen.sh | 6 +-----
configure.in => configure.ac | 13 +++++--------
5 files changed, 27 insertions(+), 16 deletions(-)
create mode 100644 .gitignore
rename configure.in => configure.ac (87%)
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 6/7] build: no need for error message in PKG_CHECK_MODULES 2010-09-08 23:32 libnetfilter_conntrack autotools updates Jan Engelhardt @ 2010-09-08 23:32 ` Jan Engelhardt 0 siblings, 0 replies; 11+ messages in thread From: Jan Engelhardt @ 2010-09-08 23:32 UTC (permalink / raw) To: pablo; +Cc: netfilter-devel PKG_CHECK_MODULES already produces its own (and more verbose) messsage when a module cannot be found. Signed-off-by: Jan Engelhardt <jengelh@medozas.de> --- configure.ac | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index fe5b6fa..d5b65af 100644 --- a/configure.ac +++ b/configure.ac @@ -19,8 +19,6 @@ case "$host" in esac dnl Dependencies -LIBNFNETLINK_REQUIRED=1.0.0 - AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes) if test "x$HAVE_PKG_CONFIG" = "x" then @@ -29,8 +27,7 @@ then exit 1 fi -PKG_CHECK_MODULES(LIBNFNETLINK, libnfnetlink >= $LIBNFNETLINK_REQUIRED,, - AC_MSG_ERROR(Cannot find libnfnetlink >= $LIBNFNETLINK_REQUIRED)) +PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.0]) AC_CHECK_HEADERS(arpa/inet.h) dnl Check for inet_ntop -- 1.7.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2010-11-01 21:30 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-10-30 22:08 libnetfilter_conntrack: build system cleanup Jan Engelhardt 2010-10-30 22:08 ` [PATCH 1/7] build: set Libs.private for pkgconfig file Jan Engelhardt 2010-10-30 22:08 ` [PATCH 2/7] build: use sh -e, remove autom4te.cache Jan Engelhardt 2010-10-30 22:08 ` [PATCH 3/7] build: remove statements without effect Jan Engelhardt 2010-10-30 22:08 ` [PATCH 4/7] build: remove unused $(all_includes) Jan Engelhardt 2010-10-30 22:08 ` [PATCH 5/7] build: remove -fPIC flag Jan Engelhardt 2010-10-30 22:08 ` [PATCH 6/7] build: no need for error message in PKG_CHECK_MODULES Jan Engelhardt 2010-10-30 22:08 ` [PATCH 7/7] Update .gitignore Jan Engelhardt 2010-11-01 21:30 ` libnetfilter_conntrack: build system cleanup Pablo Neira Ayuso -- strict thread matches above, loose matches on Subject: below -- 2010-10-30 22:49 conntrack-tools: build system cleanups Jan Engelhardt 2010-10-30 22:49 ` [PATCH 6/7] build: no need for error message in PKG_CHECK_MODULES Jan Engelhardt 2010-09-08 23:32 libnetfilter_conntrack autotools updates Jan Engelhardt 2010-09-08 23:32 ` [PATCH 6/7] build: no need for error message in PKG_CHECK_MODULES Jan Engelhardt
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).