aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: don't link with libnfnetlink

Browse Source 
Don't link suricata with libnfnetlink when we don't have support
for NFQUEUE or NFLOG. Previously, suricata was linked with this
library without reason.
pull/1351/head
Eric Leblond 10 years ago committed by Victor Julien
parent 20b9849999
commit 5f4b745f92
1 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File

75
configure.ac
Unescape Escape View File

@ -657,44 +657,51 @@
AS_IF([test "x$enable_unixsocket" = "xyes"], [AC_DEFINE([BUILD_UNIX_SOCKET], [1], [Unix socket support enabled])]) AS_IF([test "x$enable_unixsocket" = "xyes"], [AC_DEFINE([BUILD_UNIX_SOCKET], [1], [Unix socket support enabled])])
AC_ARG_ENABLE(nflog,
AS_HELP_STRING([--enable-nflog],[Enable libnetfilter_log support]),
[ enable_nflog="yes"],
[ enable_nflog="no"])
AC_ARG_ENABLE(nfqueue,
AS_HELP_STRING([--enable-nfqueue], [Enable NFQUEUE support for inline IDP]),[enable_nfqueue=yes],[enable_nfqueue=no])
if test "x$enable_nflog" = "xyes" || test "x$enable_nfqueue" = "xyes"; then
# libnfnetlink # libnfnetlink
case $host in case $host in
*-*-mingw32*) *-*-mingw32*)
;; ;;
*) *)
AC_ARG_WITH(libnfnetlink_includes, AC_ARG_WITH(libnfnetlink_includes,
[ --with-libnfnetlink-includes=DIR libnfnetlink include directory], [ --with-libnfnetlink-includes=DIR libnfnetlink include directory],
[with_libnfnetlink_includes="$withval"],[with_libnfnetlink_includes=no]) [with_libnfnetlink_includes="$withval"],[with_libnfnetlink_includes=no])
AC_ARG_WITH(libnfnetlink_libraries, AC_ARG_WITH(libnfnetlink_libraries,
[ --with-libnfnetlink-libraries=DIR libnfnetlink library directory], [ --with-libnfnetlink-libraries=DIR libnfnetlink library directory],
[with_libnfnetlink_libraries="$withval"],[with_libnfnetlink_libraries="no"]) [with_libnfnetlink_libraries="$withval"],[with_libnfnetlink_libraries="no"])
if test "$with_libnfnetlink_includes" != "no"; then if test "$with_libnfnetlink_includes" != "no"; then
CPPFLAGS="${CPPFLAGS} -I${with_libnfnetlink_includes}" CPPFLAGS="${CPPFLAGS} -I${with_libnfnetlink_includes}"
fi fi
if test "$with_libnfnetlink_libraries" != "no"; then if test "$with_libnfnetlink_libraries" != "no"; then
LDFLAGS="${LDFLAGS} -L${with_libnfnetlink_libraries}" LDFLAGS="${LDFLAGS} -L${with_libnfnetlink_libraries}"
fi fi
NFNL="" NFNL=""
AC_CHECK_LIB(nfnetlink, nfnl_fd,, NFNL="no") AC_CHECK_LIB(nfnetlink, nfnl_fd,, NFNL="no")
if test "$NFNL" = "no"; then if test "$NFNL" = "no"; then
echo echo
echo " ERROR! nfnetlink library not found, go get it" echo " ERROR! nfnetlink library not found, go get it"
echo " from www.netfilter.org." echo " from www.netfilter.org."
echo " we automatically append libnetfilter_queue/ when searching" echo " we automatically append libnetfilter_queue/ when searching"
echo " for headers etc. when the --with-libnfnetlink-includes directive" echo " for headers etc. when the --with-libnfnetlink-includes directive"
echo " is used" echo " is used"
echo echo
fi fi
;; ;;
esac esac
fi
#enable support for NFQUEUE #enable support for NFQUEUE
AC_ARG_ENABLE(nfqueue,
AS_HELP_STRING([--enable-nfqueue], [Enable NFQUEUE support for inline IDP]),,[enable_nfqueue=no])
AS_IF([test "x$enable_nfqueue" = "xyes"], [ AS_IF([test "x$enable_nfqueue" = "xyes"], [
CFLAGS="$CFLAGS -DNFQ" CFLAGS="$CFLAGS -DNFQ"
@ -781,10 +788,6 @@
]) ])
# libnetfilter_log # libnetfilter_log
AC_ARG_ENABLE(nflog,
AS_HELP_STRING([--enable-nflog],[Enable libnetfilter_log support]),
[ enable_nflog="yes"],
[ enable_nflog="no"])
AC_ARG_WITH(libnetfilter_log_includes, AC_ARG_WITH(libnetfilter_log_includes,
[ --with-libnetfilter_log-includes=DIR libnetfilter_log include directory], [ --with-libnetfilter_log-includes=DIR libnetfilter_log include directory],
[with_libnetfilter_log_includes="$withval"],[with_libnetfilter_log_includes="no"]) [with_libnetfilter_log_includes="$withval"],[with_libnetfilter_log_includes="no"])

Write Preview
Loading…
Cancel
Save