From 44ffbd6e4a0906754d44e02fba59ae07ab3c41aa Mon Sep 17 00:00:00 2001 From: Jim Ingham Date: Mon, 14 Dec 1998 21:45:38 +0000 Subject: [PATCH] Mon Dec 14 13:20:50 1998 Jim Ingham * Makefile.in, configure.in configure - add support for LIBGUI outside the IDE context. --- gdb/ChangeLog-gdbtk | 6 +++++- gdb/configure | 43 ++++++++++++++++++++++++------------------- gdb/configure.in | 5 +++++ 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/gdb/ChangeLog-gdbtk b/gdb/ChangeLog-gdbtk index 469a3c69bd..5947a990ae 100644 --- a/gdb/ChangeLog-gdbtk +++ b/gdb/ChangeLog-gdbtk @@ -1,3 +1,7 @@ +Mon Dec 14 13:20:50 1998 Jim Ingham + * Makefile.in, configure.in configure - add support for LIBGUI + outside the IDE context. + Thu Nov 19 13:14:57 1998 Geoffrey Noer * gdbtk-cmds.c: Can't start using new API names yet. Switch back @@ -14,7 +18,7 @@ Fri Nov 13 00:15:08 1998 Geoffrey Noer checking DISPLAY should be for _WIN32, not WINNT. * gdbtk.h: pick GDBTK_PATH_SEP based on _WIN32, not WINNT. * gdbtk-cmds.c (gdb_path_conv): lose "32" from cygwin_ func call, - change ifdef to __CYGWIN__ instead of WINNT. + change ifdef to __CYGWIN32__ instead of WINNT. * {gdbtk.c, gdbtk-hooks.c}: __CYGWIN32__ refs drop the "32". Thu Nov 12 15:20:15 1998 Jim Ingham diff --git a/gdb/configure b/gdb/configure index 3f1d2c8e2e..a2847924ff 100755 --- a/gdb/configure +++ b/gdb/configure @@ -4839,8 +4839,10 @@ if test "$FOUNDRY_LIB_BASE" != ""; then LIBIDE="${FOUNDRY_LIB_BASE}/lib/libide.a" IDE_DEPS="${FOUNDRY_LIB_BASE}/lib/libilu-Tk.a ${FOUNDRY_LIB_BASE}/lib/libilu-c.a ${FOUNDRY_LIB_BASE}/lib/libilu.a" else +# end-sanitize-ide LIBGUI="../libgui/src/libgui.a" GUI_CFLAGS_X="-I${srcdir}/../libgui/src" +# start-sanitize-ide if test x$enable_ide = xyes; then IDE_CFLAGS_X="-I${srcdir}/../libidetcl/src -I${srcdir}/../libide/src -DIDE -I${srcdir}/../ilu/runtime/mainloop" IDE_X="-L../ilu/runtime/mainloop -lilu-Tk -L../ilu/runtime/c -lilu-c -L../ilu/runtime/kernel -lilu" @@ -4852,8 +4854,11 @@ else IDE_DEPS="../ilu/runtime/mainloop/libilu-Tk.a ../ilu/runtime/c/libilu-c.a ../ilu/runtime/kernel/libilu.a" fi +# end-sanitize-ide +# start-sanitize-ide + @@ -4897,12 +4902,12 @@ fi # In the Cygwin environment, we need some additional flags. echo $ac_n "checking for cygwin""... $ac_c" 1>&6 -echo "configure:4901: checking for cygwin" >&5 +echo "configure:4906: checking for cygwin" >&5 if eval "test \"`echo '$''{'gdb_cv_os_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:4965: checking for Tcl configuration" >&5 +echo "configure:4970: checking for Tcl configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5069,7 +5074,7 @@ if test "${with_tkconfig+set}" = set; then fi echo $ac_n "checking for Tk configuration""... $ac_c" 1>&6 -echo "configure:5073: checking for Tk configuration" >&5 +echo "configure:5078: checking for Tk configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5165,7 +5170,7 @@ fi no_tcl=true echo $ac_n "checking for Tcl private headers. dir=${configdir}""... $ac_c" 1>&6 -echo "configure:5169: checking for Tcl private headers. dir=${configdir}" >&5 +echo "configure:5174: checking for Tcl private headers. dir=${configdir}" >&5 # Check whether --with-tclinclude or --without-tclinclude was given. if test "${with_tclinclude+set}" = set; then withval="$with_tclinclude" @@ -5231,17 +5236,17 @@ fi if test x"${ac_cv_c_tclh}" = x ; then ac_safe=`echo "tclInt.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tclInt.h""... $ac_c" 1>&6 -echo "configure:5235: checking for tclInt.h" >&5 +echo "configure:5240: checking for tclInt.h" >&5 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:5245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5250: \"$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* @@ -5301,7 +5306,7 @@ fi # no_tk=true echo $ac_n "checking for Tk private headers""... $ac_c" 1>&6 -echo "configure:5305: checking for Tk private headers" >&5 +echo "configure:5310: checking for Tk private headers" >&5 # Check whether --with-tkinclude or --without-tkinclude was given. if test "${with_tkinclude+set}" = set; then withval="$with_tkinclude" @@ -5367,17 +5372,17 @@ fi if test x"${ac_cv_c_tkh}" = x ; then ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tk.h""... $ac_c" 1>&6 -echo "configure:5371: checking for tk.h" >&5 +echo "configure:5376: checking for tk.h" >&5 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:5381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5386: \"$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* @@ -5423,7 +5428,7 @@ fi echo $ac_n "checking for Itcl private headers. srcdir=${srcdir}""... $ac_c" 1>&6 -echo "configure:5427: checking for Itcl private headers. srcdir=${srcdir}" >&5 +echo "configure:5432: checking for Itcl private headers. srcdir=${srcdir}" >&5 if test x"${ac_cv_c_itclh}" = x ; then for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ; do if test -f $i/src/itcl.h ; then @@ -5446,7 +5451,7 @@ fi echo $ac_n "checking for Tix private headers. srcdir=${srcdir}""... $ac_c" 1>&6 -echo "configure:5450: checking for Tix private headers. srcdir=${srcdir}" >&5 +echo "configure:5455: checking for Tix private headers. srcdir=${srcdir}" >&5 if test x"${ac_cv_c_tixh}" = x ; then for i in ${srcdir}/../tix ${srcdir}/../../tix ${srcdir}/../../../tix ; do if test -f $i/generic/tix.h ; then @@ -5540,7 +5545,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:5544: checking for X" >&5 +echo "configure:5549: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -5602,12 +5607,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:5611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5616: \"$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* @@ -5676,14 +5681,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:5692: \"$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. diff --git a/gdb/configure.in b/gdb/configure.in index 9bb69ced96..3f00da9462 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -494,8 +494,10 @@ if test "$FOUNDRY_LIB_BASE" != ""; then LIBIDE="${FOUNDRY_LIB_BASE}/lib/libide.a" IDE_DEPS="${FOUNDRY_LIB_BASE}/lib/libilu-Tk.a ${FOUNDRY_LIB_BASE}/lib/libilu-c.a ${FOUNDRY_LIB_BASE}/lib/libilu.a" else +# end-sanitize-ide LIBGUI="../libgui/src/libgui.a" GUI_CFLAGS_X="-I${srcdir}/../libgui/src" +# start-sanitize-ide if test x$enable_ide = xyes; then IDE_CFLAGS_X="-I${srcdir}/../libidetcl/src -I${srcdir}/../libide/src -DIDE -I${srcdir}/../ilu/runtime/mainloop" IDE_X="-L../ilu/runtime/mainloop -lilu-Tk -L../ilu/runtime/c -lilu-c -L../ilu/runtime/kernel -lilu" @@ -506,8 +508,11 @@ else LIBIDE="../libide/src/libide.a" IDE_DEPS="../ilu/runtime/mainloop/libilu-Tk.a ../ilu/runtime/c/libilu-c.a ../ilu/runtime/kernel/libilu.a" fi + +# end-sanitize-ide AC_SUBST(LIBGUI) AC_SUBST(GUI_CFLAGS_X) +# start-sanitize-ide AC_SUBST(IDE_CFLAGS_X) AC_SUBST(IDE_X) AC_SUBST(LIBIDETCL)