Subject: [PATCH] add libnet enable option Upstream-Status: Pending This would avoid a implicit auto-detecting result. Signed-off-by: Ming Liu Signed-off-by: Jackie Huang Update for 3.24.1. Signed-off-by: Zheng Ruoqin --- configure.ac | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 00eb566..e7d5ac1 100644 --- a/configure.ac +++ b/configure.ac @@ -143,6 +143,9 @@ AC_CONFIG_HEADERS(config.h) dnl *************************************************************************** dnl Arguments +AC_ARG_ENABLE(libnet, + [ --enable-libnet Enable libnet support.],, enable_libnet="no") + AC_ARG_WITH(libnet, [ --with-libnet=path use path to libnet-config script], , @@ -1047,19 +1050,20 @@ dnl *************************************************************************** dnl libnet headers/libraries dnl *************************************************************************** AC_MSG_CHECKING(for LIBNET) -if test "x$with_libnet" = "x"; then - LIBNET_CONFIG="`which libnet-config`" -else - LIBNET_CONFIG="$with_libnet/libnet-config" -fi +if test "x$enable_libnet" = xyes; then + if test "x$with_libnet" = "x"; then + LIBNET_CONFIG="`which libnet-config`" + else + LIBNET_CONFIG="$with_libnet/libnet-config" + fi -if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then - LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" - LIBNET_LIBS="`$LIBNET_CONFIG --libs`" - AC_MSG_RESULT(yes) -dnl libnet-config does not provide the _DEFAULT_SOURCE define, that can cause warning during build -dnl as upstream libnet-config does uses _DEFAULT_SOURCE this is just a fix till - LIBNET_CFLAGS="$LIBNET_CFLAGS -D_DEFAULT_SOURCE" + if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then + LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" + LIBNET_LIBS="`$LIBNET_CONFIG --libs`" + AC_MSG_RESULT(yes) + else + AC_MSG_ERROR([Could not find libnet, and libnet support was explicitly enabled.]) + fi else LIBNET_LIBS= -- 2.7.4