From 0cf433d937ce0a56e4f0d17a9fe85017d2fe4d60 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 28 Aug 1996 17:13:00 +0000 Subject: [PATCH] * configure.in: If CY_AC_PATH_TCLCONFIG can't find TCL, don't run CY_AC_LOAD_TCLCONFIG. * configure: Rebuild. --- gdb/ChangeLog | 11 +++++++++++ gdb/configure | 38 ++++++++++++++++++++------------------ gdb/configure.in | 30 ++++++++++++++++-------------- 3 files changed, 47 insertions(+), 32 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8fe14f8c57e..f305afa072c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +Wed Aug 28 13:11:15 1996 Ian Lance Taylor + + * configure.in: If CY_AC_PATH_TCLCONFIG can't find TCL, don't run + CY_AC_LOAD_TCLCONFIG. + * configure: Rebuild. + +Tue Aug 27 12:40:40 1996 Fred Fish + + * infrun.c (wait_for_inferior): Initialize stop_func_end before calling + find_pc_partial_function. + Tue Aug 27 10:17:34 1996 Michael Meissner * configure: Regenerate again. diff --git a/gdb/configure b/gdb/configure index 78f603df834..70ec00d2b07 100755 --- a/gdb/configure +++ b/gdb/configure @@ -2199,7 +2199,8 @@ fi fi fi - + if test -z "${no_tcl}"; then + . $TCLCONFIG @@ -2226,7 +2227,7 @@ fi - + # # Ok, lets find the tk configuration # First, look for one uninstalled. @@ -2307,10 +2308,10 @@ fi - # If $no_tk is nonempty, then we can't do Tk, and there is no - # point to doing Tcl. - if test -z "${no_tk}"; then - + # If $no_tk is nonempty, then we can't do Tk, and there is no + # point to doing Tcl. + if test -z "${no_tk}"; then + if test -f "$TKCONFIG" ; then . $TKCONFIG fi @@ -2326,7 +2327,7 @@ fi - + # # Ok, lets find the tcl source trees so we can use the headers # Warning: transition of version 9 to 10 will break this algorithm @@ -2405,12 +2406,12 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2452,7 +2453,7 @@ fi - + # # Ok, lets find the tk source trees so we can use the headers # If the directory (presumably symlink) named "tk" exists, use that one @@ -2537,12 +2538,12 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2546: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2585,14 +2586,15 @@ fi - # Include some libraries that Tcl and Tk want. - LIBS="$LIBS $TK_LIBS" + # Include some libraries that Tcl and Tk want. + LIBS="$LIBS $TK_LIBS" - ENABLE_GDBTK=1 + ENABLE_GDBTK=1 - TCL_LIBS='$(TCL) $(TK) $(X11_LDFLAGS) $(X11_LIBS)' - ENABLE_CLIBS="${ENABLE_CLIBS} ${TCL_LIBS}" - ENABLE_OBS="${ENABLE_OBS} gdbtk.o" + TCL_LIBS='$(TCL) $(TK) $(X11_LDFLAGS) $(X11_LIBS)' + ENABLE_CLIBS="${ENABLE_CLIBS} ${TCL_LIBS}" + ENABLE_OBS="${ENABLE_OBS} gdbtk.o" + fi fi fi diff --git a/gdb/configure.in b/gdb/configure.in index 5619e7a7397..7c241a12b75 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -234,24 +234,26 @@ case "$host" in if test "${enable_gdbtk}" = "yes"; then CY_AC_PATH_TCLCONFIG - CY_AC_LOAD_TCLCONFIG - CY_AC_PATH_TKCONFIG + if test -z "${no_tcl}"; then + CY_AC_LOAD_TCLCONFIG + CY_AC_PATH_TKCONFIG - # If $no_tk is nonempty, then we can't do Tk, and there is no - # point to doing Tcl. - if test -z "${no_tk}"; then - CY_AC_LOAD_TKCONFIG - CY_AC_PATH_TCLH - CY_AC_PATH_TKH + # If $no_tk is nonempty, then we can't do Tk, and there is no + # point to doing Tcl. + if test -z "${no_tk}"; then + CY_AC_LOAD_TKCONFIG + CY_AC_PATH_TCLH + CY_AC_PATH_TKH - # Include some libraries that Tcl and Tk want. - LIBS="$LIBS $TK_LIBS" + # Include some libraries that Tcl and Tk want. + LIBS="$LIBS $TK_LIBS" - ENABLE_GDBTK=1 + ENABLE_GDBTK=1 - TCL_LIBS='$(TCL) $(TK) $(X11_LDFLAGS) $(X11_LIBS)' - ENABLE_CLIBS="${ENABLE_CLIBS} ${TCL_LIBS}" - ENABLE_OBS="${ENABLE_OBS} gdbtk.o" + TCL_LIBS='$(TCL) $(TK) $(X11_LDFLAGS) $(X11_LIBS)' + ENABLE_CLIBS="${ENABLE_CLIBS} ${TCL_LIBS}" + ENABLE_OBS="${ENABLE_OBS} gdbtk.o" + fi fi fi -- 2.30.2