diff options
| author | Tom Tromey <tromey@redhat.com> | 1996-08-02 02:43:27 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 1996-08-02 02:43:27 +0000 |
| commit | 047465fd1b79902bf20b24f220cc0cdde08746c4 (patch) | |
| tree | 40349f944c99dee41a4571f0d8e0d205c0b6e1e8 | |
| parent | 2934d1c9258c32d0eae590e686f13304429a759e (diff) | |
| download | gdb-047465fd1b79902bf20b24f220cc0cdde08746c4.zip gdb-047465fd1b79902bf20b24f220cc0cdde08746c4.tar.gz gdb-047465fd1b79902bf20b24f220cc0cdde08746c4.tar.bz2 | |
changes for new tcl/tk:
* gdbtk.c (mainWindow): Deleted.
(cleanup_init): Don't destroy main window.
(gdbtk_init): Main window now created by Tk_Init.
* configure.in: Most X checks now handled automatically by Tk.
Use new macros to find Tcl/Tk.
* aclocal.m4: New version for new Tcl/Tk; from Don Libes.
* config.in, configure: Regenerated.
* Makefile.in (TCL, TCL_CFLAGS, TK, TK_CFLAGS, X11_CFLAGS,
X11_LDFLAGS, X11_LIBS): Changed for new Tcl and Tk.
| -rw-r--r-- | gdb/ChangeLog | 16 | ||||
| -rw-r--r-- | gdb/Makefile.in | 10 | ||||
| -rw-r--r-- | gdb/aclocal.m4 | 575 | ||||
| -rw-r--r-- | gdb/config.in | 3 | ||||
| -rwxr-xr-x | gdb/configure | 1369 | ||||
| -rw-r--r-- | gdb/configure.in | 88 | ||||
| -rw-r--r-- | gdb/gdbtk.c | 15 |
7 files changed, 564 insertions, 1512 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0ca85b7..9253f6e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,19 @@ +start-sanitize-gdbtk +Thu Aug 1 20:35:01 1996 Tom Tromey <tromey@creche.cygnus.com> + + * gdbtk.c (mainWindow): Deleted. + (cleanup_init): Don't destroy main window. + (gdbtk_init): Main window now created by Tk_Init. + + * configure.in: Most X checks now handled automatically by Tk. + Use new macros to find Tcl/Tk. + * aclocal.m4: New version for new Tcl/Tk; from Don Libes. + * config.in, configure: Regenerated. + + * Makefile.in (TCL, TCL_CFLAGS, TK, TK_CFLAGS, X11_CFLAGS, + X11_LDFLAGS, X11_LIBS): Changed for new Tcl and Tk. + +end-sanitize-gdbtk Thu Aug 1 10:11:34 1996 Fred Fish <fnf@cygnus.com> * config/mips/tm-mips.h (TM_MIPS_H): Enclose file contents in diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 02f7b16..4fd66a6d 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -129,16 +129,16 @@ SIM = #start-sanitize-gdbtk # Where is the TCL library? Typically in ../tcl. -TCL = @TCLLIB@ +TCL = @TCL_BUILD_LIB_SPEC@ TCL_CFLAGS = @TCLHDIR@ # Where is the TK library? Typically in ../tk. -TK = @TKLIB@ +TK = @TK_BUILD_LIB_SPEC@ TK_CFLAGS = @TKHDIR@ -X11_CFLAGS = @X_CFLAGS@ $(X11_EXTRA_CFLAGS) -X11_LDFLAGS = @X_LDFLAGS@ -X11_LIBS = @X_LIBS@ $(X11_EXTRA_LIBS) +X11_CFLAGS = @TK_XINCLUDES@ +X11_LDFLAGS = +X11_LIBS = ENABLE_GDBTK= @ENABLE_GDBTK@ #end-sanitize-gdbtk diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4 index c754fdc..5cfd7d4 100644 --- a/gdb/aclocal.m4 +++ b/gdb/aclocal.m4 @@ -1,14 +1,13 @@ -dnl This file is duplicated in four places: -dnl * gdb/aclocal.m4 -dnl * gdb/testsuite/aclocal.m4 -dnl * expect/aclocal.m4 -dnl * dejagnu/aclocal.m4 -dnl Consider modifying all copies in parallel. dnl written by Rob Savoye <rob@cygnus.com> for Cygnus Support +dnl major rewriting for Tcl 7.5 by Don Libes <libes@nist.gov> + +dnl CY_AC_PATH_TCLCONFIG and CY_AC_LOAD_TCLCONFIG should be invoked +dnl (in that order) before any other TCL macros. Similarly for TK. + dnl CYGNUS LOCAL: This gets the right posix flag for gcc AC_DEFUN(CY_AC_TCL_LYNX_POSIX, [AC_REQUIRE([AC_PROG_CC])AC_REQUIRE([AC_PROG_CPP]) -AC_MSG_CHECKING([to see if this is LynxOS]) +AC_MSG_CHECKING([if running LynxOS]) AC_CACHE_VAL(ac_cv_os_lynx, [AC_EGREP_CPP(yes, [/* @@ -41,6 +40,30 @@ if test "$ac_cv_os_lynx" = "yes" ; then fi ]) +# +# Sometimes the native compiler is a bogus stub for gcc or /usr/ucb/cc. This +# makes configure think it's cross compiling. If --target wasn't used, then +# we can't configure, so something is wrong. We don't use the cache +# here cause if somebody fixes their compiler install, we want this to work. +AC_DEFUN(CY_AC_C_WORKS, +[# If we cannot compile and link a trivial program, we can't expect anything to work +AC_MSG_CHECKING(whether the compiler ($CC) actually works) +AC_TRY_COMPILE(, [/* don't need anything here */], + c_compiles=yes, c_compiles=no) + +AC_TRY_LINK(, [/* don't need anything here */], + c_links=yes, c_links=no) + +if test x"${c_compiles}" = x"no" ; then + AC_MSG_ERROR(the native compiler is broken and won't compile.) +fi + +if test x"${c_links}" = x"no" ; then + AC_MSG_ERROR(the native compiler is broken and won't link.) +fi +AC_MSG_RESULT(yes) +]) + AC_DEFUN(CY_AC_PATH_TCLH, [ # # Ok, lets find the tcl source trees so we can use the headers @@ -57,28 +80,33 @@ AC_CACHE_VAL(ac_cv_c_tclh,[ if test x"${with_tclinclude}" != x ; then if test -f ${with_tclinclude}/tclInt.h ; then ac_cv_c_tclh=`(cd ${with_tclinclude}; pwd)` + elif test -f ${with_tclinclude}/generic/tclInt.h ; then + ac_cv_c_tclh=`(cd ${with_tclinclude}/generic; pwd)` else AC_MSG_ERROR([${with_tclinclude} directory doesn't contain private headers]) fi fi + +# next check if it came with Tcl configuration file +if test x"${ac_cv_c_tclconfig}" = x ; then + if test -f $ac_cv_c_tclconfig/../generic/tclInt.h ; then + ac_cv_c_tclh=`(cd $ac_cv_c_tclconfig/..; pwd)` + fi +fi + # next check in private source directory # # since ls returns lowest version numbers first, reverse its output if test x"${ac_cv_c_tclh}" = x ; then for i in \ ${srcdir}/../tcl \ - `ls -dr ${srcdir}/../tcl[[0-9]]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tcl[[7-9]]* 2>/dev/null` \ ${srcdir}/../../tcl \ - `ls -dr ${srcdir}/../../tcl[[0-9]]* 2>/dev/null` \ + `ls -dr ${srcdir}/../../tcl[[7-9]]* 2>/dev/null` \ ${srcdir}/../../../tcl \ - `ls -dr ${srcdir}/../../../tcl[[0-9]]* 2>/dev/null ` ; do - if test -f $i/tclInt.h ; then - ac_cv_c_tclh=`(cd $i; pwd)` - break - fi - # Tcl 7.5 and greater puts headers in subdirectory. + `ls -dr ${srcdir}/../../../tcl[[7-9]]* 2>/dev/null ` ; do if test -f $i/generic/tclInt.h ; then - ac_cv_c_tclh=`(cd $i; pwd)`/generic + ac_cv_c_tclh=`(cd $i/generic; pwd)` break fi done @@ -88,13 +116,13 @@ fi # since ls returns lowest version numbers first, reverse its output if test x"${ac_cv_c_tclh}" = x ; then for i in \ - `ls -dr /usr/local/src/tcl[[0-9]]* 2>/dev/null` \ - `ls -dr /usr/local/lib/tcl[[0-9]]* 2>/dev/null` \ + `ls -dr /usr/local/src/tcl[[7-9]]* 2>/dev/null` \ + `ls -dr /usr/local/lib/tcl[[7-9]]* 2>/dev/null` \ /usr/local/src/tcl \ /usr/local/lib/tcl \ ${prefix}/include ; do - if test -f $i/tclInt.h ; then - ac_cv_c_tclh=`(cd $i; pwd)` + if test -f $i/generic/tclInt.h ; then + ac_cv_c_tclh=`(cd $i/generic; pwd)` break fi done @@ -120,176 +148,138 @@ if test x"${ac_cv_c_tclh}" != x ; then fi fi -AC_MSG_CHECKING([Tcl version]) -orig_includes="$CPPFLAGS" - -if test x"${TCLHDIR}" != x ; then - CPPFLAGS="$CPPFLAGS $TCLHDIR" -fi - -# Get major and minor versions of Tcl. Use funny names to avoid -# clashes with eg SunOS. -cat > conftest.c <<'EOF' -#include "tcl.h" -MaJor = TCL_MAJOR_VERSION -MiNor = TCL_MINOR_VERSION -EOF - -tclmajor= -tclminor= -if (eval "$CPP $CPPFLAGS conftest.c") 2>/dev/null >conftest.out; then - # Success. - tclmajor=`egrep '^MaJor = ' conftest.out | sed -e 's/^MaJor = *//' -e 's/ *$//'` - tclminor=`egrep '^MiNor = ' conftest.out | sed -e 's/^MiNor = *//' -e 's/ *$//'` -fi -rm -f conftest.c conftest.out - -if test -z "$tclmajor" || test -z "$tclminor"; then - AC_MSG_RESULT([fatal error: could not find major or minor version number of Tcl]) - exit 1 -fi -AC_MSG_RESULT(${tclmajor}.${tclminor}) - -CPPFLAGS="${orig_includes}" - -AC_PROVIDE([$0]) AC_SUBST(TCLHDIR) ]) -AC_DEFUN(CY_AC_PATH_TCLLIB, [ + + +AC_DEFUN(CY_AC_PATH_TCLCONFIG, [ # -# Ok, lets find the tcl library +# Ok, lets find the tcl configuration # First, look for one uninstalled. -# the alternative search directory is invoked by --with-tcllib +# the alternative search directory is invoked by --with-tclconfig # -if test $tclmajor -ge 7 -a $tclminor -ge 4 ; then - installedtcllibroot=tcl$tclversion -else - installedtcllibroot=tcl -fi - if test x"${no_tcl}" = x ; then - # we reset no_tcl incase something fails here + # we reset no_tcl in case something fails here no_tcl=true - AC_ARG_WITH(tcllib, [ --with-tcllib directory where the tcl library is], - with_tcllib=${withval}) - AC_MSG_CHECKING([for Tcl library]) - AC_CACHE_VAL(ac_cv_c_tcllib,[ - # First check to see if --with-tcllib was specified. - # This requires checking for both the installed and uninstalled name-styles - # since we have no idea if it's installed or not. - if test x"${with_tcllib}" != x ; then - if test -f "${with_tcllib}/lib$installedtcllibroot.so" ; then - ac_cv_c_tcllib=`(cd ${with_tcllib}; pwd)`/lib$installedtcllibroot.so - elif test -f "${with_tcllib}/libtcl.so" ; then - ac_cv_c_tcllib=`(cd ${with_tcllib}; pwd)`/libtcl.so - # then look for a freshly built statically linked library - # if Makefile exists we assume its configured and libtcl will be built first. - elif test -f "${with_tcllib}/lib$installedtcllibroot.a" ; then - ac_cv_c_tcllib=`(cd ${with_tcllib}; pwd)`/lib$installedtcllibroot.a - elif test -f "${with_tcllib}/libtcl.a" ; then - ac_cv_c_tcllib=`(cd ${with_tcllib}; pwd)`/libtcl.a + AC_ARG_WITH(tclconfig, [ --with-tclconfig directory containing tcl configuration (tclConfig.sh)], + with_tclconfig=${withval}) + AC_MSG_CHECKING([for Tcl configuration]) + AC_CACHE_VAL(ac_cv_c_tclconfig,[ + + # First check to see if --with-tclconfig was specified. + if test x"${with_tclconfig}" != x ; then + if test -f "${with_tclconfig}/tclConfig.sh" ; then + ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)` else - AC_MSG_ERROR([${with_tcllib} directory doesn't contain libraries]) + AC_MSG_ERROR([${with_tclconfig} directory doesn't contain tclConfig.sh]) fi fi - # then check for a private Tcl library - # Since these are uninstalled, use the simple lib name root. - if test x"${ac_cv_c_tcllib}" = x ; then + + # then check for a private Tcl installation + if test x"${ac_cv_c_tclconfig}" = x ; then for i in \ ../tcl \ - `ls -dr ../tcl[[0-9]]* 2>/dev/null` \ + `ls -dr ../tcl[[7-9]]* 2>/dev/null` \ ../../tcl \ - `ls -dr ../../tcl[[0-9]]* 2>/dev/null` \ + `ls -dr ../../tcl[[7-9]]* 2>/dev/null` \ ../../../tcl \ - `ls -dr ../../../tcl[[0-9]]* 2>/dev/null` ; do - # Tcl 7.5 and greater puts library in subdir. Look there first. - if test -f "$i/unix/libtcl.so" ; then - ac_cv_c_tcllib=`(cd $i; pwd)`/unix/libtcl.so - break - elif test -f "$i/unix/libtcl.a" -o -f "$i/unix/Makefile"; then - ac_cv_c_tcllib=`(cd $i; pwd)`/unix/libtcl.a - break - # look for a freshly built dynamically linked library - elif test -f "$i/libtcl.so" ; then - ac_cv_c_tcllib=`(cd $i; pwd)`/libtcl.so - break - - # then look for a freshly built statically linked library - # if Makefile exists we assume its configured and libtcl will be - # built first. - elif test -f "$i/libtcl.a" -o -f "$i/Makefile" ; then - ac_cv_c_tcllib=`(cd $i; pwd)`/libtcl.a + `ls -dr ../../../tcl[[7-9]]* 2>/dev/null` ; do + if test -f "$i/unix/tclConfig.sh" ; then + ac_cv_c_tclconfig=`(cd $i/unix; pwd)` break fi done fi # check in a few common install locations - if test x"${ac_cv_c_tcllib}" = x ; then + if test x"${ac_cv_c_tclconfig}" = x ; then for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do - # first look for a freshly built dynamically linked library - if test -f "$i/lib$installedtcllibroot.so" ; then - ac_cv_c_tcllib=`(cd $i; pwd)`/lib$installedtcllibroot.so - break - # then look for a freshly built statically linked library - # if Makefile exists we assume its configured and libtcl will be built first. - elif test -f "$i/lib$installedtcllibroot.a" -o -f "$i/Makefile" ; then - ac_cv_c_tcllib=`(cd $i; pwd)`/lib$installedtcllibroot.a + if test -f "$i/tclConfig.sh" ; then + ac_cv_c_tclconfig=`(cd $i; pwd)` break fi done fi # check in a few other private locations - if test x"${ac_cv_c_tcllib}" = x ; then + if test x"${ac_cv_c_tclconfig}" = x ; then for i in \ ${srcdir}/../tcl \ - `ls -dr ${srcdir}/../tcl[[0-9]]* 2>/dev/null` ; do - # Tcl 7.5 and greater puts library in subdir. Look there first. - if test -f "$i/unix/libtcl.so" ; then - ac_cv_c_tcllib=`(cd $i; pwd)`/unix/libtcl.so - break - elif test -f "$i/unix/libtcl.a" -o -f "$i/unix/Makefile"; then - ac_cv_c_tcllib=`(cd $i; pwd)`/unix/libtcl.a - break - # look for a freshly built dynamically linked library - elif test -f "$i/libtcl.so" ; then - ac_cv_c_tcllib=`(cd $i; pwd)`/libtcl.so - break - - # then look for a freshly built statically linked library - # if Makefile exists we assume its configured and libtcl will be - # built first. - elif test -f "$i/libtcl.a" -o -f "$i/Makefile" ; then - ac_cv_c_tcllib=`(cd $i; pwd)`/libtcl.a + `ls -dr ${srcdir}/../tcl[[7-9]]* 2>/dev/null` ; do + if test -f "$i/unix/tclConfig.sh" ; then + ac_cv_c_tclconfig=`(cd $i/unix; pwd)` break fi done fi - - # see if one is conveniently installed with the compiler - if test x"${ac_cv_c_tcllib}" = x ; then - orig_libs="$LIBS" - LIBS="$LIBS -l$installedtcllibroot -lm" - AC_TRY_RUN([ - Tcl_AppInit() - { exit(0); }], ac_cv_c_tcllib="-l$installedtcllibroot", ac_cv_c_tcllib="" - , ac_cv_c_tclib="-l$installedtcllibroot") - LIBS="${orig_libs}" - fi ]) - if test x"${ac_cv_c_tcllib}" = x ; then - TCLLIB="# no Tcl library found" - AC_MSG_WARN(Can't find Tcl library) + if test x"${ac_cv_c_tclconfig}" = x ; then + TCLCONFIG="# no Tcl configs found" + AC_MSG_WARN(Can't find Tcl configuration definitions) else - TCLLIB=${ac_cv_c_tcllib} - AC_MSG_RESULT(found $TCLLIB) no_tcl= + TCLCONFIG=${ac_cv_c_tclconfig}/tclConfig.sh + AC_MSG_RESULT(found $TCLCONFIG) fi fi +]) + +# Defined as a separate macro so we don't have to cache the values +# from PATH_TCLCONFIG (because this can also be cached). +AC_DEFUN(CY_AC_LOAD_TCLCONFIG, [ + . $TCLCONFIG + + AC_SUBST(TCL_VERSION) + AC_SUBST(TCL_MAJOR_VERSION) + AC_SUBST(TCL_MINOR_VERSION) + AC_SUBST(TCL_CC) + AC_SUBST(TCL_DEFS) + +dnl not used, don't export to save symbols +dnl AC_SUBST(TCL_LIB_FILE) + +dnl don't export, not used outside of configure +dnl AC_SUBST(TCL_LIBS) +dnl not used, don't export to save symbols +dnl AC_SUBST(TCL_PREFIX) + +dnl not used, don't export to save symbols +dnl AC_SUBST(TCL_EXEC_PREFIX) -AC_PROVIDE([$0]) -AC_SUBST(TCLLIB) + AC_SUBST(TCL_SHLIB_CFLAGS) + AC_SUBST(TCL_SHLIB_LD) +dnl don't export, not used outside of configure + AC_SUBST(TCL_SHLIB_LD_LIBS) + AC_SUBST(TCL_SHLIB_SUFFIX) +dnl not used, don't export to save symbols + AC_SUBST(TCL_DL_LIBS) + AC_SUBST(TCL_LD_FLAGS) +dnl don't export, not used outside of configure + AC_SUBST(TCL_LD_SEARCH_FLAGS) + AC_SUBST(TCL_COMPAT_OBJS) + AC_SUBST(TCL_RANLIB) + AC_SUBST(TCL_BUILD_LIB_SPEC) + AC_SUBST(TCL_LIB_SPEC) + AC_SUBST(TCL_LIB_VERSIONS_OK) + +dnl not used, don't export to save symbols +dnl AC_SUBST(TCL_SHARED_LIB_SUFFIX) + +dnl not used, don't export to save symbols +dnl AC_SUBST(TCL_UNSHARED_LIB_SUFFIX) ]) + +# Warning: Tk definitions are very similar to Tcl definitions but +# are not precisely the same. There are a couple of differences, +# so don't do changes to Tcl thinking you can cut and paste it do +# the Tk differences and later simply substitute "Tk" for "Tcl". +# Known differences: +# - Acceptable Tcl major version #s is 7-9 while Tk is 4-9 +# - Searching for Tcl includes looking for tclInt.h, Tk looks for tk.h +# - Computing major/minor versions is different because Tk depends on +# headers to Tcl, Tk, and X. +# - Symbols in tkConfig.sh are different than tclConfig.sh +# - Acceptable for Tk to be missing but not Tcl. + AC_DEFUN(CY_AC_PATH_TKH, [ # # Ok, lets find the tk source trees so we can use the headers @@ -302,63 +292,66 @@ AC_DEFUN(CY_AC_PATH_TKH, [ # recursive cache variables for the path will work right. We check all # the possible paths in one loop rather than many seperate loops to speed # things up. -# the alternative search directory is invoked by --with-tkinclude +# the alternative search directory is involked by --with-tkinclude # -AC_MSG_CHECKING(for Tk private headers) -AC_ARG_WITH(tkinclude, [ --with-tkinclude directory where the tk private headers are], - with_tkinclude=${withval}) no_tk=true +AC_MSG_CHECKING(for Tk private headers) +AC_ARG_WITH(tkinclude, [ --with-tkinclude directory where tk private headers are], with_tkinclude=${withval}) AC_CACHE_VAL(ac_cv_c_tkh,[ # first check to see if --with-tkinclude was specified if test x"${with_tkinclude}" != x ; then if test -f ${with_tkinclude}/tk.h ; then ac_cv_c_tkh=`(cd ${with_tkinclude}; pwd)` + elif test -f ${with_tkinclude}/generic/tk.h ; then + ac_cv_c_tkh=`(cd ${with_tkinclude}/generic; pwd)` else AC_MSG_ERROR([${with_tkinclude} directory doesn't contain private headers]) fi fi + +# next check if it came with Tk configuration file +if test x"${ac_cv_c_tkconfig}" = x ; then + if test -f $ac_cv_c_tkconfig/../generic/tk.h ; then + ac_cv_c_tkh=`(cd $ac_cv_c_tkconfig/..; pwd)` + fi +fi + # next check in private source directory # -# since ls returns lowest version numbers first, reverse the entire list -# and search for the worst fit, overwriting it with better fits as we find them +# since ls returns lowest version numbers first, reverse its output if test x"${ac_cv_c_tkh}" = x ; then for i in \ ${srcdir}/../tk \ - `ls -dr ${srcdir}/../tk[[0-9]]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tk[[4-9]]* 2>/dev/null` \ ${srcdir}/../../tk \ - `ls -dr ${srcdir}/../../tk[[0-9]]* 2>/dev/null` \ + `ls -dr ${srcdir}/../../tk[[4-9]]* 2>/dev/null` \ ${srcdir}/../../../tk \ - `ls -dr ${srcdir}/../../../tk[[0-9]]* 2>/dev/null ` ; do - if test -f $i/tk.h ; then - ac_cv_c_tkh=`(cd $i; pwd)` + `ls -dr ${srcdir}/../../../tk[[4-9]]* 2>/dev/null ` ; do + if test -f $i/generic/tk.h ; then + ac_cv_c_tkh=`(cd $i/generic; pwd)` break fi - # Tk 4.1 and greater puts this in a subdir. - if test -f $i/generic/tk.h; then - ac_cv_c_tkh=`(cd $i; pwd)`/generic - fi done fi # finally check in a few common install locations # -# since ls returns lowest version numbers first, reverse the entire list -# and search for the worst fit, overwriting it with better fits as we find them +# since ls returns lowest version numbers first, reverse its output if test x"${ac_cv_c_tkh}" = x ; then for i in \ - `ls -dr /usr/local/src/tk[[0-9]]* 2>/dev/null` \ - `ls -dr /usr/local/lib/tk[[0-9]]* 2>/dev/null` \ + `ls -dr /usr/local/src/tk[[4-9]]* 2>/dev/null` \ + `ls -dr /usr/local/lib/tk[[4-9]]* 2>/dev/null` \ /usr/local/src/tk \ /usr/local/lib/tk \ ${prefix}/include ; do - if test -f $i/tk.h ; then - ac_cv_c_tkh=`(cd $i; pwd)` + if test -f $i/generic/tk.h ; then + ac_cv_c_tkh=`(cd $i/generic; pwd)` break fi done fi # see if one is installed if test x"${ac_cv_c_tkh}" = x ; then - AC_HEADER_CHECK(tk.h, ac_cv_c_tkh=installed) + AC_HEADER_CHECK(tk.h, ac_cv_c_tkh=installed, ac_cv_c_tkh="") fi ]) if test x"${ac_cv_c_tkh}" != x ; then @@ -367,7 +360,7 @@ if test x"${ac_cv_c_tkh}" != x ; then AC_MSG_RESULT([is installed]) TKHDIR="" else - AC_MSG_RESULT([found in $ac_cv_c_tkh]) + AC_MSG_RESULT([found in ${ac_cv_c_tkh}]) # this hack is cause the TKHDIR won't print if there is a "-I" in it. TKHDIR="-I${ac_cv_c_tkh}" fi @@ -377,207 +370,109 @@ else no_tk=true fi -# if Tk is installed, extract the major/minor version -if test x"${no_tk}" = x ; then -AC_MSG_CHECKING([Tk version]) -orig_includes="$CPPFLAGS" - -if test x"${TCLHDIR}" != x ; then - CPPFLAGS="$CPPFLAGS $TCLHDIR" -fi -if test x"${TKHDIR}" != x ; then - CPPFLAGS="$CPPFLAGS $TKHDIR" -fi -if test x"${x_includes}" != x -a x"${x_includes}" != xNONE ; then - CPPFLAGS="$CPPFLAGS -I$x_includes" -fi - -# Get major and minor versions of Tk. Use funny names to avoid -# clashes with eg SunOS. -cat > conftest.c <<'EOF' -#include "tk.h" -MaJor = TK_MAJOR_VERSION -MiNor = TK_MINOR_VERSION -EOF - -tkmajor= -tkminor= -if (eval "$CPP $CPPFLAGS conftest.c") 2>/dev/null >conftest.out; then - # Success. - tkmajor=`egrep '^MaJor = ' conftest.out | sed -e 's/^MaJor = *//' -e 's/ *$//'` - tkminor=`egrep '^MiNor = ' conftest.out | sed -e 's/^MiNor = *//' -e 's/ *$//'` -fi -rm -f conftest.c conftest.out - -if test -z "$tkmajor" || test -z "$tkminor"; then - AC_MSG_RESULT([fatal error: could not find major or minor version number of Tk]) - exit 1 -fi -AC_MSG_RESULT(${tkmajor}.${tkminor}) - -CPPFLAGS="${orig_includes}" -fi - -AC_PROVIDE([$0]) AC_SUBST(TKHDIR) ]) -AC_DEFUN(CY_AC_PATH_TKLIB, [ -AC_REQUIRE([CY_AC_PATH_TCL]) + + +AC_DEFUN(CY_AC_PATH_TKCONFIG, [ # -# Ok, lets find the tk library -# First, look for the latest private (uninstalled) copy -# Notice that the destinations in backwards priority since the tests have -# no break. -# Then we look for either .a, .so, or Makefile. A Makefile is acceptable -# is it indicates the target has been configured and will (probably) -# soon be built. This allows an entire tree of Tcl software to be -# configured at once and then built. -# the alternative search directory is invoked by --with-tklib +# Ok, lets find the tk configuration +# First, look for one uninstalled. +# the alternative search directory is invoked by --with-tkconfig # if test x"${no_tk}" = x ; then - # reset no_tk incase something fails here - no_tk="true" - - if test $tkmajor -ge 4 ; then - installedtklibroot=tk$tkversion - else - installedtkllibroot=tk - fi + # we reset no_tk in case something fails here + no_tk=true + AC_ARG_WITH(tkconfig, [ --with-tkconfig directory containing tk configuration (tkConfig.sh)], + with_tkconfig=${withval}) + AC_MSG_CHECKING([for Tk configuration]) + AC_CACHE_VAL(ac_cv_c_tkconfig,[ - AC_ARG_WITH(tklib, [ --with-tklib directory where the tk library is], - with_tklib=${withval}) - AC_MSG_CHECKING([for Tk library]) - AC_CACHE_VAL(ac_cv_c_tklib,[ - # first check to see if --with-tklib was specified - # This requires checking for both the installed and uninstalled name-styles - # since we have no idea if it's installed or not. - if test x"${with_tklib}" != x ; then - if test -f "${with_tklib}/lib$installedtklibroot.so" ; then - ac_cv_c_tklib=`(cd ${with_tklib}; pwd)`/lib$installedtklibroot.so - no_tk="" - elif test -f "${with_tklib}/libtk.so" ; then - ac_cv_c_tklib=`(cd ${with_tklib}; pwd)`/libtk.so - no_tk="" - # then look for a freshly built statically linked library - # if Makefile exists we assume its configured and libtk will be built - elif test -f "${with_tklib}/lib$installedtklibroot.a" ; then - ac_cv_c_tklib=`(cd ${with_tklib}; pwd)`/lib$installedtklibroot.a - no_tk="" - elif test -f "${with_tklib}/libtk.a" ; then - ac_cv_c_tklib=`(cd ${with_tklib}; pwd)`/libtk.a - no_tk="" + # First check to see if --with-tkconfig was specified. + if test x"${with_tkconfig}" != x ; then + if test -f "${with_tkconfig}/tkConfig.sh" ; then + ac_cv_c_tkconfig=`(cd ${with_tkconfig}; pwd)` else - AC_MSG_ERROR([${with_tklib} directory doesn't contain libraries]) + AC_MSG_ERROR([${with_tkconfig} directory doesn't contain tkConfig.sh]) fi fi + # then check for a private Tk library - # Since these are uninstalled, use the simple lib name root. - if test x"${ac_cv_c_tklib}" = x ; then + if test x"${ac_cv_c_tkconfig}" = x ; then for i in \ ../tk \ - `ls -dr ../tk[[0-9]]* 2>/dev/null` \ + `ls -dr ../tk[[4-9]]* 2>/dev/null` \ ../../tk \ - `ls -dr ../../tk[[0-9]]* 2>/dev/null` \ + `ls -dr ../../tk[[4-9]]* 2>/dev/null` \ ../../../tk \ - `ls -dr ../../../tk[[0-9]]* 2>/dev/null` ; do - # Tk 4.1 and greater puts things in subdirs. Check these first. - if test -f "$i/unix/libtk.so" ; then - ac_cv_c_tklib=`(cd $i; pwd)`/unix/libtk.so - no_tk= - break - elif test -f "$i/unix/libtk.a" -o -f "$i/unix/Makefile"; then - ac_cv_c_tklib=`(cd $i; pwd)`/unix/libtk.a - no_tk= - break - # look for a freshly built dynamically linked library - elif test -f "$i/libtk.so" ; then - ac_cv_c_tklib=`(cd $i; pwd)`/libtk.so - no_tk= + `ls -dr ../../../tk[[4-9]]* 2>/dev/null` ; do + if test -f "$i/unix/tkConfig.sh" ; then + ac_cv_c_tkconfig=`(cd $i/unix; pwd)` break - # then look for a freshly built statically linked library - # if Makefile exists we assume its configured and libtk will be built - elif test -f "$i/libtk.a" -o -f "$i/Makefile" ; then - ac_cv_c_tklib=`(cd $i; pwd)`/libtk.a - no_tk="" - break fi done fi - # finally check in a few common install locations - if test x"${ac_cv_c_tklib}" = x ; then + # check in a few common install locations + if test x"${ac_cv_c_tkconfig}" = x ; then for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do - # first look for a freshly built dynamically linked library - if test -f "$i/lib$installedtklibroot.so" ; then - ac_cv_c_tklib=`(cd $i; pwd)`/lib$installedtklibroot.so - no_tk="" + if test -f "$i/tkConfig.sh" ; then + ac_cv_c_tkconfig=`(cd $i; pwd)` break - # then look for a freshly built statically linked library - # if Makefile exists, we assume it's configured and libtcl will be built - elif test -f "$i/lib$installedtklibroot.a" -o -f "$i/Makefile" ; then - ac_cv_c_tklib=`(cd $i; pwd)`/lib$installedtklibroot.a - no_tk="" - break fi done fi # check in a few other private locations - if test x"${ac_cv_c_tklib}" = x ; then + if test x"${ac_cv_c_tkconfig}" = x ; then for i in \ ${srcdir}/../tk \ - `ls -dr ${srcdir}/../tk[[0-9]]* 2>/dev/null` ; do - # Tk 4.1 and greater puts things in subdirs. Check these first. - if test -f "$i/unix/libtk.so" ; then - ac_cv_c_tklib=`(cd $i; pwd)`/unix/libtk.so - no_tk= - break - elif test -f "$i/unix/libtk.a" -o -f "$i/unix/Makefile"; then - ac_cv_c_tcllib=`(cd $i; pwd)`/unix/libtk.a - no_tk= - break - # look for a freshly built dynamically linked library - elif test -f "$i/libtk.so" ; then - ac_cv_c_tklib=`(cd $i; pwd)`/libtk.so - no_tk="" + `ls -dr ${srcdir}/../tk[[4-9]]* 2>/dev/null` ; do + if test -f "$i/unix/tkConfig.sh" ; then + ac_cv_c_tkconfig=`(cd $i/unix; pwd)` break - # then look for a freshly built statically linked library - # if Makefile exists, we assume it's configured and libtcl will be built - elif test -f "$i/libtk.a" -o -f "$i/Makefile" ; then - ac_cv_c_tklib=`(cd $i; pwd)`/libtk.a - no_tk="" - break fi done fi - # see if one is conveniently installed with the compiler - if test x"${ac_cv_c_tklib}" = x ; then - AC_REQUIRE([AC_PATH_X]) - orig_libs="$LIBS" - LIBS="$LIBS -l$installedtklibroot $x_libraries $ac_cv_c_tcllib -lm" - AC_TRY_RUN([ - Tcl_AppInit() - { exit(0); }], ac_cv_c_tklib="-l$installedtklibroot", ac_cv_c_tklib="" - , ac_cv_c_tklib="-l$installedtklibroot") - LIBS="${orig_libs}" - fi ]) - if test x"${ac_cv_c_tklib}" = x ; then - TKLIB="# no Tk library found" - AC_MSG_WARN(Can't find Tk library) + if test x"${ac_cv_c_tkconfig}" = x ; then + TKCONFIG="# no Tk configs found" + AC_MSG_WARN(Can't find Tk configuration definitions) else - TKLIB=$ac_cv_c_tklib - AC_MSG_RESULT(found $TKLIB) no_tk= + TKCONFIG=${ac_cv_c_tkconfig}/tkConfig.sh + AC_MSG_RESULT(found $TKCONFIG) fi fi -AC_PROVIDE([$0]) -AC_SUBST(TKLIB) -]) -AC_DEFUN(CY_AC_PATH_TK, [ - CY_AC_PATH_TKH - CY_AC_PATH_TKLIB + ]) -AC_DEFUN(CY_AC_PATH_TCL, [ - CY_AC_PATH_TCLH - CY_AC_PATH_TCLLIB + +# Defined as a separate macro so we don't have to cache the values +# from PATH_TKCONFIG (because this can also be cached). +AC_DEFUN(CY_AC_LOAD_TKCONFIG, [ + if test -f "$TKCONFIG" ; then + . $TKCONFIG + fi + + AC_SUBST(TK_VERSION) +dnl not actually used, don't export to save symbols +dnl AC_SUBST(TK_MAJOR_VERSION) +dnl AC_SUBST(TK_MINOR_VERSION) + AC_SUBST(TK_DEFS) + +dnl not used, don't export to save symbols + dnl AC_SUBST(TK_LIB_FILE) + +dnl not used outside of configure +dnl AC_SUBST(TK_LIBS) +dnl not used, don't export to save symbols +dnl AC_SUBST(TK_PREFIX) + +dnl not used, don't export to save symbols +dnl AC_SUBST(TK_EXEC_PREFIX) + + AC_SUBST(TK_XINCLUDES) + AC_SUBST(TK_XLIBSW) + AC_SUBST(TK_BUILD_LIB_SPEC) + AC_SUBST(TK_LIB_SPEC) ]) + diff --git a/gdb/config.in b/gdb/config.in index 1e1d347..ef77c89 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -94,6 +94,3 @@ /* Define if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H - -/* Define if you have the dl library (-ldl). */ -#undef HAVE_LIBDL diff --git a/gdb/configure b/gdb/configure index 52d1eda..200fd70 100755 --- a/gdb/configure +++ b/gdb/configure @@ -20,15 +20,13 @@ ac_help="$ac_help ac_help="$ac_help --enable-gdbtk " ac_help="$ac_help - --with-x use the X Window System" + --with-tclconfig directory containing tcl configuration (tclConfig.sh)" ac_help="$ac_help - --with-tclinclude directory where tcl private headers are" -ac_help="$ac_help - --with-tcllib directory where the tcl library is" + --with-tkconfig directory containing tk configuration (tkConfig.sh)" ac_help="$ac_help - --with-tkinclude directory where the tk private headers are" + --with-tclinclude directory where tcl private headers are" ac_help="$ac_help - --with-tklib directory where the tk library is" + --with-tkinclude directory where tk private headers are" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -618,7 +616,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -670,13 +668,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 674 "configure" +#line 672 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -685,13 +683,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 689 "configure" +#line 687 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -713,7 +711,7 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 cat > conftest.$ac_ext <<EOF -#line 717 "configure" +#line 715 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -740,12 +738,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 744 "configure" +#line 742 "configure" #include "confdefs.h" #include <minix/config.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1221,11 +1219,11 @@ else ac_cv_c_cross=yes else cat > conftest.$ac_ext <<EOF -#line 1225 "configure" +#line 1223 "configure" #include "confdefs.h" main(){return(0);} EOF -{ (eval echo configure:1229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_c_cross=no else @@ -1243,7 +1241,7 @@ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1247 "configure" +#line 1245 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1251,7 +1249,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1266,7 +1264,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1270 "configure" +#line 1268 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1284,7 +1282,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1288 "configure" +#line 1286 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1305,7 +1303,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1309 "configure" +#line 1307 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1316,7 +1314,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -{ (eval echo configure:1320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then : else @@ -1343,12 +1341,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 1347 "configure" +#line 1345 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1377,7 +1375,7 @@ if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1381 "configure" +#line 1379 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -1435,7 +1433,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1439 "configure" +#line 1437 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1459,7 +1457,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1487,7 +1485,7 @@ if eval "test \"`echo '$''{'gdb_cv_have_gregset_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1491 "configure" +#line 1489 "configure" #include "confdefs.h" #include <sys/procfs.h> int main() { return 0; } @@ -1495,7 +1493,7 @@ int t() { gregset_t *gregsetp = 0 ; return 0; } EOF -if { (eval echo configure:1499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* gdb_cv_have_gregset_t=yes else @@ -1519,7 +1517,7 @@ if eval "test \"`echo '$''{'gdb_cv_have_fpregset_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1523 "configure" +#line 1521 "configure" #include "confdefs.h" #include <sys/procfs.h> int main() { return 0; } @@ -1527,7 +1525,7 @@ int t() { fpregset_t *fpregsetp = 0 ; return 0; } EOF -if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* gdb_cv_have_fpregset_t=yes else @@ -1552,7 +1550,7 @@ if eval "test \"`echo '$''{'gdb_cv_c_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1556 "configure" +#line 1554 "configure" #include "confdefs.h" int main() { return 0; } @@ -1565,7 +1563,7 @@ void bar () } ; return 0; } EOF -if { (eval echo configure:1569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gdb_cv_c_long_long=yes else @@ -1593,7 +1591,7 @@ else gdb_cv_printf_has_long_long=no else cat > conftest.$ac_ext <<EOF -#line 1597 "configure" +#line 1595 "configure" #include "confdefs.h" int main () { @@ -1603,7 +1601,7 @@ int main () { return (strcmp ("12345", buf)); } EOF -{ (eval echo configure:1607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then gdb_cv_printf_has_long_long=yes else @@ -1627,7 +1625,7 @@ if eval "test \"`echo '$''{'ac_cv_c_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1631 "configure" +#line 1629 "configure" #include "confdefs.h" int main() { return 0; } @@ -1635,7 +1633,7 @@ int t() { long double foo; ; return 0; } EOF -if { (eval echo configure:1639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_long_double=yes else @@ -1663,7 +1661,7 @@ else gdb_cv_printf_has_long_double=no else cat > conftest.$ac_ext <<EOF -#line 1667 "configure" +#line 1665 "configure" #include "confdefs.h" int main () { @@ -1673,7 +1671,7 @@ int main () { return (strncmp ("3.14159", buf, 7)); } EOF -{ (eval echo configure:1677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then gdb_cv_printf_has_long_double=yes else @@ -1698,7 +1696,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1702 "configure" +#line 1700 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1722,7 +1720,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1752,7 +1750,7 @@ else ac_cv_func_mmap=no else cat > conftest.$ac_ext <<EOF -#line 1756 "configure" +#line 1754 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. */ @@ -1821,7 +1819,7 @@ main() } EOF -{ (eval echo configure:1825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_func_mmap=yes else @@ -1949,482 +1947,213 @@ fi if test "${enable_gdbtk}" = "yes"; then - # If we find X, set shell vars x_includes and x_libraries to the -# paths, otherwise set no_x=yes. -# 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 + +# +# Ok, lets find the tcl configuration +# First, look for one uninstalled. +# the alternative search directory is invoked by --with-tclconfig +# -# Check whether --with-x or --without-x was given. -if test "${with_x+set}" = set; then - withval="$with_x" - : +if test x"${no_tcl}" = x ; then + # we reset no_tcl in case something fails here + no_tcl=true + # Check whether --with-tclconfig or --without-tclconfig was given. +if test "${with_tclconfig+set}" = set; then + withval="$with_tclconfig" + with_tclconfig=${withval} fi -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else -if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then + echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6 + if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=NO ac_x_libraries=NO -rm -fr conftestdir -if mkdir conftestdir; then - cd conftestdir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat > Imakefile <<'EOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -EOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. - case "$ac_im_incroot" in - /usr/include) ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;; - esac - case "$ac_im_usrlibdir" in - /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;; - esac - fi - cd .. - rm -fr conftestdir -fi - -if test "$ac_x_includes" = NO; then - # Guess where to find include files, by looking for this one X11 .h file. - test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h - - # First, try using that file with no special directory specified. -cat > conftest.$ac_ext <<EOF -#line 2017 "configure" -#include "confdefs.h" -#include <$x_direct_test_include> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` -if test -z "$ac_err"; then - rm -rf conftest* - # We can compile using X headers with no special include directory. -ac_x_includes= -else - echo "$ac_err" >&5 - rm -rf conftest* - # Look for the header file in a standard set of common directories. - for ac_dir in \ - /usr/X11R6/include \ - /usr/X11R5/include \ - /usr/X11R4/include \ - \ - /usr/include/X11R6 \ - /usr/include/X11R5 \ - /usr/include/X11R4 \ - \ - /usr/local/X11R6/include \ - /usr/local/X11R5/include \ - /usr/local/X11R4/include \ - \ - /usr/local/include/X11R6 \ - /usr/local/include/X11R5 \ - /usr/local/include/X11R4 \ - \ - /usr/X11/include \ - /usr/include/X11 \ - /usr/local/X11/include \ - /usr/local/include/X11 \ - \ - /usr/X386/include \ - /usr/x386/include \ - /usr/XFree86/include/X11 \ - \ - /usr/include \ - /usr/local/include \ - /usr/unsupported/include \ - /usr/athena/include \ - /usr/local/x11r5/include \ - /usr/lpp/Xamples/include \ - \ - /usr/openwin/include \ - /usr/openwin/share/include \ - ; \ - do - if test -r "$ac_dir/$x_direct_test_include"; then - ac_x_includes=$ac_dir - break - fi - done -fi -rm -f conftest* -fi # $ac_x_includes = NO - -if test "$ac_x_libraries" = NO; then - # Check for the libraries. - - test -z "$x_direct_test_library" && x_direct_test_library=Xt - test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc - - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" -cat > conftest.$ac_ext <<EOF -#line 2089 "configure" -#include "confdefs.h" + -int main() { return 0; } -int t() { -${x_direct_test_function}() -; return 0; } -EOF -if { (eval echo configure:2097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - rm -rf conftest* - LIBS="$ac_save_LIBS" -# We can link X programs with no special library path. -ac_x_libraries= -else - rm -rf conftest* - LIBS="$ac_save_LIBS" -# First see if replacing the include by lib works. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ - /usr/X11R6/lib \ - /usr/X11R5/lib \ - /usr/X11R4/lib \ - \ - /usr/lib/X11R6 \ - /usr/lib/X11R5 \ - /usr/lib/X11R4 \ - \ - /usr/local/X11R6/lib \ - /usr/local/X11R5/lib \ - /usr/local/X11R4/lib \ - \ - /usr/local/lib/X11R6 \ - /usr/local/lib/X11R5 \ - /usr/local/lib/X11R4 \ - \ - /usr/X11/lib \ - /usr/lib/X11 \ - /usr/local/X11/lib \ - /usr/local/lib/X11 \ - \ - /usr/X386/lib \ - /usr/x386/lib \ - /usr/XFree86/lib/X11 \ - \ - /usr/lib \ - /usr/local/lib \ - /usr/unsupported/lib \ - /usr/athena/lib \ - /usr/local/x11r5/lib \ - /usr/lpp/Xamples/lib \ - \ - /usr/openwin/lib \ - /usr/openwin/share/lib \ - ; \ -do - for ac_extension in a so sl; do - if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then - ac_x_libraries=$ac_dir - break 2 + # First check to see if --with-tclconfig was specified. + if test x"${with_tclconfig}" != x ; then + if test -f "${with_tclconfig}/tclConfig.sh" ; then + ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)` + else + { echo "configure: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" 1>&2; exit 1; } fi - done -done -fi -rm -f conftest* - -fi # $ac_x_libraries = NO - -if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then - # Didn't find X anywhere. Cache the known absence of X. - ac_cv_have_x="have_x=no" -else - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" -fi -fi fi - eval "$ac_cv_have_x" -fi # $with_x != no -if test "$have_x" != yes; then - echo "$ac_t""$have_x" 1>&6 - no_x=yes -else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6 -fi - - if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - X_CFLAGS="$X_CFLAGS -DX_DISPLAY_MISSING" -else - if test -n "$x_includes"; then - X_CFLAGS="$X_CFLAGS -I$x_includes" + # then check for a private Tcl installation + if test x"${ac_cv_c_tclconfig}" = x ; then + for i in \ + ../tcl \ + `ls -dr ../tcl[7-9]* 2>/dev/null` \ + ../../tcl \ + `ls -dr ../../tcl[7-9]* 2>/dev/null` \ + ../../../tcl \ + `ls -dr ../../../tcl[7-9]* 2>/dev/null` ; do + if test -f "$i/unix/tclConfig.sh" ; then + ac_cv_c_tclconfig=`(cd $i/unix; pwd)` + break + fi + done + fi + # check in a few common install locations + if test x"${ac_cv_c_tclconfig}" = x ; then + for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do + if test -f "$i/tclConfig.sh" ; then + ac_cv_c_tclconfig=`(cd $i; pwd)` + break + fi + done + fi + # check in a few other private locations + if test x"${ac_cv_c_tclconfig}" = x ; then + for i in \ + ${srcdir}/../tcl \ + `ls -dr ${srcdir}/../tcl[7-9]* 2>/dev/null` ; do + if test -f "$i/unix/tclConfig.sh" ; then + ac_cv_c_tclconfig=`(cd $i/unix; pwd)` + break + fi + done fi + +fi - # It would be nice to have a more robust check for the -R ld option than - # just checking for Solaris. - # It would also be nice to do this for all -L options, not just this one. - if test -n "$x_libraries"; then - X_LIBS="$X_LIBS -L$x_libraries" - if test "`(uname) 2>/dev/null`" = SunOS && - uname -r | grep '^5' >/dev/null; then - X_LIBS="$X_LIBS -R $x_libraries" - fi + if test x"${ac_cv_c_tclconfig}" = x ; then + TCLCONFIG="# no Tcl configs found" + echo "configure: warning: Can't find Tcl configuration definitions" 1>&2 + else + no_tcl= + TCLCONFIG=${ac_cv_c_tclconfig}/tclConfig.sh + echo "$ac_t""found $TCLCONFIG" 1>&6 fi +fi - # Check for libraries that X11R6 Xt/Xaw programs need. - - ac_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$x_libraries" - # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to - # check for ICE first), but we must link in the order -lSM -lICE or - # we get undefined symbols. So assume we have SM if we have ICE. - # These have to be linked with before -lX11, unlike the other - # libraries we check for below, so use a different variable. - # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. - echo $ac_n "checking for -lICE""... $ac_c" 1>&6 -ac_lib_var=`echo ICE'_'IceConnectionNumber | tr './+\055' '__p_'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lICE $LIBS" -cat > conftest.$ac_ext <<EOF -#line 2218 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char IceConnectionNumber(); + + . $TCLCONFIG -int main() { return 0; } -int t() { -IceConnectionNumber() -; return 0; } -EOF -if { (eval echo configure:2230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" + + + + + -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -else - echo "$ac_t""no" 1>&6 -fi - LDFLAGS="$ac_save_LDFLAGS" - # Check for system-dependent libraries X programs must link with. - if test "$ISC" = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" - else - # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And karl@cs.umb.edu says - # the Alpha needs dnet_stub (dnet does not exist). - echo $ac_n "checking for -ldnet""... $ac_c" 1>&6 -ac_lib_var=`echo dnet'_'dnet_ntoa | tr './+\055' '__p_'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ldnet $LIBS" -cat > conftest.$ac_ext <<EOF -#line 2266 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa(); + + + + + + + + + + + + -int main() { return 0; } -int t() { -dnet_ntoa() -; return 0; } -EOF -if { (eval echo configure:2278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -else - echo "$ac_t""no" 1>&6 -fi - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo $ac_n "checking for -ldnet_stub""... $ac_c" 1>&6 -ac_lib_var=`echo dnet_stub'_'dnet_ntoa | tr './+\055' '__p_'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ldnet_stub $LIBS" -cat > conftest.$ac_ext <<EOF -#line 2305 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa(); + +# +# Ok, lets find the tk configuration +# First, look for one uninstalled. +# the alternative search directory is invoked by --with-tkconfig +# -int main() { return 0; } -int t() { -dnet_ntoa() -; return 0; } -EOF -if { (eval echo configure:2317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" +if test x"${no_tk}" = x ; then + # we reset no_tk in case something fails here + no_tk=true + # Check whether --with-tkconfig or --without-tkconfig was given. +if test "${with_tkconfig+set}" = set; then + withval="$with_tkconfig" + with_tkconfig=${withval} fi -rm -f conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" + echo $ac_n "checking for Tk configuration""... $ac_c" 1>&6 + if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - echo "$ac_t""no" 1>&6 -fi + + # First check to see if --with-tkconfig was specified. + if test x"${with_tkconfig}" != x ; then + if test -f "${with_tkconfig}/tkConfig.sh" ; then + ac_cv_c_tkconfig=`(cd ${with_tkconfig}; pwd)` + else + { echo "configure: error: ${with_tkconfig} directory doesn't contain tkConfig.sh" 1>&2; exit 1; } fi + fi - # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, - # to get the SysV transport functions. - # Not sure which flavor of 386 UNIX this is, but it seems harmless to - # check for it. - echo $ac_n "checking for -lnsl""... $ac_c" 1>&6 -ac_lib_var=`echo nsl'_'t_accept | tr './+\055' '__p_'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lnsl $LIBS" -cat > conftest.$ac_ext <<EOF -#line 2349 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char t_accept(); - -int main() { return 0; } -int t() { -t_accept() -; return 0; } -EOF -if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + # then check for a private Tk library + if test x"${ac_cv_c_tkconfig}" = x ; then + for i in \ + ../tk \ + `ls -dr ../tk[4-9]* 2>/dev/null` \ + ../../tk \ + `ls -dr ../../tk[4-9]* 2>/dev/null` \ + ../../../tk \ + `ls -dr ../../../tk[4-9]* 2>/dev/null` ; do + if test -f "$i/unix/tkConfig.sh" ; then + ac_cv_c_tkconfig=`(cd $i/unix; pwd)` + break + fi + done + fi + # check in a few common install locations + if test x"${ac_cv_c_tkconfig}" = x ; then + for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do + if test -f "$i/tkConfig.sh" ; then + ac_cv_c_tkconfig=`(cd $i; pwd)` + break + fi + done + fi + # check in a few other private locations + if test x"${ac_cv_c_tkconfig}" = x ; then + for i in \ + ${srcdir}/../tk \ + `ls -dr ${srcdir}/../tk[4-9]* 2>/dev/null` ; do + if test -f "$i/unix/tkConfig.sh" ; then + ac_cv_c_tkconfig=`(cd $i/unix; pwd)` + break + fi + done + fi + fi -rm -f conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -else - echo "$ac_t""no" 1>&6 + if test x"${ac_cv_c_tkconfig}" = x ; then + TKCONFIG="# no Tk configs found" + echo "configure: warning: Can't find Tk configuration definitions" 1>&2 + else + no_tk= + TKCONFIG=${ac_cv_c_tkconfig}/tkConfig.sh + echo "$ac_t""found $TKCONFIG" 1>&6 + fi fi - # lieder@skyler.mavd.honeywell.com says without -lsocket, - # socket/setsockopt and other routines are undefined under SCO ODT 2.0. - # But -lsocket is broken on IRIX, according to simon@lia.di.epfl.ch. - if test "`(uname) 2>/dev/null`" != IRIX; then - echo $ac_n "checking for -lsocket""... $ac_c" 1>&6 -ac_lib_var=`echo socket'_'socket | tr './+\055' '__p_'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <<EOF -#line 2392 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char socket(); -int main() { return 0; } -int t() { -socket() -; return 0; } -EOF -if { (eval echo configure:2404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" + # 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 -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - X_EXTRA_LIBS="$X_EXTRA_LIBS -lsocket" -else - echo "$ac_t""no" 1>&6 -fi + + - fi - fi -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 @@ -2448,28 +2177,33 @@ else if test x"${with_tclinclude}" != x ; then if test -f ${with_tclinclude}/tclInt.h ; then ac_cv_c_tclh=`(cd ${with_tclinclude}; pwd)` + elif test -f ${with_tclinclude}/generic/tclInt.h ; then + ac_cv_c_tclh=`(cd ${with_tclinclude}/generic; pwd)` else { echo "configure: error: ${with_tclinclude} directory doesn't contain private headers" 1>&2; exit 1; } fi fi + +# next check if it came with Tcl configuration file +if test x"${ac_cv_c_tclconfig}" = x ; then + if test -f $ac_cv_c_tclconfig/../generic/tclInt.h ; then + ac_cv_c_tclh=`(cd $ac_cv_c_tclconfig/..; pwd)` + fi +fi + # next check in private source directory # # since ls returns lowest version numbers first, reverse its output if test x"${ac_cv_c_tclh}" = x ; then for i in \ ${srcdir}/../tcl \ - `ls -dr ${srcdir}/../tcl[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tcl[7-9]* 2>/dev/null` \ ${srcdir}/../../tcl \ - `ls -dr ${srcdir}/../../tcl[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../../tcl[7-9]* 2>/dev/null` \ ${srcdir}/../../../tcl \ - `ls -dr ${srcdir}/../../../tcl[0-9]* 2>/dev/null ` ; do - if test -f $i/tclInt.h ; then - ac_cv_c_tclh=`(cd $i; pwd)` - break - fi - # Tcl 7.5 and greater puts headers in subdirectory. + `ls -dr ${srcdir}/../../../tcl[7-9]* 2>/dev/null ` ; do if test -f $i/generic/tclInt.h ; then - ac_cv_c_tclh=`(cd $i; pwd)`/generic + ac_cv_c_tclh=`(cd $i/generic; pwd)` break fi done @@ -2479,13 +2213,13 @@ fi # since ls returns lowest version numbers first, reverse its output if test x"${ac_cv_c_tclh}" = x ; then for i in \ - `ls -dr /usr/local/src/tcl[0-9]* 2>/dev/null` \ - `ls -dr /usr/local/lib/tcl[0-9]* 2>/dev/null` \ + `ls -dr /usr/local/src/tcl[7-9]* 2>/dev/null` \ + `ls -dr /usr/local/lib/tcl[7-9]* 2>/dev/null` \ /usr/local/src/tcl \ /usr/local/lib/tcl \ ${prefix}/include ; do - if test -f $i/tclInt.h ; then - ac_cv_c_tclh=`(cd $i; pwd)` + if test -f $i/generic/tclInt.h ; then + ac_cv_c_tclh=`(cd $i/generic; pwd)` break fi done @@ -2498,12 +2232,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 2502 "configure" +#line 2236 "configure" #include "confdefs.h" #include <tclInt.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2507: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2543,203 +2277,9 @@ if test x"${ac_cv_c_tclh}" != x ; then fi fi -echo $ac_n "checking Tcl version""... $ac_c" 1>&6 -orig_includes="$CPPFLAGS" - -if test x"${TCLHDIR}" != x ; then - CPPFLAGS="$CPPFLAGS $TCLHDIR" -fi - -# Get major and minor versions of Tcl. Use funny names to avoid -# clashes with eg SunOS. -cat > conftest.c <<'EOF' -#include "tcl.h" -MaJor = TCL_MAJOR_VERSION -MiNor = TCL_MINOR_VERSION -EOF - -tclmajor= -tclminor= -if (eval "$CPP $CPPFLAGS conftest.c") 2>/dev/null >conftest.out; then - # Success. - tclmajor=`egrep '^MaJor = ' conftest.out | sed -e 's/^MaJor = *//' -e 's/ *$//'` - tclminor=`egrep '^MiNor = ' conftest.out | sed -e 's/^MiNor = *//' -e 's/ *$//'` -fi -rm -f conftest.c conftest.out - -if test -z "$tclmajor" || test -z "$tclminor"; then - echo "$ac_t""fatal error: could not find major or minor version number of Tcl" 1>&6 - exit 1 -fi -echo "$ac_t""${tclmajor}.${tclminor}" 1>&6 - -CPPFLAGS="${orig_includes}" - - - - - -# -# Ok, lets find the tcl library -# First, look for one uninstalled. -# the alternative search directory is invoked by --with-tcllib -# - -if test $tclmajor -ge 7 -a $tclminor -ge 4 ; then - installedtcllibroot=tcl$tclversion -else - installedtcllibroot=tcl -fi - -if test x"${no_tcl}" = x ; then - # we reset no_tcl incase something fails here - no_tcl=true - # Check whether --with-tcllib or --without-tcllib was given. -if test "${with_tcllib+set}" = set; then - withval="$with_tcllib" - with_tcllib=${withval} -fi - - echo $ac_n "checking for Tcl library""... $ac_c" 1>&6 - if eval "test \"`echo '$''{'ac_cv_c_tcllib'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - # First check to see if --with-tcllib was specified. - # This requires checking for both the installed and uninstalled name-styles - # since we have no idea if it's installed or not. - if test x"${with_tcllib}" != x ; then - if test -f "${with_tcllib}/lib$installedtcllibroot.so" ; then - ac_cv_c_tcllib=`(cd ${with_tcllib}; pwd)`/lib$installedtcllibroot.so - elif test -f "${with_tcllib}/libtcl.so" ; then - ac_cv_c_tcllib=`(cd ${with_tcllib}; pwd)`/libtcl.so - # then look for a freshly built statically linked library - # if Makefile exists we assume its configured and libtcl will be built first. - elif test -f "${with_tcllib}/lib$installedtcllibroot.a" ; then - ac_cv_c_tcllib=`(cd ${with_tcllib}; pwd)`/lib$installedtcllibroot.a - elif test -f "${with_tcllib}/libtcl.a" ; then - ac_cv_c_tcllib=`(cd ${with_tcllib}; pwd)`/libtcl.a - else - { echo "configure: error: ${with_tcllib} directory doesn't contain libraries" 1>&2; exit 1; } - fi - fi - # then check for a private Tcl library - # Since these are uninstalled, use the simple lib name root. - if test x"${ac_cv_c_tcllib}" = x ; then - for i in \ - ../tcl \ - `ls -dr ../tcl[0-9]* 2>/dev/null` \ - ../../tcl \ - `ls -dr ../../tcl[0-9]* 2>/dev/null` \ - ../../../tcl \ - `ls -dr ../../../tcl[0-9]* 2>/dev/null` ; do - # Tcl 7.5 and greater puts library in subdir. Look there first. - if test -f "$i/unix/libtcl.so" ; then - ac_cv_c_tcllib=`(cd $i; pwd)`/unix/libtcl.so - break - elif test -f "$i/unix/libtcl.a" -o -f "$i/unix/Makefile"; then - ac_cv_c_tcllib=`(cd $i; pwd)`/unix/libtcl.a - break - # look for a freshly built dynamically linked library - elif test -f "$i/libtcl.so" ; then - ac_cv_c_tcllib=`(cd $i; pwd)`/libtcl.so - break - - # then look for a freshly built statically linked library - # if Makefile exists we assume its configured and libtcl will be - # built first. - elif test -f "$i/libtcl.a" -o -f "$i/Makefile" ; then - ac_cv_c_tcllib=`(cd $i; pwd)`/libtcl.a - break - fi - done - fi - # check in a few common install locations - if test x"${ac_cv_c_tcllib}" = x ; then - for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do - # first look for a freshly built dynamically linked library - if test -f "$i/lib$installedtcllibroot.so" ; then - ac_cv_c_tcllib=`(cd $i; pwd)`/lib$installedtcllibroot.so - break - # then look for a freshly built statically linked library - # if Makefile exists we assume its configured and libtcl will be built first. - elif test -f "$i/lib$installedtcllibroot.a" -o -f "$i/Makefile" ; then - ac_cv_c_tcllib=`(cd $i; pwd)`/lib$installedtcllibroot.a - break - fi - done - fi - # check in a few other private locations - if test x"${ac_cv_c_tcllib}" = x ; then - for i in \ - ${srcdir}/../tcl \ - `ls -dr ${srcdir}/../tcl[0-9]* 2>/dev/null` ; do - # Tcl 7.5 and greater puts library in subdir. Look there first. - if test -f "$i/unix/libtcl.so" ; then - ac_cv_c_tcllib=`(cd $i; pwd)`/unix/libtcl.so - break - elif test -f "$i/unix/libtcl.a" -o -f "$i/unix/Makefile"; then - ac_cv_c_tcllib=`(cd $i; pwd)`/unix/libtcl.a - break - # look for a freshly built dynamically linked library - elif test -f "$i/libtcl.so" ; then - ac_cv_c_tcllib=`(cd $i; pwd)`/libtcl.so - break - - # then look for a freshly built statically linked library - # if Makefile exists we assume its configured and libtcl will be - # built first. - elif test -f "$i/libtcl.a" -o -f "$i/Makefile" ; then - ac_cv_c_tcllib=`(cd $i; pwd)`/libtcl.a - break - fi - done - fi - - # see if one is conveniently installed with the compiler - if test x"${ac_cv_c_tcllib}" = x ; then - orig_libs="$LIBS" - LIBS="$LIBS -l$installedtcllibroot -lm" - if test "$cross_compiling" = yes; then - ac_cv_c_tclib="-l$installedtcllibroot" -else -cat > conftest.$ac_ext <<EOF -#line 2708 "configure" -#include "confdefs.h" - - Tcl_AppInit() - { exit(0); } -EOF -{ (eval echo configure:2714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then - ac_cv_c_tcllib="-l$installedtcllibroot" -else - ac_cv_c_tcllib="" - -fi -fi -rm -fr conftest* - LIBS="${orig_libs}" - fi - -fi - - if test x"${ac_cv_c_tcllib}" = x ; then - TCLLIB="# no Tcl library found" - echo "configure: warning: Can't find Tcl library" 1>&2 - else - TCLLIB=${ac_cv_c_tcllib} - echo "$ac_t""found $TCLLIB" 1>&6 - no_tcl= - fi -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 @@ -2751,8 +2291,9 @@ fi # recursive cache variables for the path will work right. We check all # the possible paths in one loop rather than many seperate loops to speed # things up. -# the alternative search directory is invoked by --with-tkinclude +# the alternative search directory is involked by --with-tkinclude # +no_tk=true echo $ac_n "checking for Tk private headers""... $ac_c" 1>&6 # Check whether --with-tkinclude or --without-tkinclude was given. if test "${with_tkinclude+set}" = set; then @@ -2760,7 +2301,6 @@ if test "${with_tkinclude+set}" = set; then with_tkinclude=${withval} fi -no_tk=true if eval "test \"`echo '$''{'ac_cv_c_tkh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2769,63 +2309,67 @@ else if test x"${with_tkinclude}" != x ; then if test -f ${with_tkinclude}/tk.h ; then ac_cv_c_tkh=`(cd ${with_tkinclude}; pwd)` + elif test -f ${with_tkinclude}/generic/tk.h ; then + ac_cv_c_tkh=`(cd ${with_tkinclude}/generic; pwd)` else { echo "configure: error: ${with_tkinclude} directory doesn't contain private headers" 1>&2; exit 1; } fi fi + +# next check if it came with Tk configuration file +if test x"${ac_cv_c_tkconfig}" = x ; then + if test -f $ac_cv_c_tkconfig/../generic/tk.h ; then + ac_cv_c_tkh=`(cd $ac_cv_c_tkconfig/..; pwd)` + fi +fi + # next check in private source directory # -# since ls returns lowest version numbers first, reverse the entire list -# and search for the worst fit, overwriting it with better fits as we find them +# since ls returns lowest version numbers first, reverse its output if test x"${ac_cv_c_tkh}" = x ; then for i in \ ${srcdir}/../tk \ - `ls -dr ${srcdir}/../tk[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tk[4-9]* 2>/dev/null` \ ${srcdir}/../../tk \ - `ls -dr ${srcdir}/../../tk[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../../tk[4-9]* 2>/dev/null` \ ${srcdir}/../../../tk \ - `ls -dr ${srcdir}/../../../tk[0-9]* 2>/dev/null ` ; do - if test -f $i/tk.h ; then - ac_cv_c_tkh=`(cd $i; pwd)` + `ls -dr ${srcdir}/../../../tk[4-9]* 2>/dev/null ` ; do + if test -f $i/generic/tk.h ; then + ac_cv_c_tkh=`(cd $i/generic; pwd)` break fi - # Tk 4.1 and greater puts this in a subdir. - if test -f $i/generic/tk.h; then - ac_cv_c_tkh=`(cd $i; pwd)`/generic - fi done fi # finally check in a few common install locations # -# since ls returns lowest version numbers first, reverse the entire list -# and search for the worst fit, overwriting it with better fits as we find them +# since ls returns lowest version numbers first, reverse its output if test x"${ac_cv_c_tkh}" = x ; then for i in \ - `ls -dr /usr/local/src/tk[0-9]* 2>/dev/null` \ - `ls -dr /usr/local/lib/tk[0-9]* 2>/dev/null` \ + `ls -dr /usr/local/src/tk[4-9]* 2>/dev/null` \ + `ls -dr /usr/local/lib/tk[4-9]* 2>/dev/null` \ /usr/local/src/tk \ /usr/local/lib/tk \ ${prefix}/include ; do - if test -f $i/tk.h ; then - ac_cv_c_tkh=`(cd $i; pwd)` + if test -f $i/generic/tk.h ; then + ac_cv_c_tkh=`(cd $i/generic; pwd)` break fi done fi # see if one is installed if test x"${ac_cv_c_tkh}" = x ; then - ac_safe=`echo "tk.h" | tr './\055' '___'` + ac_safe=`echo "tk.h" | tr './\055' '___'` echo $ac_n "checking for tk.h""... $ac_c" 1>&6 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 2824 "configure" +#line 2368 "configure" #include "confdefs.h" #include <tk.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2373: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2842,6 +2386,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ac_cv_c_tkh=installed else echo "$ac_t""no" 1>&6 +ac_cv_c_tkh="" fi fi @@ -2854,7 +2399,7 @@ if test x"${ac_cv_c_tkh}" != x ; then echo "$ac_t""is installed" 1>&6 TKHDIR="" else - echo "$ac_t""found in $ac_cv_c_tkh" 1>&6 + echo "$ac_t""found in ${ac_cv_c_tkh}" 1>&6 # this hack is cause the TKHDIR won't print if there is a "-I" in it. TKHDIR="-I${ac_cv_c_tkh}" fi @@ -2864,373 +2409,18 @@ else no_tk=true fi -# if Tk is installed, extract the major/minor version -if test x"${no_tk}" = x ; then -echo $ac_n "checking Tk version""... $ac_c" 1>&6 -orig_includes="$CPPFLAGS" -if test x"${TCLHDIR}" != x ; then - CPPFLAGS="$CPPFLAGS $TCLHDIR" -fi -if test x"${TKHDIR}" != x ; then - CPPFLAGS="$CPPFLAGS $TKHDIR" -fi -if test x"${x_includes}" != x -a x"${x_includes}" != xNONE ; then - CPPFLAGS="$CPPFLAGS -I$x_includes" -fi -# Get major and minor versions of Tk. Use funny names to avoid -# clashes with eg SunOS. -cat > conftest.c <<'EOF' -#include "tk.h" -MaJor = TK_MAJOR_VERSION -MiNor = TK_MINOR_VERSION -EOF - -tkmajor= -tkminor= -if (eval "$CPP $CPPFLAGS conftest.c") 2>/dev/null >conftest.out; then - # Success. - tkmajor=`egrep '^MaJor = ' conftest.out | sed -e 's/^MaJor = *//' -e 's/ *$//'` - tkminor=`egrep '^MiNor = ' conftest.out | sed -e 's/^MiNor = *//' -e 's/ *$//'` -fi -rm -f conftest.c conftest.out - -if test -z "$tkmajor" || test -z "$tkminor"; then - echo "$ac_t""fatal error: could not find major or minor version number of Tk" 1>&6 - exit 1 -fi -echo "$ac_t""${tkmajor}.${tkminor}" 1>&6 - -CPPFLAGS="${orig_includes}" -fi + # Include some libraries that Tcl and Tk want. + LIBS="$LIBS $TK_LIBS" + ENABLE_GDBTK=1 - - - -# -# Ok, lets find the tk library -# First, look for the latest private (uninstalled) copy -# Notice that the destinations in backwards priority since the tests have -# no break. -# Then we look for either .a, .so, or Makefile. A Makefile is acceptable -# is it indicates the target has been configured and will (probably) -# soon be built. This allows an entire tree of Tcl software to be -# configured at once and then built. -# the alternative search directory is invoked by --with-tklib -# - -if test x"${no_tk}" = x ; then - # reset no_tk incase something fails here - no_tk="true" - - if test $tkmajor -ge 4 ; then - installedtklibroot=tk$tkversion - else - installedtkllibroot=tk - fi - - # Check whether --with-tklib or --without-tklib was given. -if test "${with_tklib+set}" = set; then - withval="$with_tklib" - with_tklib=${withval} -fi - - echo $ac_n "checking for Tk library""... $ac_c" 1>&6 - if eval "test \"`echo '$''{'ac_cv_c_tklib'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - # first check to see if --with-tklib was specified - # This requires checking for both the installed and uninstalled name-styles - # since we have no idea if it's installed or not. - if test x"${with_tklib}" != x ; then - if test -f "${with_tklib}/lib$installedtklibroot.so" ; then - ac_cv_c_tklib=`(cd ${with_tklib}; pwd)`/lib$installedtklibroot.so - no_tk="" - elif test -f "${with_tklib}/libtk.so" ; then - ac_cv_c_tklib=`(cd ${with_tklib}; pwd)`/libtk.so - no_tk="" - # then look for a freshly built statically linked library - # if Makefile exists we assume its configured and libtk will be built - elif test -f "${with_tklib}/lib$installedtklibroot.a" ; then - ac_cv_c_tklib=`(cd ${with_tklib}; pwd)`/lib$installedtklibroot.a - no_tk="" - elif test -f "${with_tklib}/libtk.a" ; then - ac_cv_c_tklib=`(cd ${with_tklib}; pwd)`/libtk.a - no_tk="" - else - { echo "configure: error: ${with_tklib} directory doesn't contain libraries" 1>&2; exit 1; } + TCL_LIBS='$(TCL) $(TK) $(X11_LDFLAGS) $(X11_LIBS)' + ENABLE_CLIBS="${ENABLE_CLIBS} ${TCL_LIBS}" + ENABLE_OBS="${ENABLE_OBS} gdbtk.o" fi - fi - # then check for a private Tk library - # Since these are uninstalled, use the simple lib name root. - if test x"${ac_cv_c_tklib}" = x ; then - for i in \ - ../tk \ - `ls -dr ../tk[0-9]* 2>/dev/null` \ - ../../tk \ - `ls -dr ../../tk[0-9]* 2>/dev/null` \ - ../../../tk \ - `ls -dr ../../../tk[0-9]* 2>/dev/null` ; do - # Tk 4.1 and greater puts things in subdirs. Check these first. - if test -f "$i/unix/libtk.so" ; then - ac_cv_c_tklib=`(cd $i; pwd)`/unix/libtk.so - no_tk= - break - elif test -f "$i/unix/libtk.a" -o -f "$i/unix/Makefile"; then - ac_cv_c_tklib=`(cd $i; pwd)`/unix/libtk.a - no_tk= - break - # look for a freshly built dynamically linked library - elif test -f "$i/libtk.so" ; then - ac_cv_c_tklib=`(cd $i; pwd)`/libtk.so - no_tk= - break - # then look for a freshly built statically linked library - # if Makefile exists we assume its configured and libtk will be built - elif test -f "$i/libtk.a" -o -f "$i/Makefile" ; then - ac_cv_c_tklib=`(cd $i; pwd)`/libtk.a - no_tk="" - break - fi - done - fi - # finally check in a few common install locations - if test x"${ac_cv_c_tklib}" = x ; then - for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do - # first look for a freshly built dynamically linked library - if test -f "$i/lib$installedtklibroot.so" ; then - ac_cv_c_tklib=`(cd $i; pwd)`/lib$installedtklibroot.so - no_tk="" - break - # then look for a freshly built statically linked library - # if Makefile exists, we assume it's configured and libtcl will be built - elif test -f "$i/lib$installedtklibroot.a" -o -f "$i/Makefile" ; then - ac_cv_c_tklib=`(cd $i; pwd)`/lib$installedtklibroot.a - no_tk="" - break - fi - done - fi - # check in a few other private locations - if test x"${ac_cv_c_tklib}" = x ; then - for i in \ - ${srcdir}/../tk \ - `ls -dr ${srcdir}/../tk[0-9]* 2>/dev/null` ; do - # Tk 4.1 and greater puts things in subdirs. Check these first. - if test -f "$i/unix/libtk.so" ; then - ac_cv_c_tklib=`(cd $i; pwd)`/unix/libtk.so - no_tk= - break - elif test -f "$i/unix/libtk.a" -o -f "$i/unix/Makefile"; then - ac_cv_c_tcllib=`(cd $i; pwd)`/unix/libtk.a - no_tk= - break - # look for a freshly built dynamically linked library - elif test -f "$i/libtk.so" ; then - ac_cv_c_tklib=`(cd $i; pwd)`/libtk.so - no_tk="" - break - # then look for a freshly built statically linked library - # if Makefile exists, we assume it's configured and libtcl will be built - elif test -f "$i/libtk.a" -o -f "$i/Makefile" ; then - ac_cv_c_tklib=`(cd $i; pwd)`/libtk.a - no_tk="" - break - fi - done - fi - # see if one is conveniently installed with the compiler - if test x"${ac_cv_c_tklib}" = x ; then - - orig_libs="$LIBS" - LIBS="$LIBS -l$installedtklibroot $x_libraries $ac_cv_c_tcllib -lm" - if test "$cross_compiling" = yes; then - ac_cv_c_tklib="-l$installedtklibroot" -else -cat > conftest.$ac_ext <<EOF -#line 3056 "configure" -#include "confdefs.h" - - Tcl_AppInit() - { exit(0); } -EOF -{ (eval echo configure:3062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then - ac_cv_c_tklib="-l$installedtklibroot" -else - ac_cv_c_tklib="" - -fi -fi -rm -fr conftest* - LIBS="${orig_libs}" - fi - -fi - - if test x"${ac_cv_c_tklib}" = x ; then - TKLIB="# no Tk library found" - echo "configure: warning: Can't find Tk library" 1>&2 - else - TKLIB=$ac_cv_c_tklib - echo "$ac_t""found $TKLIB" 1>&6 - no_tk= - fi -fi - - - - - - # Look for dynamic linking libraries that Tcl might need. This is - # only done for Tcl 7.5 and greater. It would be good to look for and - # use the "configInfo" file that Tcl generates, but for now that is - # beyond us. - if test $tclmajor -ge 7 -a $tclminor -ge 5 ; then - echo $ac_n "checking for -ldl""... $ac_c" 1>&6 -ac_lib_var=`echo dl'_'main | tr './+\055' '__p_'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ldl $LIBS" -cat > conftest.$ac_ext <<EOF -#line 3103 "configure" -#include "confdefs.h" - -int main() { return 0; } -int t() { -main() -; return 0; } -EOF -if { (eval echo configure:3111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo dl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF - - LIBS="-ldl $LIBS" - -else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for -ldld""... $ac_c" 1>&6 -ac_lib_var=`echo dld'_'main | tr './+\055' '__p_'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ldld $LIBS" -cat > conftest.$ac_ext <<EOF -#line 3141 "configure" -#include "confdefs.h" - -int main() { return 0; } -int t() { -main() -; return 0; } -EOF -if { (eval echo configure:3149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo dld | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF - - LIBS="-ldld $LIBS" - -else - echo "$ac_t""no" 1>&6 -fi - -fi - - fi - - ENABLE_GDBTK=1 - - if test "x$no_x" != "xyes"; then - if test "x$x_includes" != "x" ; - then - X_CFLAGS="-I$x_includes" - else - X_CFLAGS="" - fi - - if test "x$x_libraries" != "x" ; - then - X_LDFLAGS="-L$x_libraries" - else - X_LDFLAGS="" - fi - - case "$host" in -# -# gdb linked statically w/ Solaris iff GCC is used, otherwise dynamic -# - sparc*-sun-solaris2*) - if test "x$GCC" = "xyes"; - then - X_LIBS="-Wl,-Bstatic -lX11 -lXext -lX11 -Wl,-Bdynamic -ldl -lw" - else - if test "x$x_libraries" != "x" ; - then - X_LDFLAGS="$X_LDFLAGS -R$x_libraries" - fi - X_LIBS="-lX11 -lXext -lX11" - fi ;; -# -# gdb linked statically w/ SunOS or HPUX -# - m68k-hp-hpux*|hppa*-hp-hpux*|sparc-sun-sunos*) - if test "x$x_libraries" != "x" ; - then - X_LIBS="$x_libraries/libX11.a" - else - X_LIBS="/usr/lib/libX11.a" - fi ;; -# -# default is to link dynamically -# - *) - X_LIBS="-lX11" ;; - esac - else - X_LDLAGS="" - X_CFLAGS="" - X_LIBS="" - echo "configure: warning: No X based programs will be built" 1>&2 - fi - - TCL_LIBS='$(TCL) $(TK) $(X11_LDFLAGS) $(X11_LIBS)' - ENABLE_CLIBS="${ENABLE_CLIBS} ${TCL_LIBS} -lm" - ENABLE_OBS="${ENABLE_OBS} gdbtk.o" fi @@ -3854,16 +3044,35 @@ s%@target_vendor@%$target_vendor%g s%@target_os@%$target_os%g s%@THREAD_DB_OBS@%$THREAD_DB_OBS%g s%@CONFIG_LDFLAGS@%$CONFIG_LDFLAGS%g -s%@X_CFLAGS@%$X_CFLAGS%g -s%@X_PRE_LIBS@%$X_PRE_LIBS%g -s%@X_LIBS@%$X_LIBS%g -s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g +s%@TCL_VERSION@%$TCL_VERSION%g +s%@TCL_MAJOR_VERSION@%$TCL_MAJOR_VERSION%g +s%@TCL_MINOR_VERSION@%$TCL_MINOR_VERSION%g +s%@TCL_CC@%$TCL_CC%g +s%@TCL_DEFS@%$TCL_DEFS%g +s%@TCL_SHLIB_CFLAGS@%$TCL_SHLIB_CFLAGS%g +s%@TCL_SHLIB_LD@%$TCL_SHLIB_LD%g +s%@TCL_SHLIB_LD_LIBS@%$TCL_SHLIB_LD_LIBS%g +s%@TCL_SHLIB_SUFFIX@%$TCL_SHLIB_SUFFIX%g +s%@TCL_DL_LIBS@%$TCL_DL_LIBS%g +s%@TCL_LD_FLAGS@%$TCL_LD_FLAGS%g +s%@TCL_LD_SEARCH_FLAGS@%$TCL_LD_SEARCH_FLAGS%g +s%@TCL_COMPAT_OBJS@%$TCL_COMPAT_OBJS%g +s%@TCL_RANLIB@%$TCL_RANLIB%g +s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g +s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g +s%@TCL_LIB_VERSIONS_OK@%$TCL_LIB_VERSIONS_OK%g +s%@TK_VERSION@%$TK_VERSION%g +s%@TK_DEFS@%$TK_DEFS%g +s%@TK_XINCLUDES@%$TK_XINCLUDES%g +s%@TK_XLIBSW@%$TK_XLIBSW%g +s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g +s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g s%@TCLHDIR@%$TCLHDIR%g -s%@TCLLIB@%$TCLLIB%g s%@TKHDIR@%$TKHDIR%g -s%@TKLIB@%$TKLIB%g s%@ENABLE_GDBTK@%$ENABLE_GDBTK%g +s%@X_CFLAGS@%$X_CFLAGS%g s%@X_LDFLAGS@%$X_LDFLAGS%g +s%@X_LIBS@%$X_LIBS%g s%@ENABLE_CFLAGS@%$ENABLE_CFLAGS%g s%@ENABLE_CLIBS@%$ENABLE_CLIBS%g s%@ENABLE_OBS@%$ENABLE_OBS%g diff --git a/gdb/configure.in b/gdb/configure.in index 62464d5..90423e6 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -228,78 +228,26 @@ case "$host" in if test "${enable_gdbtk}" = "yes"; then - AC_PATH_X - AC_PATH_XTRA - - CY_AC_PATH_TCL - CY_AC_PATH_TK - - # Look for dynamic linking libraries that Tcl might need. This is - # only done for Tcl 7.5 and greater. It would be good to look for and - # use the "configInfo" file that Tcl generates, but for now that is - # beyond us. - if test $tclmajor -ge 7 -a $tclminor -ge 5 ; then - AC_CHECK_LIB(dl, main, , AC_CHECK_LIB(dld, main)) - fi + CY_AC_PATH_TCLCONFIG + 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 + + # Include some libraries that Tcl and Tk want. + LIBS="$LIBS $TK_LIBS" + + ENABLE_GDBTK=1 - ENABLE_GDBTK=1 - - if test "x$no_x" != "xyes"; then - if test "x$x_includes" != "x" ; - then - X_CFLAGS="-I$x_includes" - else - X_CFLAGS="" - fi - - if test "x$x_libraries" != "x" ; - then - X_LDFLAGS="-L$x_libraries" - else - X_LDFLAGS="" - fi - - case "$host" in -# -# gdb linked statically w/ Solaris iff GCC is used, otherwise dynamic -# - sparc*-sun-solaris2*) - if test "x$GCC" = "xyes"; - then - X_LIBS="-Wl,-Bstatic -lX11 -lXext -lX11 -Wl,-Bdynamic -ldl -lw" - else - if test "x$x_libraries" != "x" ; - then - X_LDFLAGS="$X_LDFLAGS -R$x_libraries" - fi - X_LIBS="-lX11 -lXext -lX11" - fi ;; -# -# gdb linked statically w/ SunOS or HPUX -# - m68k-hp-hpux*|hppa*-hp-hpux*|sparc-sun-sunos*) - if test "x$x_libraries" != "x" ; - then - X_LIBS="$x_libraries/libX11.a" - else - X_LIBS="/usr/lib/libX11.a" - fi ;; -# -# default is to link dynamically -# - *) - X_LIBS="-lX11" ;; - esac - else - X_LDLAGS="" - X_CFLAGS="" - X_LIBS="" - AC_MSG_WARN([No X based programs will be built]) + TCL_LIBS='$(TCL) $(TK) $(X11_LDFLAGS) $(X11_LIBS)' + ENABLE_CLIBS="${ENABLE_CLIBS} ${TCL_LIBS}" + ENABLE_OBS="${ENABLE_OBS} gdbtk.o" fi - - TCL_LIBS='$(TCL) $(TK) $(X11_LDFLAGS) $(X11_LIBS)' - ENABLE_CLIBS="${ENABLE_CLIBS} ${TCL_LIBS} -lm" - ENABLE_OBS="${ENABLE_OBS} gdbtk.o" fi AC_SUBST(ENABLE_GDBTK) diff --git a/gdb/gdbtk.c b/gdb/gdbtk.c index b6a2ea7..1237ef5 100644 --- a/gdb/gdbtk.c +++ b/gdb/gdbtk.c @@ -97,10 +97,6 @@ static void get_register PARAMS ((int, void *)); static Tcl_Interp *interp = NULL; -/* Handle for TK main window */ - -static Tk_Window mainWindow = NULL; - static int x_fd; /* X network socket */ /* This variable is true when the inferior is running. Although it's @@ -1145,10 +1141,6 @@ static void cleanup_init (ignored) int ignored; { - if (mainWindow != NULL) - Tk_DestroyWindow (mainWindow); - mainWindow = NULL; - if (interp != NULL) Tcl_DeleteInterp (interp); interp = NULL; @@ -1257,11 +1249,6 @@ gdbtk_init () if (!interp) error ("Tcl_CreateInterp failed"); - mainWindow = Tk_CreateMainWindow (interp, NULL, "gdb", "Gdb"); - - if (!mainWindow) - return; /* DISPLAY probably not set */ - if (Tcl_Init(interp) != TCL_OK) error ("Tcl_Init failed: %s", interp->result); @@ -1305,7 +1292,7 @@ gdbtk_init () /* Get the file descriptor for the X server */ - x_fd = ConnectionNumber (Tk_Display (mainWindow)); + x_fd = ConnectionNumber (Tk_Display (Tk_MainWindow (interp))); /* Setup for I/O interrupts */ |