mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-15 06:10:02 +00:00
Jackie Huang
1a6e16bcb1
- initscript: add status, PIDFILE and xconsole - syslog-ng.conf: dump the version - Fix some memory leak problems we found - Some backport patches - scl: fix wrong ownership issue - libnet: add libnet enable option and add it in PACKAGECONFIG - add HOMEPAGE - remove INC_PR - change some config into PACKAGECONFIG - add PACKAGE syslog-ng-libs to fix QA issue - use volatiles - inherit update-rc.d and update-alternative Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
67 lines
2.1 KiB
Diff
67 lines
2.1 KiB
Diff
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
|
|
|