OpenWrt – Blame information for rev 1
?pathlinks?
Rev | Author | Line No. | Line |
---|---|---|---|
1 | office | 1 | From a1b392b4156db984ab2b695a4a70d113f70cb9b8 Mon Sep 17 00:00:00 2001 |
2 | From: Matthieu Crapet <Matthieu.Crapet@ingenico.com> |
||
3 | Date: Wed, 5 Feb 2014 14:18:57 +0100 |
||
4 | Subject: [PATCH 6/6] configure: add --without-ipulog option to disable |
||
5 | libipulog build |
||
6 | |||
7 | This is a compat library used for netfilter ULOG target. |
||
8 | ULOG only works with IPv4. NFLOG has replaced ULOG. |
||
9 | |||
10 | Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> |
||
11 | Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> |
||
12 | --- |
||
13 | configure.ac | 5 +++++ |
||
14 | include/libnetfilter_log/Makefile.am | 5 ++++- |
||
15 | src/Makefile.am | 6 +++++- |
||
16 | utils/Makefile.am | 7 +++++-- |
||
17 | 4 files changed, 19 insertions(+), 4 deletions(-) |
||
18 | |||
19 | diff --git a/configure.ac b/configure.ac |
||
20 | index 189a753..88ff7ab 100644 |
||
21 | --- a/configure.ac |
||
22 | +++ b/configure.ac |
||
23 | @@ -24,6 +24,11 @@ case "$host" in |
||
24 | *) AC_MSG_ERROR([Linux only, dude!]);; |
||
25 | esac |
||
26 | |||
27 | +AC_ARG_WITH([ipulog], |
||
28 | + AC_HELP_STRING([--without-ipulog], [don't build libipulog compat library]), |
||
29 | + [ipulog_skip=1], [ipulog_skip=0]) |
||
30 | +AM_CONDITIONAL([BUILD_IPULOG], [test $ipulog_skip = 0]) |
||
31 | + |
||
32 | dnl Dependencies |
||
33 | PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 0.0.41]) |
||
34 | |||
35 | diff --git a/include/libnetfilter_log/Makefile.am b/include/libnetfilter_log/Makefile.am |
||
36 | index fe934f1..fde1d60 100644 |
||
37 | --- a/include/libnetfilter_log/Makefile.am |
||
38 | +++ b/include/libnetfilter_log/Makefile.am |
||
39 | @@ -1,3 +1,6 @@ |
||
40 | |||
41 | -pkginclude_HEADERS = libnetfilter_log.h libipulog.h linux_nfnetlink_log.h |
||
42 | +pkginclude_HEADERS = libnetfilter_log.h linux_nfnetlink_log.h |
||
43 | |||
44 | +if BUILD_IPULOG |
||
45 | +pkginclude_HEADERS += libipulog.h |
||
46 | +endif |
||
47 | diff --git a/src/Makefile.am b/src/Makefile.am |
||
48 | index 10a66e2..33933a4 100644 |
||
49 | --- a/src/Makefile.am |
||
50 | +++ b/src/Makefile.am |
||
51 | @@ -22,14 +22,18 @@ LIBVERSION=2:0:1 |
||
52 | |||
53 | include ${top_srcdir}/Make_global.am |
||
54 | |||
55 | -lib_LTLIBRARIES = libnetfilter_log.la libnetfilter_log_libipulog.la |
||
56 | +lib_LTLIBRARIES = libnetfilter_log.la |
||
57 | |||
58 | libnetfilter_log_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink \ |
||
59 | -version-info $(LIBVERSION) |
||
60 | libnetfilter_log_la_SOURCES = libnetfilter_log.c |
||
61 | libnetfilter_log_la_LIBADD = ${LIBNFNETLINK_LIBS} |
||
62 | |||
63 | +if BUILD_IPULOG |
||
64 | +lib_LTLIBRARIES += libnetfilter_log_libipulog.la |
||
65 | + |
||
66 | libnetfilter_log_libipulog_la_LDFLAGS = -Wc,-nostartfiles \ |
||
67 | -version-info 1:0:0 |
||
68 | libnetfilter_log_libipulog_la_LIBADD = libnetfilter_log.la |
||
69 | libnetfilter_log_libipulog_la_SOURCES = libipulog_compat.c |
||
70 | +endif |
||
71 | diff --git a/utils/Makefile.am b/utils/Makefile.am |
||
72 | index ae64c90..f961b6c 100644 |
||
73 | --- a/utils/Makefile.am |
||
74 | +++ b/utils/Makefile.am |
||
75 | @@ -1,12 +1,15 @@ |
||
76 | include ${top_srcdir}/Make_global.am |
||
77 | |||
78 | -check_PROGRAMS = nfulnl_test ulog_test |
||
79 | +check_PROGRAMS = nfulnl_test |
||
80 | |||
81 | nfulnl_test_SOURCES = nfulnl_test.c |
||
82 | nfulnl_test_LDADD = ../src/libnetfilter_log.la |
||
83 | nfulnl_test_LDFLAGS = -dynamic |
||
84 | |||
85 | +if BUILD_IPULOG |
||
86 | +check_PROGRAMS += ulog_test |
||
87 | + |
||
88 | ulog_test_SOURCES = ulog_test.c |
||
89 | ulog_test_LDADD = ../src/libnetfilter_log_libipulog.la ../src/libnetfilter_log.la |
||
90 | ulog_test_LDFLAGS = -dynamic |
||
91 | - |
||
92 | +endif |
||
93 | -- |
||
94 | 1.7.10.4 |
||
95 |