From: Joel Brobecker Date: Tue, 24 Mar 2009 01:19:27 +0000 (+0000) Subject: Provide a way to force building of GDB with libcurses. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cb01cfba2cd4edd8533f948d8dbf78027a6507a7;p=binutils-gdb.git Provide a way to force building of GDB with libcurses. * configure.ac: Add --with-curses. * configure: Regenerated. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8a6a934d0de..cf0b12365e6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2009-03-23 Jerome Guitton + + Provide a way to force building of GDB with libcurses. + * configure.ac: Add --with-curses. + * configure: Regenerated. + 2009-03-23 Tom Tromey * dwarf2expr.c (execute_stack_op) : Fix typo in diff --git a/gdb/configure b/gdb/configure index 87eef71130f..0a6eed4e912 100755 --- a/gdb/configure +++ b/gdb/configure @@ -883,6 +883,8 @@ Optional Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-separate-debug-dir=path Look for global separate debug info in this path LIBDIR/debug --with-libunwind Use libunwind frame unwinding support + --with-curses use the curses library instead of the termcap + library --with-pkgversion=PKG Use PKG in the version string in place of "GDB" --with-bugurl=URL Direct users to URL to report a bug --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib @@ -8115,6 +8117,18 @@ _ACEOF CONFIG_SRCS="$CONFIG_SRCS libunwind-frame.c" fi +opt_curses=no + +# Check whether --with-curses or --without-curses was given. +if test "${with_curses+set}" = set; then + withval="$with_curses" + opt_curses=$withval +fi; + +if test "$opt_curses" = "yes"; then + prefer_curses=yes +fi + # Profiling support. # Check whether --enable-profiling or --disable-profiling was given. if test "${enable_profiling+set}" = set; then @@ -10308,20 +10322,21 @@ echo "$as_me: error: Building GDB with TUI mode is not supported on this host" > ;; esac -# Check whether we should enable the TUI, but only do so if we really -# can. -if test x"$enable_tui" != xno; then - if test -d $srcdir/tui; then - # For the TUI, we need enhanced curses functionality. - # - # FIXME: kettenis/20040905: We prefer ncurses over the vendor-supplied - # curses library because the latter might not provide all the - # functionality we need. However, this leads to problems on systems - # where the linker searches /usr/local/lib, but the compiler doesn't - # search /usr/local/include, if ncurses is installed in /usr/local. A - # default installation of ncurses on alpha*-dec-osf* will lead to such - # a situation. - echo "$as_me:$LINENO: checking for library containing waddstr" >&5 +# For the TUI, we need enhanced curses functionality. +if test x"$enable_tui" = xyes; then + prefer_curses=yes +fi + +curses_found=no +if test x"$prefer_curses" = xyes; then + # FIXME: kettenis/20040905: We prefer ncurses over the vendor-supplied + # curses library because the latter might not provide all the + # functionality we need. However, this leads to problems on systems + # where the linker searches /usr/local/lib, but the compiler doesn't + # search /usr/local/include, if ncurses is installed in /usr/local. A + # default installation of ncurses on alpha*-dec-osf* will lead to such + # a situation. + echo "$as_me:$LINENO: checking for library containing waddstr" >&5 echo $ECHO_N "checking for library containing waddstr... $ECHO_C" >&6 if test "${ac_cv_search_waddstr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10448,7 +10463,16 @@ if test "$ac_cv_search_waddstr" != no; then fi - if test "$ac_cv_search_waddstr" != no; then + if test "$ac_cv_search_waddstr" != no; then + curses_found=yes + fi +fi + +# Check whether we should enable the TUI, but only do so if we really +# can. +if test x"$enable_tui" != xno; then + if test -d $srcdir/tui; then + if test "$curses_found" != no; then CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_TUI_OBS)" CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_TUI_DEPS)" CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_TUI_SRCS)" diff --git a/gdb/configure.ac b/gdb/configure.ac index afc006d4e46..6e97ef1e416 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -331,6 +331,13 @@ if test x"$enable_libunwind" = xyes; then CONFIG_SRCS="$CONFIG_SRCS libunwind-frame.c" fi +opt_curses=no +AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses], [use the curses library instead of the termcap library]), opt_curses=$withval) + +if test "$opt_curses" = "yes"; then + prefer_curses=yes +fi + # Profiling support. AC_ARG_ENABLE(profiling, [ --enable-profiling enable profiling of GDB], @@ -459,22 +466,32 @@ case $host_os in ;; esac +# For the TUI, we need enhanced curses functionality. +if test x"$enable_tui" = xyes; then + prefer_curses=yes +fi + +curses_found=no +if test x"$prefer_curses" = xyes; then + # FIXME: kettenis/20040905: We prefer ncurses over the vendor-supplied + # curses library because the latter might not provide all the + # functionality we need. However, this leads to problems on systems + # where the linker searches /usr/local/lib, but the compiler doesn't + # search /usr/local/include, if ncurses is installed in /usr/local. A + # default installation of ncurses on alpha*-dec-osf* will lead to such + # a situation. + AC_SEARCH_LIBS(waddstr, [ncurses cursesX curses]) + + if test "$ac_cv_search_waddstr" != no; then + curses_found=yes + fi +fi + # Check whether we should enable the TUI, but only do so if we really # can. if test x"$enable_tui" != xno; then if test -d $srcdir/tui; then - # For the TUI, we need enhanced curses functionality. - # - # FIXME: kettenis/20040905: We prefer ncurses over the vendor-supplied - # curses library because the latter might not provide all the - # functionality we need. However, this leads to problems on systems - # where the linker searches /usr/local/lib, but the compiler doesn't - # search /usr/local/include, if ncurses is installed in /usr/local. A - # default installation of ncurses on alpha*-dec-osf* will lead to such - # a situation. - AC_SEARCH_LIBS(waddstr, [ncurses cursesX curses]) - - if test "$ac_cv_search_waddstr" != no; then + if test "$curses_found" != no; then CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_TUI_OBS)" CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_TUI_DEPS)" CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_TUI_SRCS)"