Re: [RFA] Remove --disable-gdbcli and --disable-gdbmi

[Tom Tromey <tom@tromey.com>]

>>>>> "Tom" == Tom Tromey <tom@tromey.com> writes:

Tom> I just stumbled across it.  I will redo it to just remove
Tom> --disable-gdbcli and leave --disable-gdbmi alone.

Like so.

Tom

commit 056dec39ed11e0027ae399018c3fef3a719718b9
Author: Tom Tromey <tom@tromey.com>
Date:   Thu Jun 28 11:19:33 2018 -0600

    Remove --disable-gdbcli
    
    I think it doesn't really make sense to allow building gdb without the
    CLI.  Perhaps at one time this was a goal, but libgdb is long gone and
    the CLI is intrinsic to gdb.
    
    So, this patch removes the implementation of this configure option.
    It is still recognized (this is autoconf's default), but does nothing.
    
    This simplifies configure.ac and Makefile.in a bit.
    
    Tested by rebuilding.
    
    gdb/ChangeLog
    2018-07-17  Tom Tromey  <tom@tromey.com>
    
            * configure.ac: Remove --disable-gdbcli.
            * configure: Rebuild.
            * Makefile.in (SUBDIR_CLI_DEPS, SUBDIR_CLI_LDFLAGS)
            (SUBDIR_CLI_CFLAGS): Remove.
            (SFILES): Use SUBDIR_CLI_SRCS.
            (COMMON_OBS): Use SUBDIR_CLI_OBS.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 01c1a2501db..6f5487c10e8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2018-07-17  Tom Tromey  <tom@tromey.com>
+
+	* configure.ac: Remove --disable-gdbcli.
+	* configure: Rebuild.
+	* Makefile.in (SUBDIR_CLI_DEPS, SUBDIR_CLI_LDFLAGS)
+	(SUBDIR_CLI_CFLAGS): Remove.
+	(SFILES): Use SUBDIR_CLI_SRCS.
+	(COMMON_OBS): Use SUBDIR_CLI_OBS.
+
 2018-07-17  Tom Tromey  <tom@tromey.com>
 
 	PR gdb/18624:
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index b145e5138f4..e68aee250e2 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -253,10 +253,6 @@ SUBDIR_CLI_SRCS = \
 
 SUBDIR_CLI_OBS = $(patsubst %.c,%.o,$(SUBDIR_CLI_SRCS))
 
-SUBDIR_CLI_DEPS =
-SUBDIR_CLI_LDFLAGS =
-SUBDIR_CLI_CFLAGS =
-
 #
 # MI sub directory definitons
 #
@@ -1160,6 +1156,7 @@ SFILES = \
 	symfile-mem.c \
 	ui-file.h \
 	mi/mi-common.c \
+	$(SUBDIR_CLI_SRCS) \
 	$(SUBDIR_TARGET_SRCS) \
 	$(COMMON_SFILES) \
 	$(SUBDIR_GCC_COMPILE_SRCS)
@@ -1557,6 +1554,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
 	version.o \
 	xml-builtin.o \
 	$(patsubst %.c,%.o,$(COMMON_SFILES)) \
+	$(SUBDIR_CLI_OBS) \
 	$(SUBDIR_TARGET_OBS) \
 	$(SUBDIR_GCC_COMPILE_OBS)
 
diff --git a/gdb/NEWS b/gdb/NEWS
index 2b51465495f..76b963e2bc1 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -130,13 +130,16 @@ SH-5/SH64 running OpenBSD 	SH-5/SH64 support in sh*-*-openbsd*
   the tradeoff that there is a possibility of false hits being
   reported.
 
-* New configure options
+* Configure changes
 
 --enable-codesign=CERT
   This can be used to invoke "codesign -s CERT" after building gdb.
   This option is useful on macOS, where code signing is required for
   gdb to work properly.
 
+--disable-gdbcli has been removed
+  This is now silently accepted, but does nothing.
+
 *** Changes in GDB 8.1
 
 * GDB now supports dynamically creating arbitrary register groups specified
diff --git a/gdb/configure b/gdb/configure
index 28756ed9826..3f0a22073d0 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -855,7 +855,6 @@ with_auto_load_dir
 with_auto_load_safe_path
 enable_targets
 enable_64_bit_bfd
-enable_gdbcli
 enable_gdbmi
 enable_tui
 enable_gdbtk
@@ -1547,7 +1546,6 @@ Optional Features:
   --enable-targets=TARGETS
                           alternative target configurations
   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
-  --disable-gdbcli        disable command-line interface (CLI)
   --disable-gdbmi         disable machine-interface (MI)
   --enable-tui            enable full-screen terminal user interface (TUI)
   --enable-gdbtk          enable gdbtk graphical user interface (GUI)
@@ -6755,32 +6753,6 @@ _ACEOF
 
 fi
 
-# The CLI cannot be disabled yet, but may be in the future.
-
-# Enable CLI.
-# Check whether --enable-gdbcli was given.
-if test "${enable_gdbcli+set}" = set; then :
-  enableval=$enable_gdbcli; case $enableval in
-    yes)
-      ;;
-    no)
-      as_fn_error $? "the command-line interface cannot be disabled yet" "$LINENO" 5 ;;
-    *)
-      as_fn_error $? "bad value $enableval for --enable-gdbcli" "$LINENO" 5 ;;
-  esac
-else
-  enable_gdbcli=yes
-fi
-
-if test x"$enable_gdbcli" = xyes; then
-  if test -d $srcdir/cli; then
-    CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_CLI_OBS)"
-    CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_CLI_DEPS)"
-    CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_CLI_SRCS)"
-    ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_CLI_CFLAGS)"
-  fi
-fi
-
 # Enable MI.
 # Check whether --enable-gdbmi was given.
 if test "${enable_gdbmi+set}" = set; then :
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 4c20ea5178d..dfd38a730f4 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -299,29 +299,6 @@ if test "x$targ_defvec" != x; then
     [Define to BFD's default target vector. ])
 fi
 
-# The CLI cannot be disabled yet, but may be in the future.
-
-# Enable CLI.
-AC_ARG_ENABLE(gdbcli,
-AS_HELP_STRING([--disable-gdbcli], [disable command-line interface (CLI)]),
-  [case $enableval in
-    yes)
-      ;;
-    no)
-      AC_MSG_ERROR([the command-line interface cannot be disabled yet]) ;;
-    *)
-      AC_MSG_ERROR([bad value $enableval for --enable-gdbcli]) ;;
-  esac],
-  [enable_gdbcli=yes])
-if test x"$enable_gdbcli" = xyes; then
-  if test -d $srcdir/cli; then
-    CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_CLI_OBS)"
-    CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_CLI_DEPS)"
-    CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_CLI_SRCS)"
-    ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_CLI_CFLAGS)"
-  fi
-fi
-
 # Enable MI.
 AC_ARG_ENABLE(gdbmi,
 AS_HELP_STRING([--disable-gdbmi], [disable machine-interface (MI)]),