Subject: [PATCH] add libnet enable option

Upstream-Status: Pending

This would avoid a implicit auto-detecting result.

Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 configure.ac |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

Index: syslog-ng-3.8.1/configure.ac
===================================================================
--- syslog-ng-3.8.1.orig/configure.ac
+++ syslog-ng-3.8.1/configure.ac
@@ -104,6 +104,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],
    ,
@@ -893,22 +896,26 @@ 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)
+        else
+                AC_MSG_ERROR([Could not find libnet, and libnet support was explicitly enabled.])
+        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)
 else
         LIBNET_LIBS=
         AC_MSG_RESULT(no)
 fi
 
-
 if test "x$enable_spoof_source" = "xauto"; then
 	AC_MSG_CHECKING(whether to enable spoof source support)
         if test "x$LIBNET_LIBS" != "x"; then
