[pushed master+7.12] gdb/configure --help: suggest --disable-build-with-cxx instead of --enable...

[Pedro Alves <palves at redhat dot com>]

We build by default with a C++ compiler, but "configure --help" still
says "--enable-build-with-cxx", which hints that it is by default
disabled.  Update the --help text.

gdb/ChangeLog:
2016-08-05  Pedro Alves  <palves@redhat.com>

	* build-with-cxx.m4: Change help string to be in terms of
	--disable-build-with-cxx.
	* configure: Regenerate.

gdb/gdbserver/ChangeLog:
2016-08-05  Pedro Alves  <palves@redhat.com>

	* configure: Regenerate.
---
 gdb/ChangeLog           | 6 ++++++
 gdb/gdbserver/ChangeLog | 4 ++++
 gdb/build-with-cxx.m4   | 2 +-
 gdb/configure           | 3 ++-
 gdb/gdbserver/configure | 3 ++-
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1e14dfd..e153168 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2016-08-05  Pedro Alves  <palves@redhat.com>
+
+	* build-with-cxx.m4: Change help string to be in terms of
+	--disable-build-with-cxx.
+	* configure: Regenerate.
+
 2016-08-04  Yao Qi  <yao.qi@linaro.org>
 
 	* aarch64-linux-nat.c (tdesc_arm_with_vfpv3): Remove the
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 13562e0..c147a1d 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2016-08-05  Pedro Alves  <palves@redhat.com>
+
+	* configure: Regenerate.
+
 2016-08-04  Yao Qi  <yao.qi@linaro.org>
 
 	* linux-low.c (regsets_fetch_inferior_registers): Check
diff --git a/gdb/build-with-cxx.m4 b/gdb/build-with-cxx.m4
index 6077278..58caa8a 100644
--- a/gdb/build-with-cxx.m4
+++ b/gdb/build-with-cxx.m4
@@ -22,7 +22,7 @@ dnl allowing a user to build with a C++ compiler.
 AC_DEFUN([GDB_AC_BUILD_WITH_CXX],
 [
   AC_ARG_ENABLE(build-with-cxx,
-  AS_HELP_STRING([--enable-build-with-cxx], [build with C++ compiler instead of C compiler]),
+  AS_HELP_STRING([--disable-build-with-cxx], [build with C compiler instead of C++ compiler]),
     [case $enableval in
       yes | no)
 	  ;;
diff --git a/gdb/configure b/gdb/configure
index 067f86e..8f92ed9 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -1503,7 +1503,8 @@ Optional Features:
 			  (and sometimes confusing) to the casual installer
   --enable-plugins        Enable support for plugins
   --disable-largefile     omit support for large files
-  --enable-build-with-cxx build with C++ compiler instead of C compiler
+  --disable-build-with-cxx
+                          build with C compiler instead of C++ compiler
   --enable-targets=TARGETS
                           alternative target configurations
   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
index 2926deb..80fa1f3 100755
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -1339,7 +1339,8 @@ Optional Features:
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
   --disable-largefile     omit support for large files
-  --enable-build-with-cxx build with C++ compiler instead of C compiler
+  --disable-build-with-cxx
+                          build with C compiler instead of C++ compiler
   --enable-libmcheck      Try linking with -lmcheck if available
   --enable-werror         treat compile warnings as errors
   --enable-build-warnings enable build-time compiler warnings if gcc is used
-- 
2.5.5