aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch
blob: 755803c213f921019de589965e1e3c14a8c9c022 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
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(-)

diff --git a/configure.ac b/configure.ac
index b1e18b4..8e13025 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,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],
    ,
@@ -768,22 +771,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
-- 
1.7.1