X-Git-Url: https://repo.jachan.dev/binutils.git/blobdiff_plain/b7f3b6d5e6f3664d270873d0f4eb99ed2a1fdd69..e7dc69ffc0192b66a5c4324bed43fdb40580a6cc:/gdb/configure diff --git a/gdb/configure b/gdb/configure index c10c810a8b..200fd709ed 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.7 -# 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. @@ -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 @@ -348,7 +346,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.7" + echo "configure generated by autoconf version 2.10" exit 0 ;; -with-* | --with-*) @@ -513,12 +511,9 @@ fi ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='echo $CPP $CPPFLAGS 1>&5; -$CPP $CPPFLAGS' -ac_compile='echo ${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5; -${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='echo ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5; -${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. @@ -534,6 +529,7 @@ fi + # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 @@ -552,7 +548,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc" fi fi CC="$ac_cv_prog_CC" @@ -562,6 +557,55 @@ else echo "$ac_t""no" 1>&6 fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + ac_prog_rejected=no + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break + fi + done + IFS="$ac_save_ifs" +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# -gt 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + set dummy "$ac_dir/$ac_word" "$@" + shift + ac_cv_prog_CC="$@" + fi +fi +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then @@ -572,7 +616,7 @@ else yes; #endif EOF -if ${CC-cc} -E conftest.c 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 @@ -624,12 +668,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (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 : @@ -638,12 +683,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (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 : @@ -665,7 +711,7 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext < EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (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* @@ -830,7 +877,116 @@ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Extract the first word of "ranlib", so it can be a program name with args. + +# Make sure we can run config.sub. +if $ac_config_sub sun4 >/dev/null 2>&1; then : +else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +fi + +echo $ac_n "checking host system type""... $ac_c" 1>&6 + +host_alias=$host +case "$host_alias" in +NONE) + case $nonopt in + NONE) + if host_alias=`$ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } + fi ;; + *) host_alias=$nonopt ;; + esac ;; +esac + +host=`$ac_config_sub $host_alias` +host_cpu=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'` +echo "$ac_t""$host" 1>&6 + +echo $ac_n "checking build system type""... $ac_c" 1>&6 + +build_alias=$build +case "$build_alias" in +NONE) + case $nonopt in + NONE) build_alias=$host_alias ;; + *) build_alias=$nonopt ;; + esac ;; +esac + +build=`$ac_config_sub $build_alias` +build_cpu=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'` +build_vendor=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'` +build_os=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'` +echo "$ac_t""$build" 1>&6 + +if test $host != $build; then + ac_tool_prefix=${host_alias}- +else + ac_tool_prefix= +fi + +# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +set dummy ${ac_tool_prefix}ar; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AR="${ac_tool_prefix}ar" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar" +fi +fi +AR="$ac_cv_prog_AR" +if test -n "$AR"; then + echo "$ac_t""$AR" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + + +# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +RANLIB="$ac_cv_prog_RANLIB" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + +if test -z "$ac_cv_prog_RANLIB"; then +if test -n "$ac_tool_prefix"; then + # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then @@ -858,6 +1014,11 @@ else echo "$ac_t""no" 1>&6 fi +else + RANLIB=":" +fi +fi + for ac_prog in 'bison -y' byacc do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -891,6 +1052,38 @@ test -n "$YACC" && break done test -n "$YACC" || YACC="yacc" +for ac_prog in mawk gawk nawk awk +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AWK="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +AWK="$ac_cv_prog_AWK" +if test -n "$AWK"; then + echo "$ac_t""$AWK" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$AWK" && break +done + ac_aux_dir= for ac_dir in `cd $srcdir;pwd`/.. $srcdir/`cd $srcdir;pwd`/..; do @@ -1026,11 +1219,11 @@ else ac_cv_c_cross=yes else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_c_cross=no else @@ -1048,14 +1241,15 @@ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include #include #include EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (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* @@ -1070,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 @@ -1088,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 @@ -1109,7 +1303,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1120,7 +1314,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -eval $ac_link +{ (eval echo configure:1318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then : else @@ -1139,7 +1333,7 @@ EOF fi -for ac_hdr in limits.h memory.h string.h strings.h unistd.h termios.h termio.h sgtty.h stddef.h sys/procfs.h +for ac_hdr in limits.h memory.h string.h strings.h unistd.h termios.h termio.h sgtty.h stddef.h sys/procfs.h link.h endian.h do ac_safe=`echo "$ac_hdr" | tr './\055' '___'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -1147,11 +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 -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (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* @@ -1180,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 < #include @@ -1231,175 +1426,343 @@ EOF fi -echo $ac_n "checking for gregset_t type""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'gdb_have_gregset_t'+set}'`\" = set"; then +for ac_func in setpgid sbrk +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +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 < +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +#include +/* 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; } int t() { -gregset_t *gregsetp = 0 + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:1461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* - gdb_have_gregset_t=yes + eval "ac_cv_func_$ac_func=yes" else rm -rf conftest* - gdb_have_gregset_t=no + eval "ac_cv_func_$ac_func=no" fi rm -f conftest* fi - -echo "$ac_t""$gdb_have_gregset_t" 1>&6 -if test $gdb_have_gregset_t = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_GREGSET_T 1 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 fi +done -echo $ac_n "checking for fpregset_t type""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'gdb_have_fpregset_t'+set}'`\" = set"; then + +echo $ac_n "checking for gregset_t type""... $ac_c" 1>&6 +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 < int main() { return 0; } int t() { -fpregset_t *fpregsetp = 0 +gregset_t *gregsetp = 0 ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:1497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* - gdb_have_fpregset_t=yes + gdb_cv_have_gregset_t=yes else rm -rf conftest* - gdb_have_fpregset_t=no + gdb_cv_have_gregset_t=no fi rm -f conftest* fi -echo "$ac_t""$gdb_have_fpregset_t" 1>&6 -if test $gdb_have_fpregset_t = yes; then +echo "$ac_t""$gdb_cv_have_gregset_t" 1>&6 +if test $gdb_cv_have_gregset_t = yes; then cat >> confdefs.h <<\EOF -#define HAVE_FPREGSET_T 1 +#define HAVE_GREGSET_T 1 EOF fi - -echo $ac_n "checking for long double""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_c_long_double'+set}'`\" = set"; then +echo $ac_n "checking for fpregset_t type""... $ac_c" 1>&6 +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 < int main() { return 0; } int t() { -long double foo; +fpregset_t *fpregsetp = 0 ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* - ac_cv_c_long_double=yes + gdb_cv_have_fpregset_t=yes else rm -rf conftest* - ac_cv_c_long_double=no + gdb_cv_have_fpregset_t=no fi rm -f conftest* fi -echo "$ac_t""$ac_cv_c_long_double" 1>&6 -if test $ac_cv_c_long_double = yes; then +echo "$ac_t""$gdb_cv_have_fpregset_t" 1>&6 +if test $gdb_cv_have_fpregset_t = yes; then cat >> confdefs.h <<\EOF -#define HAVE_LONG_DOUBLE 1 +#define HAVE_FPREGSET_T 1 EOF fi -for ac_func in valloc getpagesize -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + +echo $ac_n "checking for long long support in compiler""... $ac_c" 1>&6 +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 < -/* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); int main() { return 0; } int t() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - +long long foo; +void bar () +{ + switch (foo & 2) { case 0: return; } +} ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:1567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" + gdb_cv_c_long_long=yes else rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + gdb_cv_c_long_long=no fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 +if test $gdb_cv_c_long_long = yes; then + cat >> confdefs.h <<\EOF +#define CC_HAS_LONG_LONG 1 EOF - -else - echo "$ac_t""no" 1>&6 + fi -done -echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_func_mmap'+set}'`\" = set"; then + +echo $ac_n "checking for long long support in printf""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'gdb_cv_printf_has_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then - ac_cv_func_mmap=no + gdb_cv_printf_has_long_long=no else cat > conftest.$ac_ext < -#include -#include - -#ifndef HAVE_GETPAGESIZE -# include -# ifdef EXEC_PAGESIZE -# define getpagesize() EXEC_PAGESIZE -# else +int main () { + char buf[16]; + long long l = 0x12345; + sprintf (buf, "%llx", l); + return (strcmp ("12345", buf)); +} +EOF +{ (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 + gdb_cv_printf_has_long_long=no +fi +fi +rm -fr conftest* +fi + +if test $gdb_cv_printf_has_long_long = yes; then + cat >> confdefs.h <<\EOF +#define PRINTF_HAS_LONG_LONG 1 +EOF + +fi +echo "$ac_t""$gdb_cv_printf_has_long_long" 1>&6 + + +echo $ac_n "checking for long double support in compiler""... $ac_c" 1>&6 +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 <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_long_double=yes +else + rm -rf conftest* + ac_cv_c_long_double=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_c_long_double" 1>&6 +if test $ac_cv_c_long_double = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_LONG_DOUBLE 1 +EOF + +fi + + +echo $ac_n "checking for long double support in printf""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'gdb_cv_printf_has_long_double'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + gdb_cv_printf_has_long_double=no +else +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } +if test -s conftest && (./conftest; exit) 2>/dev/null; then + gdb_cv_printf_has_long_double=yes +else + gdb_cv_printf_has_long_double=no +fi +fi +rm -fr conftest* +fi + +if test $gdb_cv_printf_has_long_double = yes; then + cat >> confdefs.h <<\EOF +#define PRINTF_HAS_LONG_DOUBLE 1 +EOF + +fi +echo "$ac_t""$gdb_cv_printf_has_long_double" 1>&6 + +for ac_func in valloc getpagesize +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +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 < +/* 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; } +int t() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +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 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* + +fi +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + +echo $ac_n "checking for working mmap""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_func_mmap'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_func_mmap=no +else +cat > conftest.$ac_ext < +#include +#include + +#ifndef HAVE_GETPAGESIZE +# include +# ifdef EXEC_PAGESIZE +# define getpagesize() EXEC_PAGESIZE +# else # ifdef NBPG # define getpagesize() NBPG * CLSIZE # ifndef CLSIZE @@ -1456,7 +1819,7 @@ main() } EOF -eval $ac_link +{ (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 @@ -1475,6 +1838,25 @@ EOF fi + + +if test ${build} = ${host} -a ${host} = ${target} ; then + echo $ac_n "checking for Solaris thread debugging library""... $ac_c" 1>&6 + if test -f /usr/lib/libthread_db.so.1 ; then + echo "$ac_t""yes" 1>&6 + THREAD_DB_OBS=sol-thread.o + cat >> confdefs.h <<\EOF +#define HAVE_THREAD_DB_LIB 1 +EOF + + CONFIG_LDFLAGS="${CONFIG_LDFLAGS} -Xlinker -export-dynamic" + else + echo "$ac_t""no" 1>&6 + fi + + +fi + ENABLE_CFLAGS= ENABLE_CLIBS= ENABLE_OBS= @@ -1537,6 +1919,9 @@ if test "${enable_gdbtk+set}" = set; then *go32*) echo "configure: warning: GDB does not support GDBtk on host ${host}. GDBtk will be disabled." 1>&2 enable_gdbtk=no ;; + *cygwin32*) + echo "configure: warning: GDB does not support GDBtk on host ${host}. GDBtk will be disabled." 1>&2 + enable_gdbtk=no ;; *) enable_gdbtk=yes ;; esac ;; @@ -1547,10 +1932,12 @@ if test "${enable_gdbtk+set}" = set; then esac else -# Default is on for everything but go32 +# Default is on for everything but go32 and cygwin32 case "$host" in *go32*) ;; + *cygwin32*) + ;; *) enable_gdbtk=yes ;; esac @@ -1560,440 +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 -if test "x$with_x" = xno; then - no_x=yes -else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - no_x= - else -if eval "test \"`echo '$''{'ac_cv_path_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. -no_x=yes -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 - no_x= - # 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 "$no_x" = yes; then -test -z "$x_direct_test_library" && x_direct_test_library=Xt -test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc -test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h -cat > conftest.$ac_ext < -EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -ac_err=`grep -v '^ *+' conftest.out` -if test -z "$ac_err"; then - rm -rf conftest* - no_x= ac_x_includes= -else - echo "$ac_err" >&5 - rm -rf conftest* - 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 - no_x= ac_x_includes=$ac_dir - break + # 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 -fi -rm -f conftest* - -# Check for the libraries. -# 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 </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 -rm -f conftest* -fi -if test "$no_x" = yes; then - ac_cv_path_x="no_x=yes" -else - ac_cv_path_x="no_x= ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" -fi -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 - eval "$ac_cv_path_x" -fi # $with_x != no - -if test "$no_x" = yes; then - echo "$ac_t""no" 1>&6 -else - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - ac_cv_path_x="no_x= 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" - fi + + . $TCLCONFIG - # 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 - 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 | tr '.-/+' '___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 <&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 | tr '.-/+' '___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 <&6 - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -else - echo "$ac_t""no" 1>&6 +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 - if test $ac_cv_lib_dnet = no; then - echo $ac_n "checking for -ldnet_stub""... $ac_c" 1>&6 -ac_lib_var=`echo dnet_stub | tr '.-/+' '___p'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + 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 - ac_save_LIBS="$LIBS" -LIBS="-ldnet_stub $LIBS" -cat > conftest.$ac_ext <&6 - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -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 | tr '.-/+' '___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 </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 | tr '.-/+' '___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 <&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 @@ -2017,28 +2177,34 @@ 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 fi @@ -2047,278 +2213,73 @@ 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 fi # see if one is installed -if test x"${ac_cv_c_tclh}" = x ; then - ac_safe=`echo "tclInt.h" | tr './\055' '___'` -echo $ac_n "checking for tclInt.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 -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -ac_err=`grep -v '^ *+' conftest.out` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_cv_c_tclh=installed -else - echo "$ac_t""no" 1>&6 -ac_cv_c_tclh="" -fi - -fi - -fi - -if test x"${ac_cv_c_tclh}" = x ; then - TCLHDIR="# no Tcl private headers found" - { echo "configure: error: Can't find Tcl private headers" 1>&2; exit 1; } -fi -if test x"${ac_cv_c_tclh}" != x ; then - no_tcl="" - if test x"${ac_cv_c_tkh}" = x"installed" ; then - echo "$ac_t""is installed" 1>&6 - TCLHDIR="" - else - echo "$ac_t""found in ${ac_cv_c_tclh}" 1>&6 - # this hack is cause the TCLHDIR won't print if there is a "-I" in it. - TCLHDIR="-I${ac_cv_c_tclh}" - fi -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 < -#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; -} -EOF -eval $ac_link -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 - -fi -fi -rm -fr conftest* -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" +if test x"${ac_cv_c_tclh}" = x ; then + ac_safe=`echo "tclInt.h" | tr './\055' '___'` +echo $ac_n "checking for tclInt.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 < conftest.$ac_ext < EOF -eval $ac_link -if test -s conftest && (./conftest; exit) 2>/dev/null; then - ac_cv_c_tcllib="-l$installedtcllibroot" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (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* + eval "ac_cv_header_$ac_safe=yes" else - ac_cv_c_tcllib="" - + echo "$ac_err" >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi +rm -f conftest* fi -rm -fr conftest* - LIBS="${orig_libs}" - fi - +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_cv_c_tclh=installed +else + echo "$ac_t""no" 1>&6 +ac_cv_c_tclh="" 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 +fi +if test x"${ac_cv_c_tclh}" = x ; then + TCLHDIR="# no Tcl private headers found" + { echo "configure: error: Can't find Tcl private headers" 1>&2; exit 1; } +fi +if test x"${ac_cv_c_tclh}" != x ; then + no_tcl="" + if test x"${ac_cv_c_tclh}" = x"installed" ; then + echo "$ac_t""is installed" 1>&6 + TCLHDIR="" + else + echo "$ac_t""found in ${ac_cv_c_tclh}" 1>&6 + # this hack is cause the TCLHDIR won't print if there is a "-I" in it. + TCLHDIR="-I${ac_cv_c_tclh}" + 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 @@ -2330,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 @@ -2339,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 @@ -2348,62 +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 -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (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* @@ -2420,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 @@ -2432,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 @@ -2442,387 +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 -rm -rf tkmajor tkminor -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 - -if test "$cross_compiling" = yes; then - { echo "configure: error: can't be cross compiled" 1>&2; exit 1; } - -else -cat > conftest.$ac_ext < -#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; -} -EOF -eval $ac_link -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; } -fi -fi -rm -fr conftest* -CPPFLAGS="${orig_includes}" -fi - - - - - - -# -# 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; } - 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 </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 | tr '.-/+' '___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 <&6 - ac_tr_lib=HAVE_LIB`echo dl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -echo $ac_n "checking for -ldld""... $ac_c" 1>&6 -ac_lib_var=`echo dld | tr '.-/+' '___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 <&6 - ac_tr_lib=HAVE_LIB`echo dld | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -fi -fi - fi + # 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="" - echo "configure: warning: No X based programs will be built" 1>&2 + 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 @@ -2872,6 +2470,7 @@ a29k-*-*) gdb_host=ultra3 ;; alpha-*-osf1*) gdb_host=alpha-osf1 ;; alpha-*-osf2*) gdb_host=alpha-osf2 ;; alpha-*-osf[3456789]*) gdb_host=alpha-osf3 ;; +alpha-*-linux*) gdb_host=alpha-linux ;; arm-*-*) gdb_host=arm ;; @@ -2896,7 +2495,9 @@ i[3456]86-*-linux*) gdb_host=linux ;; i[3456]86-*-lynxos*) gdb_host=i386lynx ;; i[3456]86-*-mach3*) gdb_host=i386m3 ;; i[3456]86-*-mach*) gdb_host=i386mach ;; +i[3456]86-*-gnu*) gdb_host=i386gnu ;; i[3456]86-*-osf1mk*) gdb_host=osf1mk ;; +i[3456]86-*-sco3.2v5*) gdb_host=i386sco5 ;; i[3456]86-*-sco3.2v4*) gdb_host=i386sco4 ;; i[3456]86-*-sco*) gdb_host=i386sco ;; i[3456]86-*-solaris*) gdb_host=i386sol2 ;; @@ -2959,6 +2560,8 @@ ns32k-utek-sysv*) gdb_host=merlin ;; powerpc-*-aix*) gdb_host=aix ;; powerpcle-*-cygwin32) gdb_host=cygwin32 ;; +powerpcle-*-solaris*) gdb_host=solaris ;; +powerpc-*-linux*) gdb_host=linux ;; pn-*-*) gdb_host=pn ;; pyramid-*-*) gdb_host=pyramid ;; @@ -3024,6 +2627,7 @@ a29k-*-udi*) gdb_target=a29k-udi ;; a29k-*-vxworks*) gdb_target=vx29k ;; alpha-*-osf*) gdb_target=alpha-osf1 ;; +alpha-*-linux*) gdb_target=alpha-linux ;; # start-sanitize-arc arc-*-*) gdb_target=arc ;; @@ -3039,10 +2643,6 @@ h8500-*-*) gdb_target=h8500 ;; sh-*-*) gdb_target=sh ;; -# start-sanitize-r16 -r16-*-*) gdb_target=r16 ;; -# end-sanitize-r16 - hppa*-*-bsd*) gdb_target=hppabsd ;; hppa*-*-pro*) gdb_target=hppapro ;; hppa*-*-hpux*) gdb_target=hppahpux ;; @@ -3069,17 +2669,21 @@ i[3456]86-*-sunos*) gdb_target=sun386 ;; i[3456]86-*-sysv4*) gdb_target=i386v4 ;; i[3456]86-*-sco*) gdb_target=i386v ;; i[3456]86-*-sysv*) gdb_target=i386v ;; -i[3456]86-*-linux*) gdb_target=linux ;; +i[3456]86-*-linux*) gdb_target=linux + configdirs="${configdirs} gdbserver" ;; i[3456]86-*-isc*) gdb_target=i386v ;; i[3456]86-*-mach3*) gdb_target=i386m3 ;; i[3456]86-*-mach*) gdb_target=i386mach ;; +i[3456]86-*-gnu*) gdb_target=i386gnu ;; i[3456]86-*-netware*) gdb_target=i386nw configdirs="${configdirs} nlm" ;; i[3456]86-*-osf1mk*) gdb_target=i386mk ;; i[3456]86-*-cygwin32) gdb_target=cygwin32 ;; i960-*-bout*) gdb_target=vxworks960 ;; -i960-*-coff*) gdb_target=nindy960 ;; -i960-*-elf*) gdb_target=nindy960 ;; +i960-nindy-coff*) gdb_target=nindy960 ;; +i960-*-coff*) gdb_target=mon960 ;; +i960-nindy-elf*) gdb_target=nindy960 ;; +i960-*-elf*) gdb_target=mon960 ;; i960-*-nindy*) gdb_target=nindy960 ;; i960-*-vxworks*) gdb_target=vxworks960 ;; @@ -3130,6 +2734,8 @@ mips64*el-*-ecoff*) gdb_target=embedl64 ;; mips64*-*-ecoff*) gdb_target=embed64 ;; mips64*vr4300*el-*-elf*) gdb_target=vr4300el ;; mips64*vr4300*-*-elf*) gdb_target=vr4300 ;; +mips64*vr4100*el-*-elf*) gdb_target=vr4300el ;; +mips64*vr4100*-*-elf*) gdb_target=vr4300 ;; mips64*el-*-elf*) gdb_target=embedl64 ;; mips64*-*-elf*) gdb_target=embed64 ;; mips*el-*-ecoff*) gdb_target=embedl ;; @@ -3147,6 +2753,7 @@ mips*-*-mach3*) gdb_target=mach3 ;; mips*-*-sysv4*) gdb_target=mipsv4 ;; mips*-*-sysv*) gdb_target=bigmips ;; mips*-*-riscos*) gdb_target=bigmips ;; +mips*-*-vxworks*) gdb_target=vxmips ;; none-*-*) gdb_target=none ;; @@ -3165,12 +2772,15 @@ powerpc-*-netware*) gdb_target=ppc-nw powerpc-*-aix4*) gdb_target=aix4 ;; powerpc-*-aix*) gdb_target=aix ;; powerpcle-*-cygwin32) gdb_target=cygwin32 ;; -powerpc-*-eabi*) if test x"$powerpc_sim" = x"yes"; then +powerpcle-*-solaris*) gdb_target=solaris ;; +powerpc-*-eabi* | powerpc-*-linux* | powerpc-*-sysv* | powerpc-*-elf*) + if test x"$powerpc_sim" = x"yes"; then gdb_target=ppc-sim else gdb_target=ppc-eabi fi ;; -powerpcle-*-eabi*) if test x"$powerpc_sim" = x"yes"; then +powerpcle-*-eabi* | powerpcle-*-sysv* | powerpcle-*-elf*) + if test x"$powerpc_sim" = x"yes"; then gdb_target=ppcle-sim else gdb_target=ppcle-eabi @@ -3193,10 +2803,14 @@ sparc-*-sunos4*) gdb_target=sun4os4 ;; sparc-*-sunos5*) gdb_target=sun4sol2 ;; sparc-*-vxworks*) gdb_target=vxsparc ;; sparc-*-*) gdb_target=sun4os4 ;; -# Use sparc-em for sparclet for now. -sparclet-*-*) gdb_target=sparc-em ;; +sparclet-*-*) gdb_target=sparclet;; sparclite*-*-*) gdb_target=sparclite ;; -sparc64-*-solaris2*) gdb_target=sp64sol2 ;; +# It's not clear what the right solution for "v8plus" systems is yet. +# For now, stick with sparc-sun-solaris2 since that's what config.guess +# should return. Work is still needed to get gdb to print the 64 bit +# regs (some of which are usable in v8plus) so sp64sol.mt hasn't been +# deleted though presumably it should be eventually. +#sparc64-*-solaris2*) gdb_target=sp64sol2 ;; sparc64-*-*) gdb_target=sp64 ;; tahoe-*-*) gdb_target=tahoe ;; @@ -3337,19 +2951,7 @@ fi trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs - +DEFS=-DHAVE_CONFIG_H # Without the "./", some shells look in PATH for config.status. : ${CONFIG_STATUS=./config.status} @@ -3376,7 +2978,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.7" + echo "$CONFIG_STATUS generated by autoconf version 2.10" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -3387,7 +2989,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile config.h:config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS < 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%ac_d%ac_u%gp +s%ac_u%ac_e%gp +EOF +sed -n -f conftest.hdr confdefs.h > conftest.vals +rm -f conftest.hdr + +# This sed command replaces #undef with comments. This is necessary, for +# example, in the case of _POSIX_SOURCE, which is predefined and required +# on some systems where configure will not decide to define it. +cat >> conftest.vals <<\EOF +s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% +EOF + +# Break up conftest.vals because some shells have a limit on +# the size of here documents, and old seds have small limits too. +# Maximum number of lines to put in a single here document. +ac_max_here_lines=12 + +rm -f conftest.tail +while : +do + ac_lines=`grep -c . conftest.vals` + # grep -c gives empty output for an empty file on some AIX systems. + if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi + # Write a limited-size here document to conftest.frag. + echo ' cat > conftest.frag <> $CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS + echo 'CEOF + sed -f conftest.frag conftest.in > conftest.out + rm -f conftest.in + mv conftest.out conftest.in +' >> $CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail + rm -f conftest.vals + mv conftest.tail conftest.vals +done +rm -f conftest.vals + +cat >> $CONFIG_STATUS <<\EOF + rm -f conftest.frag conftest.h + echo "/* $ac_file. Generated automatically by configure. */" > conftest.h + cat conftest.in >> conftest.h + rm -f conftest.in + if cmp -s $ac_file conftest.h 2>/dev/null; then + 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 +fi; done + EOF cat >> $CONFIG_STATUS </dev/null 2>/dev/null || \ echo "source ${srcdir}/.gdbinit" >> .gdbinit esac +case x$CONFIG_HEADERS in +xconfig.h:config.in) +echo > stamp-h ;; +esac + exit 0 EOF chmod +x $CONFIG_STATUS