summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/syslog-ng/files/0004-configure.ac-add-libnet-enable-option.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support/syslog-ng/files/0004-configure.ac-add-libnet-enable-option.patch')
-rw-r--r--meta-oe/recipes-support/syslog-ng/files/0004-configure.ac-add-libnet-enable-option.patch77
1 files changed, 77 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/files/0004-configure.ac-add-libnet-enable-option.patch b/meta-oe/recipes-support/syslog-ng/files/0004-configure.ac-add-libnet-enable-option.patch
new file mode 100644
index 0000000000..c9eec65e87
--- /dev/null
+++ b/meta-oe/recipes-support/syslog-ng/files/0004-configure.ac-add-libnet-enable-option.patch
@@ -0,0 +1,77 @@
1From 57b509adfb7c62bbf55ea1709aac3383cab660fa Mon Sep 17 00:00:00 2001
2From: Ming Liu <ming.liu@windriver.com>
3Date: Thu, 17 Jul 2014 05:37:08 -0400
4Subject: [PATCH] configure.ac: add libnet enable option
5
6This would avoid a implicit auto-detecting result
7
8Signed-off-by: Ming Liu <ming.liu@windriver.com>
9Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
10
11Update for 3.24.1.
12Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
13
14Set it to default yes
15
16Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/3650]
17
18Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
19---
20 configure.ac | 35 ++++++++++++++++++++---------------
21 1 file changed, 20 insertions(+), 15 deletions(-)
22
23diff --git a/configure.ac b/configure.ac
24index 7aad75f..d575cba 100644
25--- a/configure.ac
26+++ b/configure.ac
27@@ -144,6 +144,9 @@ AC_CONFIG_HEADERS(config.h)
28 dnl ***************************************************************************
29 dnl Arguments
30
31+AC_ARG_ENABLE(libnet,
32+ [ --enable-libnet Enable libnet support (default: yes)],, enable_libnet="yes")
33+
34 AC_ARG_WITH(libnet,
35 [ --with-libnet=path use path to libnet-config script],
36 ,
37@@ -1073,23 +1076,25 @@ dnl ***************************************************************************
38 dnl libnet headers/libraries
39 dnl ***************************************************************************
40 AC_MSG_CHECKING(for LIBNET)
41-if test "x$with_libnet" = "x"; then
42- LIBNET_CONFIG="`which libnet-config`"
43-else
44- LIBNET_CONFIG="$with_libnet/libnet-config"
45-fi
46+if test "x$enable_libnet" = xyes; then
47+ if test "x$with_libnet" = "x"; then
48+ LIBNET_CONFIG="`which libnet-config`"
49+ else
50+ LIBNET_CONFIG="$with_libnet/libnet-config"
51+ fi
52
53-if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then
54- LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`"
55- LIBNET_LIBS="`$LIBNET_CONFIG --libs`"
56- AC_MSG_RESULT(yes)
57-dnl libnet-config does not provide the _DEFAULT_SOURCE define, that can cause warning during build
58-dnl as upstream libnet-config does uses _DEFAULT_SOURCE this is just a fix till
59- LIBNET_CFLAGS="$LIBNET_CFLAGS -D_DEFAULT_SOURCE"
60+ if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then
61+ LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`"
62+ LIBNET_LIBS="`$LIBNET_CONFIG --libs`"
63+ AC_MSG_RESULT(yes)
64+ dnl libnet-config does not provide the _DEFAULT_SOURCE define, that can cause warning during build
65+ dnl as upstream libnet-config does uses _DEFAULT_SOURCE this is just a fix till
66+ LIBNET_CFLAGS="$LIBNET_CFLAGS -D_DEFAULT_SOURCE"
67
68-else
69- LIBNET_LIBS=
70- AC_MSG_RESULT(no)
71+ else
72+ LIBNET_LIBS=
73+ AC_MSG_RESULT(no)
74+ fi
75 fi
76
77