diff options
| author | Ian Lance Taylor <ian@airs.com> | 1996-08-28 17:13:00 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 1996-08-28 17:13:00 +0000 |
| commit | 0cf433d937ce0a56e4f0d17a9fe85017d2fe4d60 (patch) | |
| tree | a36a6cb8116e02aec48e35676cf2ec2bf0fbabae /gdb/configure | |
| parent | 6fce31a64b3f52df9f35510893215f2831533f41 (diff) | |
| download | gdb-0cf433d937ce0a56e4f0d17a9fe85017d2fe4d60.zip gdb-0cf433d937ce0a56e4f0d17a9fe85017d2fe4d60.tar.gz gdb-0cf433d937ce0a56e4f0d17a9fe85017d2fe4d60.tar.bz2 | |
* configure.in: If CY_AC_PATH_TCLCONFIG can't find TCL, don't run
CY_AC_LOAD_TCLCONFIG.
* configure: Rebuild.
Diffstat (limited to 'gdb/configure')
| -rwxr-xr-x | gdb/configure | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/gdb/configure b/gdb/configure index 78f603d..70ec00d 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 -#line 2409 "configure" +#line 2410 "configure" #include "confdefs.h" #include <tclInt.h> 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 -#line 2541 "configure" +#line 2542 "configure" #include "confdefs.h" #include <tk.h> 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 |