From 8092e431581c451be66d3822edc11cb251d366ce Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 11 Feb 2014 13:22:27 +1100
Subject: [PATCH] hpux: move -Wl,+vnocompatwarnings to STD_CWARNINGS; add
 +vnocompatwarnings to SO_LDFLAGS

(cherry picked from commit ac49f1c511debb13794488e2bc5429fa68629d28)
---
 configure    | 6 +++---
 configure.in | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 41444c3a80..a6ba504fa9 100755
--- a/configure
+++ b/configure
@@ -15539,7 +15539,7 @@ $as_echo "no" >&6; }
 	fi
 	case "$host" in
 	*-hp-hpux*)
-		CFLAGS="-Wl,+vnocompatwarnings $CFLAGS"
+		STD_CWARNINGS="$STD_CWARNINGS -Wl,+vnocompatwarnings"
 		;;
 	esac
 else
@@ -15567,7 +15567,7 @@ else
 		esac
 		CCOPT="$CCOPT -Ae -z"
 		CCNOOPT="$CCNOOPT -Ae -z"
-		CFLAGS="-Wl,+vnocompatwarnings $CFLAGS"
+		STD_CWARNINGS="$STD_CWARNINGS -Wl,+vnocompatwarnings"
 		MKDEPPROG='cc -Ae -E -Wp,-M >/dev/null 2>>$TMP'
 		;;
 	*-sgi-irix*)
@@ -19382,7 +19382,7 @@ if test "$dlopen" = "yes"; then
 		*-hp-hpux*)
 			SO=sl
 			SO_CFLAGS="+z"
-			SO_LDFLAGS="-b"
+			SO_LDFLAGS="-b +vnocompatwarnings"
 			SO_LD="ld"
 			;;
 		*)
diff --git a/configure.in b/configure.in
index eb34dac94e..2ad18f78c5 100644
--- a/configure.in
+++ b/configure.in
@@ -1524,7 +1524,7 @@ if test "X$GCC" = "Xyes"; then
 	fi
 	case "$host" in
 	*-hp-hpux*)
-		CFLAGS="-Wl,+vnocompatwarnings $CFLAGS"
+		STD_CWARNINGS="$STD_CWARNINGS -Wl,+vnocompatwarnings"
 		;;
 	esac
 else
@@ -1552,7 +1552,7 @@ else
 		esac
 		CCOPT="$CCOPT -Ae -z"
 		CCNOOPT="$CCNOOPT -Ae -z"
-		CFLAGS="-Wl,+vnocompatwarnings $CFLAGS"
+		STD_CWARNINGS="$STD_CWARNINGS -Wl,+vnocompatwarnings"
 		MKDEPPROG='cc -Ae -E -Wp,-M >/dev/null 2>>$TMP'
 		;;
 	*-sgi-irix*)
@@ -3546,7 +3546,7 @@ if test "$dlopen" = "yes"; then
 		*-hp-hpux*)
 			SO=sl
 			SO_CFLAGS="+z"
-			SO_LDFLAGS="-b"
+			SO_LDFLAGS="-b +vnocompatwarnings"
 			SO_LD="ld"
 			;;
 		*)