From 7a13a704fe324c5457d4586f33eefcc85d5da7a4 Mon Sep 17 00:00:00 2001 From: Fred Fish Date: Sun, 30 Jul 1995 01:15:54 +0000 Subject: [PATCH] Fix problem with configure script when run on systems where native shell is bash or ksh, which handles "... $(TCL) ..." by trying to run TCL. Changed configure.in and regenerated configure, including two lines apparently inserted by custom cygnus version of autoconf 2.4. --- gdb/configure | 21 +++++++++++---------- gdb/configure.in | 3 ++- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/gdb/configure b/gdb/configure index 39018c432a2..cf06eff792a 100755 --- a/gdb/configure +++ b/gdb/configure @@ -943,7 +943,7 @@ test -z "$x_direct_test_library" && x_direct_test_library=Xt test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h cat > conftest.$ac_ext < EOF @@ -1006,7 +1006,7 @@ rm -f conftest* ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&6 else cat > conftest.$ac_ext < EOF @@ -1437,7 +1437,7 @@ 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 @@ -1508,7 +1508,8 @@ fi ENABLE_GDBTK=1 - ENABLE_CLIBS="${ENABLE_CLIBS} $(TCL) $(TK) $(X11) -lm" + TCL_LIBS='$(TCL) $(TK) $(X11)' + ENABLE_CLIBS="${ENABLE_CLIBS} ${TCL_LIBS} -lm" ENABLE_OBS="${ENABLE_OBS} gdbtk.o" fi diff --git a/gdb/configure.in b/gdb/configure.in index 3ae03bdabf4..012e584e174 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -52,7 +52,8 @@ if test "${enable_gdbtk}" = "yes"; then CYGNUS_PATH_TCL ENABLE_GDBTK=1 - ENABLE_CLIBS="${ENABLE_CLIBS} $(TCL) $(TK) $(X11) -lm" + TCL_LIBS='$(TCL) $(TK) $(X11)' + ENABLE_CLIBS="${ENABLE_CLIBS} ${TCL_LIBS} -lm" ENABLE_OBS="${ENABLE_OBS} gdbtk.o" fi AC_SUBST(ENABLE_GDBTK) -- 2.30.2