0006-configure-add-without-ipulog-option-to-disable-libip.patch 3.0 KB

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