From 6270d3f7c92c6751d6d1796262f0e7243709dab4 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 19 Sep 2012 15:33:56 +0000 Subject: [PATCH] Move -Wno-deprecated-declarations from Makefile.in to configure.ac. It's a flag specific to GCC, so shouldn't be set unconditionally. --- nmap-update/Makefile.in | 2 +- nmap-update/configure | 4 +++- nmap-update/configure.ac | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/nmap-update/Makefile.in b/nmap-update/Makefile.in index e70afb3b9..89ff928ca 100644 --- a/nmap-update/Makefile.in +++ b/nmap-update/Makefile.in @@ -6,7 +6,7 @@ bindir = @bindir@ mandir = @mandir@ CC = @CC@ -CFLAGS = @CFLAGS@ -Wno-deprecated-declarations +CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ $(DEFS) -I$(NBASEDIR) LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ $(NBASELIB) diff --git a/nmap-update/configure b/nmap-update/configure index c7e6ce1c3..7f07c21a8 100755 --- a/nmap-update/configure +++ b/nmap-update/configure @@ -3030,7 +3030,9 @@ fi # GCC-specific flags if test -n "$GCC"; then - CFLAGS="$CFLAGS -Wall" + # -Wno-deprecated-declarations is because we use an older version of the + # Subversion API for compatibility. + CFLAGS="$CFLAGS -Wall -Wno-deprecated-declarations" fi diff --git a/nmap-update/configure.ac b/nmap-update/configure.ac index cf6bda418..baac2c4aa 100644 --- a/nmap-update/configure.ac +++ b/nmap-update/configure.ac @@ -14,7 +14,9 @@ AC_PATH_TOOL([STRIP], [strip], [/bin/true]) # GCC-specific flags if test -n "$GCC"; then - CFLAGS="$CFLAGS -Wall" + # -Wno-deprecated-declarations is because we use an older version of the + # Subversion API for compatibility. + CFLAGS="$CFLAGS -Wall -Wno-deprecated-declarations" fi APR_FIND_APR(, , 1, 1)