diff --git a/configure b/configure
index af62e80aab..18ddc8f140 100755
--- a/configure
+++ b/configure
@@ -16138,7 +16138,7 @@ $as_echo "no" >&6; }
 	fi
 	case "$host" in
 	*-hp-hpux*)
-		CFLAGS="-Wl,+vnocompatwarnings $CFLAGS"
+		STD_CWARNINGS="$STD_CWARNINGS -Wl,+vnocompatwarnings"
 		;;
 	esac
 else
@@ -16166,7 +16166,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*)
@@ -19941,7 +19941,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 884a6fff7f..20cca2f1e1 100644
--- a/configure.in
+++ b/configure.in
@@ -1816,7 +1816,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
@@ -1844,7 +1844,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*)
@@ -3802,7 +3802,7 @@ if test "$dlopen" = "yes"; then
 		*-hp-hpux*)
 			SO=sl
 			SO_CFLAGS="+z"
-			SO_LDFLAGS="-b"
+			SO_LDFLAGS="-b +vnocompatwarnings"
 			SO_LD="ld"
 			;;
 		*)