From 509b70ac80edcd7f2d489606a3e96423ca8385b7 Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Mon, 29 Jun 1998 19:04:30 +0000 Subject: [PATCH] * main.c (main): Don't include gdbtk test code if GDBTK is not defined by configure. * configure.in: When enabling gdbtk, add "-DGDBTK" to ENABLE_CFLAGS. * configure: Regenerate. --- gdb/ChangeLog-gdbtk | 9 +++++++++ gdb/configure | 33 +++++++++++++++++---------------- gdb/configure.in | 1 + 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/gdb/ChangeLog-gdbtk b/gdb/ChangeLog-gdbtk index 7264fac6a80..3710799c79e 100644 --- a/gdb/ChangeLog-gdbtk +++ b/gdb/ChangeLog-gdbtk @@ -1,3 +1,12 @@ +Mon Jun 29 11:49:17 1998 Keith Seitz + + * main.c (main): Don't include gdbtk test code if GDBTK is + not defined by configure. + + * configure.in: When enabling gdbtk, add "-DGDBTK" to ENABLE_CFLAGS. + + * configure: Regenerate. + Fri Jun 26 13:56:07 1998 Keith Seitz * gdbtk.c: Change all references to static global "interp" to diff --git a/gdb/configure b/gdb/configure index d3212ee2b37..4e6c3e97118 100755 --- a/gdb/configure +++ b/gdb/configure @@ -5197,6 +5197,7 @@ fi fi ENABLE_GDBTK=1 + ENABLE_CFLAGS="${ENABLE_CFLAGS} -DGDBTK" # Include some libraries that Tcl and Tk want. if test "${enable_ide}" = "yes"; then @@ -5237,7 +5238,7 @@ fi # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:5241: checking for X" >&5 +echo "configure:5242: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -5299,12 +5300,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5373,14 +5374,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -5501,7 +5502,7 @@ fi # end-sanitize-sky echo $ac_n "checking for wctype in -lw""... $ac_c" 1>&6 -echo "configure:5505: checking for wctype in -lw" >&5 +echo "configure:5506: checking for wctype in -lw" >&5 ac_lib_var=`echo w'_'wctype | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5509,7 +5510,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5684,7 +5685,7 @@ links="${links} nm.h" fi # start-sanitize-gdbtk echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:5688: checking whether ln -s works" >&5 +echo "configure:5689: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5719,19 +5720,19 @@ fi echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6 -echo "configure:5723: checking for Cygwin32 environment" >&5 +echo "configure:5724: checking for Cygwin32 environment" >&5 if eval "test \"`echo '$''{'am_cv_cygwin32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_cygwin32=yes else @@ -5748,19 +5749,19 @@ echo "$ac_t""$am_cv_cygwin32" 1>&6 CYGWIN32= test "$am_cv_cygwin32" = yes && CYGWIN32=yes echo $ac_n "checking for Mingw32 environment""... $ac_c" 1>&6 -echo "configure:5752: checking for Mingw32 environment" >&5 +echo "configure:5753: checking for Mingw32 environment" >&5 if eval "test \"`echo '$''{'am_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_mingw32=yes else @@ -5779,7 +5780,7 @@ test "$am_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:5783: checking for executable suffix" >&5 +echo "configure:5784: checking for executable suffix" >&5 if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/gdb/configure.in b/gdb/configure.in index d481670aa9c..1bcfc6a6a47 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -409,6 +409,7 @@ if test "${enable_gdbtk}" = "yes"; then fi ENABLE_GDBTK=1 + ENABLE_CFLAGS="${ENABLE_CFLAGS} -DGDBTK" # Include some libraries that Tcl and Tk want. if test "${enable_ide}" = "yes"; then -- 2.30.2