diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/acconfig.h | 3 | ||||
| -rw-r--r-- | gdb/aclocal.m4 | 28 | ||||
| -rw-r--r-- | gdb/config.in | 6 | ||||
| -rwxr-xr-x | gdb/configure | 235 |
4 files changed, 142 insertions, 130 deletions
diff --git a/gdb/acconfig.h b/gdb/acconfig.h index bb9b991..07a0e98 100644 --- a/gdb/acconfig.h +++ b/gdb/acconfig.h @@ -7,3 +7,6 @@ /* Define if the "%Lg" format works to print long doubles. */ #undef PRINTF_HAS_LONG_DOUBLE + +/* Define if using Solaris thread debugging. */ +#undef HAVE_THREAD_DB_LIB diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4 index 52fde83..c754fdc 100644 --- a/gdb/aclocal.m4 +++ b/gdb/aclocal.m4 @@ -40,6 +40,7 @@ if test "$ac_cv_os_lynx" = "yes" ; then AC_MSG_RESULT(no) fi ]) + AC_DEFUN(CY_AC_PATH_TCLH, [ # # Ok, lets find the tcl source trees so we can use the headers @@ -77,7 +78,8 @@ if test x"${ac_cv_c_tclh}" = x ; then fi # Tcl 7.5 and greater puts headers in subdirectory. if test -f $i/generic/tclInt.h ; then - ac_cv_c_tclh=`(cd $i; pwd)`/generic + ac_cv_c_tclh=`(cd $i; pwd)`/generic + break fi done fi @@ -108,7 +110,7 @@ if test x"${ac_cv_c_tclh}" = x ; then fi if test x"${ac_cv_c_tclh}" != x ; then no_tcl="" - if test x"${ac_cv_c_tkh}" = x"installed" ; then + if test x"${ac_cv_c_tclh}" = x"installed" ; then AC_MSG_RESULT([is installed]) TCLHDIR="" else @@ -125,19 +127,20 @@ if test x"${TCLHDIR}" != x ; then CPPFLAGS="$CPPFLAGS $TCLHDIR" fi -# Get major and minor versions of Tcl. +# 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 +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/ *$//'` + 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 @@ -389,19 +392,20 @@ 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. +# 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 +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/ *$//'` + 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 diff --git a/gdb/config.in b/gdb/config.in index 340c087..29f6374 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -38,6 +38,9 @@ /* Define if the "%Lg" format works to print long doubles. */ #undef PRINTF_HAS_LONG_DOUBLE +/* Define if using Solaris thread debugging. */ +#undef HAVE_THREAD_DB_LIB + /* Define if you have the getpagesize function. */ #undef HAVE_GETPAGESIZE @@ -88,6 +91,3 @@ /* Define if you have the dl library (-ldl). */ #undef HAVE_LIBDL - -/* Define if you have the Solaris thread_db library (/usr/lib/libthread_db.so.1). */ -#undef HAVE_THREAD_DB_LIB diff --git a/gdb/configure b/gdb/configure index a9093b5..14f1561 100755 --- a/gdb/configure +++ b/gdb/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.8 -# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. +# Generated automatically using autoconf version 2.10 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -348,7 +348,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.8" + echo "configure generated by autoconf version 2.10" exit 0 ;; -with-* | --with-*) @@ -1441,6 +1441,8 @@ else which can conflict with char $ac_func(); below. */ #include <assert.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 $ac_func(); int main() { return 0; } @@ -1457,7 +1459,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1485,7 +1487,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 1489 "configure" +#line 1491 "configure" #include "confdefs.h" #include <sys/procfs.h> int main() { return 0; } @@ -1493,7 +1495,7 @@ int t() { gregset_t *gregsetp = 0 ; return 0; } EOF -if { (eval echo configure:1497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* gdb_cv_have_gregset_t=yes else @@ -1517,7 +1519,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 1521 "configure" +#line 1523 "configure" #include "confdefs.h" #include <sys/procfs.h> int main() { return 0; } @@ -1525,7 +1527,7 @@ int t() { fpregset_t *fpregsetp = 0 ; return 0; } EOF -if { (eval echo configure:1529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* gdb_cv_have_fpregset_t=yes else @@ -1550,7 +1552,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 1554 "configure" +#line 1556 "configure" #include "confdefs.h" int main() { return 0; } @@ -1558,7 +1560,7 @@ int t() { long double foo; ; return 0; } EOF -if { (eval echo configure:1562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_long_double=yes else @@ -1586,7 +1588,7 @@ else gdb_cv_printf_has_long_double=no else cat > conftest.$ac_ext <<EOF -#line 1590 "configure" +#line 1592 "configure" #include "confdefs.h" int main () { @@ -1596,7 +1598,7 @@ int main () { return (strncmp ("3.14159", buf, 7)); } EOF -{ (eval echo configure:1600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1602: \"$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 @@ -1621,12 +1623,14 @@ 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 1625 "configure" +#line 1627 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ #include <assert.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 $ac_func(); int main() { return 0; } @@ -1643,7 +1647,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1673,7 +1677,7 @@ else ac_cv_func_mmap=no else cat > conftest.$ac_ext <<EOF -#line 1677 "configure" +#line 1681 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. */ @@ -1742,7 +1746,7 @@ main() } EOF -{ (eval echo configure:1746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1750: \"$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 @@ -1928,12 +1932,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 1932 "configure" +#line 1936 "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:1937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2000,7 +2004,7 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 2004 "configure" +#line 2008 "configure" #include "confdefs.h" int main() { return 0; } @@ -2008,7 +2012,7 @@ int t() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:2012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2016: \"$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. @@ -2122,22 +2126,26 @@ else # 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 '.-/+' '___p'` +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 2133 "configure" +#line 2137 "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(); int main() { return 0; } int t() { IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:2141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2166,22 +2174,26 @@ fi # 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 '.-/+' '___p'` +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 2177 "configure" +#line 2185 "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:2185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2201,22 +2213,26 @@ 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 '.-/+' '___p'` +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 2212 "configure" +#line 2224 "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:2220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2241,22 +2257,26 @@ fi # 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 '.-/+' '___p'` +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 2252 "configure" +#line 2268 "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:2260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2280,22 +2300,26 @@ fi # 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 '.-/+' '___p'` +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 2291 "configure" +#line 2311 "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:2299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2364,7 +2388,8 @@ if test x"${ac_cv_c_tclh}" = x ; then fi # Tcl 7.5 and greater puts headers in subdirectory. if test -f $i/generic/tclInt.h ; then - ac_cv_c_tclh=`(cd $i; pwd)`/generic + ac_cv_c_tclh=`(cd $i; pwd)`/generic + break fi done fi @@ -2392,12 +2417,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 2396 "configure" +#line 2421 "configure" #include "confdefs.h" #include <tclInt.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2427,7 +2452,7 @@ if test x"${ac_cv_c_tclh}" = x ; then fi if test x"${ac_cv_c_tclh}" != x ; then no_tcl="" - if test x"${ac_cv_c_tkh}" = x"installed" ; then + if test x"${ac_cv_c_tclh}" = x"installed" ; then echo "$ac_t""is installed" 1>&6 TCLHDIR="" else @@ -2438,47 +2463,35 @@ if test x"${ac_cv_c_tclh}" != x ; then fi echo $ac_n "checking Tcl version""... $ac_c" 1>&6 -rm -rf tclmajor tclminor orig_includes="$CPPFLAGS" if test x"${TCLHDIR}" != x ; then CPPFLAGS="$CPPFLAGS $TCLHDIR" fi -if test "$cross_compiling" = yes; then - { echo "configure: error: can't be cross compiled" 1>&2; exit 1; } - -else -cat > conftest.$ac_ext <<EOF -#line 2454 "configure" -#include "confdefs.h" - -#include <stdio.h> +# Get major and minor versions of Tcl. Use funny names to avoid +# clashes with eg SunOS. +cat > conftest.c <<'EOF' #include "tcl.h" -main() { - FILE *maj = fopen("tclmajor","w"); - FILE *min = fopen("tclminor","w"); - fprintf(maj,"%d",TCL_MAJOR_VERSION); - fprintf(min,"%d",TCL_MINOR_VERSION); - fclose(maj); - fclose(min); - return 0; -} +MaJor = TCL_MAJOR_VERSION +MiNor = TCL_MINOR_VERSION EOF -{ (eval echo configure:2469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then - tclmajor=`cat tclmajor` - tclminor=`cat tclminor` - tclversion=$tclmajor.$tclminor - echo "$ac_t""$tclversion" 1>&6 - rm -f tclmajor tclminor - -else - echo "$ac_t""can't happen" 1>&6 +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 -rm -fr conftest* +echo "$ac_t""${tclmajor}.${tclminor}" 1>&6 + CPPFLAGS="${orig_includes}" @@ -2610,13 +2623,13 @@ else ac_cv_c_tclib="-l$installedtcllibroot" else cat > conftest.$ac_ext <<EOF -#line 2614 "configure" +#line 2627 "configure" #include "confdefs.h" Tcl_AppInit() { exit(0); } EOF -{ (eval echo configure:2620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:2633: \"$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 @@ -2726,12 +2739,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 2730 "configure" +#line 2743 "configure" #include "confdefs.h" #include <tk.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2773,7 +2786,6 @@ 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 -rm -rf tkmajor tkminor orig_includes="$CPPFLAGS" if test x"${TCLHDIR}" != x ; then @@ -2786,42 +2798,29 @@ if test x"${x_includes}" != x -a x"${x_includes}" != xNONE ; then CPPFLAGS="$CPPFLAGS -I$x_includes" fi -if test "$cross_compiling" = yes; then - { echo "configure: error: can't be cross compiled" 1>&2; exit 1; } - -else -cat > conftest.$ac_ext <<EOF -#line 2795 "configure" -#include "confdefs.h" - -#include <stdio.h> +# Get major and minor versions of Tk. Use funny names to avoid +# clashes with eg SunOS. +cat > conftest.c <<'EOF' #include "tk.h" - main() { - FILE *maj = fopen("tkmajor","w"); - FILE *min = fopen("tkminor","w"); - fprintf(maj,"%d",TK_MAJOR_VERSION); - fprintf(min,"%d",TK_MINOR_VERSION); - fclose(maj); - fclose(min); - return 0; -} +MaJor = TK_MAJOR_VERSION +MiNor = TK_MINOR_VERSION EOF -{ (eval echo configure:2810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then - tkmajor=`cat tkmajor` - tkminor=`cat tkminor` - tkversion=$tkmajor.$tkminor - echo "$ac_t""$tkversion" 1>&6 - rm -f tkmajor tkminor -else - { echo "configure: error: -cannot compile a simple X program - suspect your xmkmf is -misconfigured and is incorrectly reporting the location of your X -include or libraries - report this to your system admin" 1>&2; exit 1; } +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 -rm -fr conftest* +echo "$ac_t""${tkmajor}.${tkminor}" 1>&6 + CPPFLAGS="${orig_includes}" fi @@ -2972,13 +2971,13 @@ else ac_cv_c_tklib="-l$installedtklibroot" else cat > conftest.$ac_ext <<EOF -#line 2976 "configure" +#line 2975 "configure" #include "confdefs.h" Tcl_AppInit() { exit(0); } EOF -{ (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:2981: \"$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 @@ -3012,14 +3011,14 @@ fi # 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 '.-/+' '___p'` +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 3023 "configure" +#line 3022 "configure" #include "confdefs.h" int main() { return 0; } @@ -3027,7 +3026,7 @@ int t() { main() ; return 0; } EOF -if { (eval echo configure:3031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:3030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3050,14 +3049,14 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for -ldld""... $ac_c" 1>&6 -ac_lib_var=`echo dld_main | tr '.-/+' '___p'` +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 3061 "configure" +#line 3060 "configure" #include "confdefs.h" int main() { return 0; } @@ -3065,7 +3064,7 @@ int t() { main() ; return 0; } EOF -if { (eval echo configure:3069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:3068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3706,7 +3705,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.8" + echo "$CONFIG_STATUS generated by autoconf version 2.10" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -3896,7 +3895,7 @@ rm -f conftest.vals cat > conftest.hdr <<\EOF s/[\\&%]/\\&/g s%[\\$`]%\\&%g -s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp s%ac_d%ac_u%gp s%ac_u%ac_e%gp EOF @@ -3944,6 +3943,12 @@ cat >> $CONFIG_STATUS <<\EOF echo "$ac_file is unchanged" rm -f conftest.h else + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" + fi rm -f $ac_file mv conftest.h $ac_file fi |