mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-10 23:12:48 +00:00
61 lines
1.8 KiB
Diff
61 lines
1.8 KiB
Diff
From 3c30c8b6fd2ea715eb4bdaa5a6d4e1623f28834c Mon Sep 17 00:00:00 2001
|
|
From: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
Date: Sun, 14 Dec 2014 21:04:49 +0100
|
|
Subject: [PATCH 1/3] build: restore --disable-debug
|
|
|
|
Fix fallout from the automake conversion. Display after configuration
|
|
if it is enabled or not.
|
|
|
|
Reported-by: Steven Barth <cyrus@openwrt.org>
|
|
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
---
|
|
configure.ac | 10 ++++++----
|
|
src/Makefile.am | 5 ++++-
|
|
2 files changed, 10 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 1525ac4..b55b2b1 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -24,9 +24,10 @@ AC_DEFINE([_STDC_FORMAT_MACROS], [], [printf-style format macros])
|
|
|
|
AC_ARG_ENABLE([debug],
|
|
AS_HELP_STRING([--enable-debug], [Enable debugging]),
|
|
- [CONFIG_DEBUG="$(echo $enableval | cut -b1)"],
|
|
- [CONFIG_DEBUG="y"])
|
|
-AC_SUBST([CONFIG_DEBUG])
|
|
+ [with_debug=no],
|
|
+ [with_debug=yes])
|
|
+AC_SUBST(with_debug)
|
|
+AM_CONDITIONAL([BUILD_DEBUG], [test "x$with_debug" != xno])
|
|
|
|
# Checks for programs.
|
|
AC_PROG_CC
|
|
@@ -128,4 +129,5 @@ AC_OUTPUT
|
|
|
|
echo "
|
|
nft configuration:
|
|
- cli support: ${with_cli}"
|
|
+ cli support: ${with_cli}
|
|
+ enable debugging: ${with_debug}"
|
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
index d53c347..378424d 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -3,8 +3,11 @@ sbin_PROGRAMS = nft
|
|
CLEANFILES = scanner.c parser_bison.c
|
|
|
|
AM_CPPFLAGS = -I$(top_srcdir)/include
|
|
-AM_CPPFLAGS += -DDEFAULT_INCLUDE_PATH="\"${sysconfdir}\"" -DDEBUG \
|
|
+AM_CPPFLAGS += -DDEFAULT_INCLUDE_PATH="\"${sysconfdir}\"" \
|
|
${LIBMNL_CFLAGS} ${LIBNFTNL_CFLAGS}
|
|
+if BUILD_DEBUG
|
|
+AM_CPPFLAGS += -g -DDEBUG
|
|
+endif
|
|
|
|
AM_CFLAGS = -Wall \
|
|
-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations \
|
|
--
|
|
2.1.3
|
|
|