diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rwxr-xr-x | gdb/configure | 14 | ||||
| -rw-r--r-- | gdb/configure.ac | 12 |
3 files changed, 23 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e13a47a..1cfee74 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2008-06-26 Jan Kratochvil <jan.kratochvil@redhat.com> + + * configure.ac (--enable-tui): AC_MSG_ERROR for explicit --enable-tui. + * configure: Regenerated. + 2008-06-26 Joel Brobecker <brobecker@adacore.com> * dwarf2read.c (read_attribute_value): Treat size attribute diff --git a/gdb/configure b/gdb/configure index ed63c80..b97dd73f 100755 --- a/gdb/configure +++ b/gdb/configure @@ -7573,7 +7573,7 @@ fi if test "${enable_tui+set}" = set; then enableval="$enable_tui" case $enableval in - yes | no) + yes | no | auto) ;; *) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-tui" >&5 @@ -7581,7 +7581,7 @@ echo "$as_me: error: bad value $enableval for --enable-tui" >&2;} { (exit 1); exit 1; }; } ;; esac else - enable_tui=yes + enable_tui=auto fi; # Enable gdbtk. @@ -25292,7 +25292,7 @@ fi # Check whether we should enable the TUI, but only do so if we really # can. -if test x"$enable_tui" = xyes; then +if test x"$enable_tui" != xno; then if test -d $srcdir/tui; then if test "$ac_cv_search_waddstr" != no; then CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_TUI_OBS)" @@ -25305,8 +25305,14 @@ if test x"$enable_tui" = xyes; then CONFIG_INSTALL="${CONFIG_INSTALL} install-tui" CONFIG_UNINSTALL="${CONFIG_UNINSTALL} uninstall-tui" else - { echo "$as_me:$LINENO: WARNING: no enhanced curses library found; disabling TUI" >&5 + if test x"$enable_tui" = xyes; then + { { echo "$as_me:$LINENO: error: no enhanced curses library found; disable TUI" >&5 +echo "$as_me: error: no enhanced curses library found; disable TUI" >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: WARNING: no enhanced curses library found; disabling TUI" >&5 echo "$as_me: WARNING: no enhanced curses library found; disabling TUI" >&2;} + fi fi fi fi diff --git a/gdb/configure.ac b/gdb/configure.ac index 3c203a1..95d5b08 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -267,11 +267,11 @@ fi AC_ARG_ENABLE(tui, [ --enable-tui enable full-screen terminal user interface (TUI)], [case $enableval in - yes | no) + yes | no | auto) ;; *) AC_MSG_ERROR([bad value $enableval for --enable-tui]) ;; - esac],enable_tui=yes) + esac],enable_tui=auto) # Enable gdbtk. AC_ARG_ENABLE(gdbtk, @@ -1578,7 +1578,7 @@ AC_PATH_X # Check whether we should enable the TUI, but only do so if we really # can. -if test x"$enable_tui" = xyes; then +if test x"$enable_tui" != xno; then if test -d $srcdir/tui; then if test "$ac_cv_search_waddstr" != no; then CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_TUI_OBS)" @@ -1591,7 +1591,11 @@ if test x"$enable_tui" = xyes; then CONFIG_INSTALL="${CONFIG_INSTALL} install-tui" CONFIG_UNINSTALL="${CONFIG_UNINSTALL} uninstall-tui" else - AC_MSG_WARN([no enhanced curses library found; disabling TUI]) + if test x"$enable_tui" = xyes; then + AC_MSG_ERROR([no enhanced curses library found; disable TUI]) + else + AC_MSG_WARN([no enhanced curses library found; disabling TUI]) + fi fi fi fi |