diff options
Diffstat (limited to 'tk/win/configure')
-rwxr-xr-x | tk/win/configure | 1895 |
1 files changed, 1691 insertions, 204 deletions
diff --git a/tk/win/configure b/tk/win/configure index 20cf223f653..601e2868c1c 100755 --- a/tk/win/configure +++ b/tk/win/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.12.2 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -12,7 +12,13 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help - --with-tcl=DIR use Tcl 8.0 binaries from DIR" + --enable-threads build with threads" +ac_help="$ac_help + --enable-shared build and link with shared libraries [--enable-shared]" +ac_help="$ac_help + --enable-symbols build with debugging symbols [--disable-symbols]" +ac_help="$ac_help + --with-tcl=DIR use Tcl 8.3 binaries from DIR" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -30,6 +36,7 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= +sitefile= srcdir= target=NONE verbose= @@ -144,6 +151,7 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages + --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -314,6 +322,11 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; + -site-file | --site-file | --site-fil | --site-fi | --site-f) + ac_prev=sitefile ;; + -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) + sitefile="$ac_optarg" ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -335,7 +348,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.12.2" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -479,12 +492,16 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +if test -z "$sitefile"; then + if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi fi +else + CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -524,6 +541,12 @@ fi +TK_VERSION=8.3 +TK_MAJOR_VERSION=8 +TK_MINOR_VERSION=3 +TK_PATCH_LEVEL=".2" +VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION + if test "${prefix}" = "NONE"; then prefix=/usr/local fi @@ -531,57 +554,14 @@ if test "${exec_prefix}" = "NONE"; then exec_prefix=$prefix fi -ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } -fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - - -# Make sure we can run config.sub. -if ${CONFIG_SHELL-/bin/sh} $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 -echo "configure:561: checking host system type" >&5 - -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`${CONFIG_SHELL-/bin/sh} $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=`${CONFIG_SHELL-/bin/sh} $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 - +#------------------------------------------------------------------------ +# Standard compiler checks +#------------------------------------------------------------------------ # 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 -echo "configure:585: checking for $ac_word" >&5 +echo "configure:565: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -589,7 +569,8 @@ else ac_cv_prog_CC="$CC" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - for ac_dir in $PATH; do + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" @@ -610,7 +591,7 @@ 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 -echo "configure:614: checking for $ac_word" >&5 +echo "configure:595: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -619,7 +600,8 @@ else else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - for ac_dir in $PATH; do + ac_dummy="$PATH" + for ac_dir in $ac_dummy; 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 @@ -660,7 +642,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:664: checking for $ac_word" >&5 +echo "configure:646: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -668,7 +650,8 @@ else ac_cv_prog_CC="$CC" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - for ac_dir in $PATH; do + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="cl" @@ -691,7 +674,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:695: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:678: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -700,12 +683,14 @@ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross -cat > conftest.$ac_ext <<EOF -#line 705 "configure" +cat > conftest.$ac_ext << EOF + +#line 689 "configure" #include "confdefs.h" + main(){return(0);} EOF -if { (eval echo configure:709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -719,18 +704,24 @@ else ac_cv_prog_cc_works=no fi rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:729: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:720: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:734: checking whether we are using GNU C" >&5 +echo "configure:725: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -739,7 +730,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:743: \"$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:734: \"$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 @@ -758,7 +749,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:762: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:753: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -789,14 +780,361 @@ else fi fi + +ac_aux_dir= +for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + + +# Make sure we can run config.sub. +if ${CONFIG_SHELL-/bin/sh} $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 +echo "configure:811: checking host system type" >&5 + +host_alias=$host +case "$host_alias" in +NONE) + case $nonopt in + NONE) + if host_alias=`${CONFIG_SHELL-/bin/sh} $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=`${CONFIG_SHELL-/bin/sh} $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 +echo "configure:832: checking build system type" >&5 + +build_alias=$build +case "$build_alias" in +NONE) + case $nonopt in + NONE) build_alias=$host_alias ;; + *) build_alias=$nonopt ;; + esac ;; +esac + +build=`${CONFIG_SHELL-/bin/sh} $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 +echo "configure:858: checking for $ac_word" >&5 +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=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; 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" +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 + + +if test -z "$ac_cv_prog_AR"; then +if test -n "$ac_tool_prefix"; then + # Extract the first word of "ar", so it can be a program name with args. +set dummy ar; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:890: checking for $ac_word" >&5 +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=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AR="ar" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_AR" && ac_cv_prog_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 + +else + AR=":" +fi +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 +echo "configure:925: checking for $ac_word" >&5 +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=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; 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 +echo "configure:957: checking for $ac_word" >&5 +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=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="ranlib" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" +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 + +else + RANLIB=":" +fi +fi + +# Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. +set dummy ${ac_tool_prefix}windres; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:992: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_RC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$RC"; then + ac_cv_prog_RC="$RC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RC="${ac_tool_prefix}windres" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +RC="$ac_cv_prog_RC" +if test -n "$RC"; then + echo "$ac_t""$RC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + +if test -z "$ac_cv_prog_RC"; then +if test -n "$ac_tool_prefix"; then + # Extract the first word of "windres", so it can be a program name with args. +set dummy windres; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1024: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_RC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$RC"; then + ac_cv_prog_RC="$RC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RC="windres" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_RC" && ac_cv_prog_RC=":" +fi +fi +RC="$ac_cv_prog_RC" +if test -n "$RC"; then + echo "$ac_t""$RC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +else + RC=":" +fi +fi + + +#-------------------------------------------------------------------- +# Checks to see if the make progeam sets the $MAKE variable. +#-------------------------------------------------------------------- + +echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +echo "configure:1062: checking whether ${MAKE-make} sets \${MAKE}" >&5 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftestmake <<\EOF +all: + @echo 'ac_maketemp="${MAKE}"' +EOF +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` +if test -n "$ac_maketemp"; then + eval ac_cv_prog_make_${ac_make}_set=yes +else + eval ac_cv_prog_make_${ac_make}_set=no +fi +rm -f conftestmake +fi +if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then + echo "$ac_t""yes" 1>&6 + SET_MAKE= +else + echo "$ac_t""no" 1>&6 + SET_MAKE="MAKE=${MAKE-make}" +fi + + +#-------------------------------------------------------------------- +# These two macros perform additinal compiler test. +#-------------------------------------------------------------------- + +echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 +echo "configure:1094: checking for Cygwin environment" >&5 +if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 1099 "configure" +#include "confdefs.h" + +int main() { + +#ifndef __CYGWIN__ +#define __CYGWIN__ __CYGWIN32__ +#endif +return __CYGWIN__; +; return 0; } +EOF +if { (eval echo configure:1110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cygwin=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cygwin=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_cygwin" 1>&6 +CYGWIN= +test "$ac_cv_cygwin" = yes && CYGWIN=yes + +#-------------------------------------------------------------------- +# Determines the correct binary file extension (.o, .obj, .exe etc.) +#-------------------------------------------------------------------- + echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:794: checking for object suffix" >&5 +echo "configure:1132: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1138: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -813,145 +1151,1237 @@ echo "$ac_t""$ac_cv_objext" 1>&6 OBJEXT=$ac_cv_objext ac_objext=$ac_cv_objext -NM=${NM-nm} +echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 +echo "configure:1156: checking for mingw32 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 1161 "configure" +#include "confdefs.h" -AS=${AS-as} +int main() { +return __MINGW32__; +; return 0; } +EOF +if { (eval echo configure:1168: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_mingw32=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_mingw32=no +fi +rm -f conftest* +rm -f conftest* +fi -LD=${LD-ld} +echo "$ac_t""$ac_cv_mingw32" 1>&6 +MINGW32= +test "$ac_cv_mingw32" = yes && MINGW32=yes -DLLTOOL=${DLLTOOL-dlltool} -WINDRES=${WINDRES-windres} +echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +echo "configure:1187: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$CYGWIN" = yes || test "$MINGW32" = yes; then + ac_cv_exeext=.exe +else + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_exeext= + if { (eval echo configure:1197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + for file in conftest.*; do + case $file in + *.c | *.o | *.obj | *.ilk | *.pdb) ;; + *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + else + { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + test x"${ac_cv_exeext}" = x && ac_cv_exeext=no +fi +fi + +EXEEXT="" +test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} +echo "$ac_t""${ac_cv_exeext}" 1>&6 +ac_exeext=$EXEEXT + + +#-------------------------------------------------------------------- +# Check whether --enable-threads or --disable-threads was given. +#-------------------------------------------------------------------- + + + echo $ac_n "checking for building with threads""... $ac_c" 1>&6 +echo "configure:1224: checking for building with threads" >&5 + # Check whether --enable-threads or --disable-threads was given. +if test "${enable_threads+set}" = set; then + enableval="$enable_threads" + tcl_ok=$enableval +else + tcl_ok=no +fi + + + if test "$tcl_ok" = "yes"; then + echo "$ac_t""yes" 1>&6 + TCL_THREADS=1 + cat >> confdefs.h <<\EOF +#define TCL_THREADS 1 +EOF + + else + TCL_THREADS=0 + echo "$ac_t""no (default)" 1>&6 + fi + + +#-------------------------------------------------------------------- +# The statements below define a collection of symbols related to +# building libtk as a shared library instead of a static library. +#-------------------------------------------------------------------- + + + echo $ac_n "checking how to build libraries""... $ac_c" 1>&6 +echo "configure:1254: checking how to build libraries" >&5 + # Check whether --enable-shared or --disable-shared was given. +if test "${enable_shared+set}" = set; then + enableval="$enable_shared" + tcl_ok=$enableval +else + tcl_ok=yes +fi + + + if test "${enable_shared+set}" = set; then + enableval="$enable_shared" + tcl_ok=$enableval + else + tcl_ok=yes + fi + + if test "$tcl_ok" = "yes" ; then + echo "$ac_t""shared" 1>&6 + SHARED_BUILD=1 + else + echo "$ac_t""static" 1>&6 + SHARED_BUILD=0 + cat >> confdefs.h <<\EOF +#define STATIC_BUILD 1 +EOF + + fi -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# ./install, which can be erroneously created by make from ./install.sh. -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:839: checking for a BSD compatible install" >&5 -if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + +#-------------------------------------------------------------------- +# The statements below define a collection of compile flags. This +# macro depends on the value of SHARED_BUILD, and should be called +# after SC_ENABLE_SHARED checks the configure switches. +#-------------------------------------------------------------------- + + + TCL_LIB_VERSIONS_OK=nodots + + # Extract the first word of "cygpath", so it can be a program name with args. +set dummy cygpath; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1296: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CYGPATH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - for ac_dir in $PATH; do - # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi - done - ;; - esac + if test -n "$CYGPATH"; then + ac_cv_prog_CYGPATH="$CYGPATH" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CYGPATH="cygpath -w" + break + fi done - IFS="$ac_save_IFS" + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_CYGPATH" && ac_cv_prog_CYGPATH="echo" +fi +fi +CYGPATH="$ac_cv_prog_CYGPATH" +if test -n "$CYGPATH"; then + echo "$ac_t""$CYGPATH" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + + # Check for a bug in gcc's windres that causes the + # compile to fail when a Windows native path is + # passed into windres. The mingw toolchain requires + # Windows native paths while Cygwin should work + # with both. Avoid the bug by passing a POSIX + # path when using the Cygwin toolchain. + + if test "$GCC" = "yes" && test "$CYGPATH" != "echo" ; then + conftest=/tmp/conftest.rc + echo "STRINGTABLE BEGIN" > $conftest + echo "101 \"name\"" >> $conftest + echo "END" >> $conftest + + echo $ac_n "checking for Windows native path bug in windres""... $ac_c" 1>&6 +echo "configure:1338: checking for Windows native path bug in windres" >&5 + cyg_conftest=`$CYGPATH $conftest` + if { ac_try='$RC -o conftest.res.o $cyg_conftest'; { (eval echo configure:1340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then + echo "$ac_t""no" 1>&6 + else + echo "$ac_t""yes" 1>&6 + CYGPATH=echo + fi + conftest= + cyg_conftest= + fi + + if test "$CYGPATH" = "echo" || test "$ac_cv_cygwin" = "yes"; then + DEPARG='"$<"' + else + DEPARG='"$(shell $(CYGPATH) $<)"' + fi + + VENDORPREFIX="" + + # set various compiler flags depending on whether we are using gcc or cl + + echo $ac_n "checking compiler flags""... $ac_c" 1>&6 +echo "configure:1361: checking compiler flags" >&5 + if test "${GCC}" = "yes" ; then + + # CYGNUS LOCAL + VENDORPREFIX="cyg" + + SHLIB_LD="" + SHLIB_LD_LIBS="" + LIBS="" + LIBS_GUI="-lgdi32 -lcomdlg32" + STLIB_LD="${AR} cr" + RC_OUT=-o + RC_TYPE= + RC_INCLUDE=--include + RES=res.o + MAKE_LIB="\${STLIB_LD} \$@" + POST_MAKE_LIB="\${RANLIB} \$@" + MAKE_EXE="\${CC} -o \$@" + LIBPREFIX="lib${VENDORPREFIX}" + + if test "${SHARED_BUILD}" = "0" ; then + # static + echo "$ac_t""using static flags" 1>&6 + runtime= + MAKE_DLL="echo " + LIBSUFFIX="s\${DBGX}.a" + LIBRARIES="\${STATIC_LIBRARIES}" + EXESUFFIX="s\${DBGX}.exe" + DLLSUFFIX="" + else + # dynamic + echo "$ac_t""using shared flags" 1>&6 + + # ad-hoc check to see if CC supports -shared. + if "${CC}" -shared 2>&1 | egrep ': -shared not supported' >/dev/null; then + { echo "configure: error: ${CC} does not support the -shared option. + You will need to upgrade to a newer version of the toolchain." 1>&2; exit 1; } + fi + + runtime= + # Link with gcc since ld does not link to default libs like + # -luser32 and -lmsvcrt. We also need to add CFLAGS so important + # flags like -mno-cygwin get passed in to CC. + SHLIB_LD='${CC} -shared ${CFLAGS}' + # Add SHLIB_LD_LIBS to the Make rule, not here. + MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \$@ ${extra_ldflags} \ + -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\$@)" + + LIBSUFFIX="\${DBGX}.a" + DLLSUFFIX="\${DBGX}.dll" + EXESUFFIX="\${DBGX}.exe" + LIBRARIES="\${SHARED_LIBRARIES}" + fi + + CFLAGS_DEBUG=-g + CFLAGS_OPTIMIZE=-O + CFLAGS_WARNING="-Wall -Wconversion" + LDFLAGS_DEBUG= + LDFLAGS_OPTIMIZE= + + # Specify the CC output file names based on the target name + CC_OBJNAME="-o \$@" + CC_EXENAME="-o \$@" + + # Specify linker flags depending on the type of app being + # built -- Console vs. Window. + # + # We need to pass -e _WinMain@16 so that ld will use + # WinMain() instead of main() as the entry point. We can't + # use autoconf to check for this case since it would need + # to run an executable and that does not work when + # cross compiling. Remove this -e workaround once we + # require a gcc that does not have this bug. + LDFLAGS_CONSOLE="-mconsole ${extra_ldflags}" + LDFLAGS_WINDOW="-mwindows -e _WinMain@16 ${extra_ldflags}" + else + # CYGNUS LOCAL + VENDORPREFIX="sn" + + SHLIB_LD="link -dll -nologo" + SHLIB_LD_LIBS="user32.lib advapi32.lib" + LIBS="user32.lib advapi32.lib" + LIBS_GUI="gdi32.lib comdlg32.lib" + STLIB_LD="lib -nologo" + RC="rc" + RC_OUT=-fo + RC_TYPE=-r + RC_INCLUDE=-i + RES=res + MAKE_LIB="\${STLIB_LD} -out:\$@" + POST_MAKE_LIB= + MAKE_EXE="\${CC} -Fe\$@" + LIBPREFIX=${VENDORPREFIX} + + if test "${SHARED_BUILD}" = "0" ; then + # static + echo "$ac_t""using static flags" 1>&6 + runtime=-MT + MAKE_DLL="echo " + LIBSUFFIX="s\${DBGX}.lib" + LIBRARIES="\${STATIC_LIBRARIES}" + EXESUFFIX="s\${DBGX}.exe" + DLLSUFFIX="" + else + # dynamic + echo "$ac_t""using shared flags" 1>&6 + runtime=-MD + # Add SHLIB_LD_LIBS to the Make rule, not here. + MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -out:\$@" + LIBSUFFIX="\${DBGX}.lib" + DLLSUFFIX="\${DBGX}.dll" + EXESUFFIX="\${DBGX}.exe" + LIBRARIES="\${SHARED_LIBRARIES}" + fi + + EXTRA_CFLAGS="-YX" + CFLAGS_DEBUG="-nologo -Z7 -Od -WX ${runtime}d" +# CFLAGS_OPTIMIZE="-nologo -O2 -Gs -GD ${runtime}" + CFLAGS_OPTIMIZE="-nologo -Oti -Gs -GD ${runtime}" + CFLAGS_WARNING="-W3" + LDFLAGS_DEBUG="-debug:full -debugtype:cv" + LDFLAGS_OPTIMIZE="-release" + + # Specify the CC output file names based on the target name + CC_OBJNAME="-Fo\$@" + CC_EXENAME="-Fe\"\$(shell \$(CYGPATH) '\$@')\"" + + # Specify linker flags depending on the type of app being + # built -- Console vs. Window. + LDFLAGS_CONSOLE="-link -subsystem:console" + LDFLAGS_WINDOW="-link -subsystem:windows" + fi + # TCL_LIB_SUFFIX is defined here and in tclConfig.sh so that macros + # can use a single variable name for both Tcl and extensions. + TCL_LIB_SUFFIX=$LIBSUFFIX + + +#-------------------------------------------------------------------- +# man2tcl needs this so that it can use errno.h +#-------------------------------------------------------------------- + +echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +echo "configure:1504: checking how to run the C preprocessor" >&5 +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL="$ac_install_sh" - fi +if test -z "$CPP"; then +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + # This must be in double quotes, not single quotes, because CPP may get + # substituted into the Makefile and "${CC-cc}" will confuse make. + CPP="${CC-cc} -E" + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext <<EOF +#line 1519 "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:1525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext <<EOF +#line 1536 "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:1542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext <<EOF +#line 1553 "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:1559: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP=/lib/cpp +fi +rm -f conftest* +fi +rm -f conftest* fi -echo "$ac_t""$INSTALL" 1>&6 +rm -f conftest* + ac_cv_prog_CPP="$CPP" +fi + CPP="$ac_cv_prog_CPP" +else + ac_cv_prog_CPP="$CPP" +fi +echo "$ac_t""$CPP" 1>&6 -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +ac_safe=`echo "errno.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for errno.h""... $ac_c" 1>&6 +echo "configure:1585: checking for errno.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 1590 "configure" +#include "confdefs.h" +#include <errno.h> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&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 + : +else + echo "$ac_t""no" 1>&6 +MAN2TCLFLAGS="-DNO_ERRNO_H" +fi -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# needed for the subtle differences between cygwin and mingw32 -case "${host}" in -*-*-cygwin*) - DLL_LDLIBS=-lcygwin - DLL_LDFLAGS='-nostartfiles -Wl,--dll' - ;; -*-*-mingw32*) - DLL_LDLIBS= - DLL_LDFLAGS='-mdll' - ;; -esac +#-------------------------------------------------------------------- +# Set the default compiler switches based on the --enable-symbols +# option. This macro depends on C flags, and should be called +# after SC_CONFIG_CFLAGS macro is called. +#-------------------------------------------------------------------- + + + echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 +echo "configure:1627: checking for build with symbols" >&5 + # Check whether --enable-symbols or --disable-symbols was given. +if test "${enable_symbols+set}" = set; then + enableval="$enable_symbols" + tcl_ok=$enableval +else + tcl_ok=no +fi + + + if test "$tcl_ok" = "yes"; then + CFLAGS_DEFAULT='$(CFLAGS_DEBUG)' + LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG)' + DBGX=d + echo "$ac_t""yes" 1>&6 + else + CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)' + LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)' + DBGX="" + echo "$ac_t""no" 1>&6 + fi +TK_DBGX=${DBGX} +#-------------------------------------------------------------------- +# Locate and source the tclConfig.sh file. +#-------------------------------------------------------------------- -# The following stuff is just for tkConfig.sh, not for Makefile. + echo $ac_n "checking the location of tclConfig.sh""... $ac_c" 1>&6 +echo "configure:1658: checking the location of tclConfig.sh" >&5 -# Check whether --with-tcl or --without-tcl was given. +# CYGNUS LOCAL + if test -d ../../tcl8.1/win; then + TCL_BIN_DIR_DEFAULT=../../tcl8.1/win + else + TCL_BIN_DIR_DEFAULT=../../tcl/win + fi +# END CYGNUS LOCAL + + # Check whether --with-tcl or --without-tcl was given. if test "${with_tcl+set}" = set; then withval="$with_tcl" TCL_BIN_DIR=$withval else - TCL_BIN_DIR=`cd ../../tcl/unix; pwd` + TCL_BIN_DIR=`cd $TCL_BIN_DIR_DEFAULT; pwd` fi -if test ! -d $TCL_BIN_DIR; then - { echo "configure: error: Tcl directory $TCL_BIN_DIR doesn't exist" 1>&2; exit 1; } + if test ! -d $TCL_BIN_DIR; then + { echo "configure: error: Tcl directory $TCL_BIN_DIR does not exist" 1>&2; exit 1; } + fi + if test ! -f $TCL_BIN_DIR/tclConfig.sh; then + { echo "configure: error: There is no tclConfig.sh in $TCL_BIN_DIR: perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; } + fi + echo "$ac_t""$TCL_BIN_DIR/tclConfig.sh" 1>&6 + + + echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6 +echo "configure:1686: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 + + if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then + echo "$ac_t""loading" 1>&6 + . $TCL_BIN_DIR/tclConfig.sh + else + echo "$ac_t""file not found" 1>&6 + fi + + # The eval is required to do the TCL_DBGX substitution in the + # TCL_LIB_FILE variable. + + eval TCL_LIB_FILE=${TCL_LIB_FILE} + eval TCL_LIB_FLAG=${TCL_LIB_FLAG} + + + + + + +#------------------------------------------------------------------------ +# tkConfig.sh refers to this by a different name +#------------------------------------------------------------------------ + +TK_SHARED_BUILD=${SHARED_BUILD} + +#-------------------------------------------------------------------- +# Perform final evaluations of variables with possible substitutions. +#-------------------------------------------------------------------- + +NODOT_VERSION=${VER} + +TK_SHARED_LIB_SUFFIX="\${NODOT_VERSION}${DLLSUFFIX}" +TK_UNSHARED_LIB_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" +TK_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" + + + val="`cd $srcdir/..; pwd`" + + if test "$val" = "" ; then + { echo "configure: error: Empty value for variable TK_SRC_DIR" 1>&2; exit 1; } + fi + + case "${host}" in + *windows32* | *mingw32*) + if test "${CYGPATH}" = ""; then + { echo "configure: error: CYGPATH variable is not defined." 1>&2; exit 1; } + elif test "${CYGPATH}" = "echo"; then + # No cygpath when cross compiling + TK_SRC_DIR=$val + else + # store literal argument text in a variable + val=$val + # Convert Cygwin to Windows path (/tmp/foo -> C:\Tmp\foo) + val="`${CYGPATH} $val`" + # Convert path like C:\Tmp\foo to C:/Tmp/foo + TK_SRC_DIR="`echo $val | sed -e s#\\\\\\\\#/#g`" + fi + ;; + *) + # Default to a no-op under Unix or Cygwin gcc + TK_SRC_DIR=$val + ;; + esac + + + + libname=tk + suffix=${TK_SHARED_LIB_SUFFIX} + + case "${host}" in + *windows32* | *mingw32* | *cygwin*) + eval "long_libname=\"${TCL_VENDOR_PREFIX}${libname}${suffix}\"" + ;; + *) + eval "long_libname=\"lib${TCL_VENDOR_PREFIX}${libname}${suffix}\"" + ;; + esac + + eval "long_libname=${long_libname}" + + # Trick to replace DBGX with TCL_DBGX + DBGX='${TCL_DBGX}' + eval "long_libname=${long_libname}" + + TK_DLL_FILE=$long_libname + + + libname=tk + suffix=${TK_UNSHARED_LIB_SUFFIX} + + case "${host}" in + *windows32* | *mingw32*) + if test "$GCC" != yes; then + eval "long_libname=\"${TCL_VENDOR_PREFIX}${libname}${suffix}\"" + else + eval "long_libname=\"lib${TCL_VENDOR_PREFIX}${libname}${suffix}\"" + fi + ;; + *) + eval "long_libname=\"lib${TCL_VENDOR_PREFIX}${libname}${suffix}\"" + ;; + esac + + eval "long_libname=${long_libname}" + + # Trick to replace DBGX with TCL_DBGX + DBGX='${TCL_DBGX}' + eval "long_libname=${long_libname}" + + TK_LIB_FILE=$long_libname + + + libname=tkstub + suffix=${TK_UNSHARED_LIB_SUFFIX} + + case "${host}" in + *windows32* | *mingw32*) + if test "$GCC" != yes; then + eval "long_libname=\"${TCL_VENDOR_PREFIX}${libname}${suffix}\"" + else + eval "long_libname=\"lib${TCL_VENDOR_PREFIX}${libname}${suffix}\"" + fi + ;; + *) + eval "long_libname=\"lib${TCL_VENDOR_PREFIX}${libname}${suffix}\"" + ;; + esac + + eval "long_libname=${long_libname}" + + # Trick to replace DBGX with TCL_DBGX + DBGX='${TCL_DBGX}' + eval "long_libname=${long_libname}" + + TK_STUB_LIB_FILE=$long_libname + + +if test "$GCC" = "yes"; then + GNU_TK_LIB_FILE=${TK_LIB_FILE} + MSVC_TK_LIB_FILE= +else + GNU_TK_LIB_FILE= + MSVC_TK_LIB_FILE=${TK_LIB_FILE} fi -if test ! -f $TCL_BIN_DIR/tclConfig.sh; then - { echo "configure: error: There's no tclConfig.sh in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; } + + + libname=tkstub + version=${TK_VERSION} + + if test "$TCL_LIB_SUFFIX" = "" ; then + { echo "configure: error: The TCL_LIB_SUFFIX variable is not defined" 1>&2; exit 1; } + fi + + # If the . character is not allowed in lib name, remove it from version + if test "${TCL_LIB_VERSIONS_OK}" != "ok"; then + version=`echo $version | tr -d .` + fi + + case "${host}" in + *windows32* | *mingw32*) + if test "$GCC" != yes; then + eval "short_libname=\"${TCL_VENDOR_PREFIX}${libname}${version}${TCL_LIB_SUFFIX}\"" + else + short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}${TCL_DBGX}" + fi + ;; + *) + short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}\${TCL_DBGX}" + ;; + esac + + TK_STUB_LIB_FLAG=$short_libname + + + case "${host}" in + *windows32* | *mingw32*) + if test "$GCC" != yes; then + + val="`pwd`/${TK_STUB_LIB_FLAG}" + + if test "$val" = "" ; then + { echo "configure: error: Empty value for variable TK_BUILD_STUB_LIB_SPEC" 1>&2; exit 1; } + fi + + case "${host}" in + *windows32* | *mingw32*) + if test "${CYGPATH}" = ""; then + { echo "configure: error: CYGPATH variable is not defined." 1>&2; exit 1; } + elif test "${CYGPATH}" = "echo"; then + # No cygpath when cross compiling + TK_BUILD_STUB_LIB_SPEC=$val + else + # store literal argument text in a variable + val=$val + # Convert Cygwin to Windows path (/tmp/foo -> C:\Tmp\foo) + val="`${CYGPATH} $val`" + # Convert path like C:\Tmp\foo to C:/Tmp/foo + TK_BUILD_STUB_LIB_SPEC="`echo $val | sed -e s#\\\\\\\\#/#g`" + fi + ;; + *) + # Default to a no-op under Unix or Cygwin gcc + TK_BUILD_STUB_LIB_SPEC=$val + ;; + esac + + else + + val=`pwd` + + if test "$val" = "" ; then + { echo "configure: error: Empty value for variable dirname" 1>&2; exit 1; } + fi + + case "${host}" in + *windows32* | *mingw32*) + if test "${CYGPATH}" = ""; then + { echo "configure: error: CYGPATH variable is not defined." 1>&2; exit 1; } + elif test "${CYGPATH}" = "echo"; then + # No cygpath when cross compiling + dirname=$val + else + # store literal argument text in a variable + val=$val + # Convert Cygwin to Windows path (/tmp/foo -> C:\Tmp\foo) + val="`${CYGPATH} $val`" + # Convert path like C:\Tmp\foo to C:/Tmp/foo + dirname="`echo $val | sed -e s#\\\\\\\\#/#g`" + fi + ;; + *) + # Default to a no-op under Unix or Cygwin gcc + dirname=$val + ;; + esac + + TK_BUILD_STUB_LIB_SPEC="-L${dirname} ${TK_STUB_LIB_FLAG}" + fi + ;; + *) + TK_BUILD_STUB_LIB_SPEC="-L`pwd` ${TK_STUB_LIB_FLAG}" + ;; + esac + + + case "${host}" in + *windows32* | *mingw32*) + if test "$GCC" != yes; then + + val="${exec_prefix}/lib/${TK_STUB_LIB_FLAG}" + + if test "$val" = "" ; then + { echo "configure: error: Empty value for variable TK_STUB_LIB_SPEC" 1>&2; exit 1; } + fi + + case "${host}" in + *windows32* | *mingw32*) + if test "${CYGPATH}" = ""; then + { echo "configure: error: CYGPATH variable is not defined." 1>&2; exit 1; } + elif test "${CYGPATH}" = "echo"; then + # No cygpath when cross compiling + TK_STUB_LIB_SPEC=$val + else + # store literal argument text in a variable + val=$val + # Convert Cygwin to Windows path (/tmp/foo -> C:\Tmp\foo) + val="`${CYGPATH} $val`" + # Convert path like C:\Tmp\foo to C:/Tmp/foo + TK_STUB_LIB_SPEC="`echo $val | sed -e s#\\\\\\\\#/#g`" + fi + ;; + *) + # Default to a no-op under Unix or Cygwin gcc + TK_STUB_LIB_SPEC=$val + ;; + esac + + else + + val=${exec_prefix}/lib + + if test "$val" = "" ; then + { echo "configure: error: Empty value for variable dirname" 1>&2; exit 1; } + fi + + case "${host}" in + *windows32* | *mingw32*) + if test "${CYGPATH}" = ""; then + { echo "configure: error: CYGPATH variable is not defined." 1>&2; exit 1; } + elif test "${CYGPATH}" = "echo"; then + # No cygpath when cross compiling + dirname=$val + else + # store literal argument text in a variable + val=$val + # Convert Cygwin to Windows path (/tmp/foo -> C:\Tmp\foo) + val="`${CYGPATH} $val`" + # Convert path like C:\Tmp\foo to C:/Tmp/foo + dirname="`echo $val | sed -e s#\\\\\\\\#/#g`" + fi + ;; + *) + # Default to a no-op under Unix or Cygwin gcc + dirname=$val + ;; + esac + + TK_STUB_LIB_SPEC="-L${dirname} ${TK_STUB_LIB_FLAG}" + fi + ;; + *) + TK_STUB_LIB_SPEC="-L${exec_prefix}/lib ${TK_STUB_LIB_FLAG}" + ;; + esac + + + + + val="`pwd`/${TK_STUB_LIB_FILE}" + + if test "$val" = "" ; then + { echo "configure: error: Empty value for variable TK_BUILD_STUB_LIB_PATH" 1>&2; exit 1; } + fi + + case "${host}" in + *windows32* | *mingw32*) + if test "${CYGPATH}" = ""; then + { echo "configure: error: CYGPATH variable is not defined." 1>&2; exit 1; } + elif test "${CYGPATH}" = "echo"; then + # No cygpath when cross compiling + TK_BUILD_STUB_LIB_PATH=$val + else + # store literal argument text in a variable + val=$val + # Convert Cygwin to Windows path (/tmp/foo -> C:\Tmp\foo) + val="`${CYGPATH} $val`" + # Convert path like C:\Tmp\foo to C:/Tmp/foo + TK_BUILD_STUB_LIB_PATH="`echo $val | sed -e s#\\\\\\\\#/#g`" + fi + ;; + *) + # Default to a no-op under Unix or Cygwin gcc + TK_BUILD_STUB_LIB_PATH=$val + ;; + esac + + + + + val="${exec_prefix}/lib/${TK_STUB_LIB_FILE}" + + if test "$val" = "" ; then + { echo "configure: error: Empty value for variable TK_STUB_LIB_PATH" 1>&2; exit 1; } + fi + + case "${host}" in + *windows32* | *mingw32*) + if test "${CYGPATH}" = ""; then + { echo "configure: error: CYGPATH variable is not defined." 1>&2; exit 1; } + elif test "${CYGPATH}" = "echo"; then + # No cygpath when cross compiling + TK_STUB_LIB_PATH=$val + else + # store literal argument text in a variable + val=$val + # Convert Cygwin to Windows path (/tmp/foo -> C:\Tmp\foo) + val="`${CYGPATH} $val`" + # Convert path like C:\Tmp\foo to C:/Tmp/foo + TK_STUB_LIB_PATH="`echo $val | sed -e s#\\\\\\\\#/#g`" + fi + ;; + *) + # Default to a no-op under Unix or Cygwin gcc + TK_STUB_LIB_PATH=$val + ;; + esac + + + +eval "DLLSUFFIX=${DLLSUFFIX}" +eval "LIBPREFIX=${LIBPREFIX}" +eval "LIBSUFFIX=${LIBSUFFIX}" +eval "EXESUFFIX=${EXESUFFIX}" + + + libname=tk + version=$TK_VERSION + + if test "$TCL_LIB_SUFFIX" = "" ; then + { echo "configure: error: The TCL_LIB_SUFFIX variable is not defined" 1>&2; exit 1; } + fi + + # If the . character is not allowed in lib name, remove it from version + if test "${TCL_LIB_VERSIONS_OK}" != "ok"; then + version=`echo $version | tr -d .` + fi + + case "${host}" in + *windows32* | *mingw32*) + if test "$GCC" != yes; then + eval "short_libname=\"${TCL_VENDOR_PREFIX}${libname}${version}${TCL_LIB_SUFFIX}\"" + else + short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}${TCL_DBGX}" + fi + ;; + *) + short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}\${TCL_DBGX}" + ;; + esac + + TK_LIB_FLAG=$short_libname + + + case "${host}" in + *windows32* | *mingw32*) + if test "$GCC" != yes; then + + val="`pwd`/${TK_LIB_FLAG}" + + if test "$val" = "" ; then + { echo "configure: error: Empty value for variable TK_BUILD_LIB_SPEC" 1>&2; exit 1; } + fi + + case "${host}" in + *windows32* | *mingw32*) + if test "${CYGPATH}" = ""; then + { echo "configure: error: CYGPATH variable is not defined." 1>&2; exit 1; } + elif test "${CYGPATH}" = "echo"; then + # No cygpath when cross compiling + TK_BUILD_LIB_SPEC=$val + else + # store literal argument text in a variable + val=$val + # Convert Cygwin to Windows path (/tmp/foo -> C:\Tmp\foo) + val="`${CYGPATH} $val`" + # Convert path like C:\Tmp\foo to C:/Tmp/foo + TK_BUILD_LIB_SPEC="`echo $val | sed -e s#\\\\\\\\#/#g`" + fi + ;; + *) + # Default to a no-op under Unix or Cygwin gcc + TK_BUILD_LIB_SPEC=$val + ;; + esac + + else + + val=`pwd` + + if test "$val" = "" ; then + { echo "configure: error: Empty value for variable dirname" 1>&2; exit 1; } + fi + + case "${host}" in + *windows32* | *mingw32*) + if test "${CYGPATH}" = ""; then + { echo "configure: error: CYGPATH variable is not defined." 1>&2; exit 1; } + elif test "${CYGPATH}" = "echo"; then + # No cygpath when cross compiling + dirname=$val + else + # store literal argument text in a variable + val=$val + # Convert Cygwin to Windows path (/tmp/foo -> C:\Tmp\foo) + val="`${CYGPATH} $val`" + # Convert path like C:\Tmp\foo to C:/Tmp/foo + dirname="`echo $val | sed -e s#\\\\\\\\#/#g`" + fi + ;; + *) + # Default to a no-op under Unix or Cygwin gcc + dirname=$val + ;; + esac + + TK_BUILD_LIB_SPEC="-L${dirname} ${TK_LIB_FLAG}" + fi + ;; + *) + TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" + ;; + esac + + + case "${host}" in + *windows32* | *mingw32*) + if test "$GCC" != yes; then + + val="${exec_prefix}/lib/${TK_LIB_FLAG}" + + if test "$val" = "" ; then + { echo "configure: error: Empty value for variable TK_LIB_SPEC" 1>&2; exit 1; } + fi + + case "${host}" in + *windows32* | *mingw32*) + if test "${CYGPATH}" = ""; then + { echo "configure: error: CYGPATH variable is not defined." 1>&2; exit 1; } + elif test "${CYGPATH}" = "echo"; then + # No cygpath when cross compiling + TK_LIB_SPEC=$val + else + # store literal argument text in a variable + val=$val + # Convert Cygwin to Windows path (/tmp/foo -> C:\Tmp\foo) + val="`${CYGPATH} $val`" + # Convert path like C:\Tmp\foo to C:/Tmp/foo + TK_LIB_SPEC="`echo $val | sed -e s#\\\\\\\\#/#g`" + fi + ;; + *) + # Default to a no-op under Unix or Cygwin gcc + TK_LIB_SPEC=$val + ;; + esac + + else + + val=${exec_prefix}/lib + + if test "$val" = "" ; then + { echo "configure: error: Empty value for variable dirname" 1>&2; exit 1; } + fi + + case "${host}" in + *windows32* | *mingw32*) + if test "${CYGPATH}" = ""; then + { echo "configure: error: CYGPATH variable is not defined." 1>&2; exit 1; } + elif test "${CYGPATH}" = "echo"; then + # No cygpath when cross compiling + dirname=$val + else + # store literal argument text in a variable + val=$val + # Convert Cygwin to Windows path (/tmp/foo -> C:\Tmp\foo) + val="`${CYGPATH} $val`" + # Convert path like C:\Tmp\foo to C:/Tmp/foo + dirname="`echo $val | sed -e s#\\\\\\\\#/#g`" + fi + ;; + *) + # Default to a no-op under Unix or Cygwin gcc + dirname=$val + ;; + esac + + TK_LIB_SPEC="-L${dirname} ${TK_LIB_FLAG}" + fi + ;; + *) + TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_FLAG}" + ;; + esac + + + + val="`pwd`/${TK_LIB_FILE}" + + if test "$val" = "" ; then + { echo "configure: error: Empty value for variable TK_LIB_FULL_PATH" 1>&2; exit 1; } + fi + + case "${host}" in + *windows32* | *mingw32*) + if test "${CYGPATH}" = ""; then + { echo "configure: error: CYGPATH variable is not defined." 1>&2; exit 1; } + elif test "${CYGPATH}" = "echo"; then + # No cygpath when cross compiling + TK_LIB_FULL_PATH=$val + else + # store literal argument text in a variable + val=$val + # Convert Cygwin to Windows path (/tmp/foo -> C:\Tmp\foo) + val="`${CYGPATH} $val`" + # Convert path like C:\Tmp\foo to C:/Tmp/foo + TK_LIB_FULL_PATH="`echo $val | sed -e s#\\\\\\\\#/#g`" + fi + ;; + *) + # Default to a no-op under Unix or Cygwin gcc + TK_LIB_FULL_PATH=$val + ;; + esac + + + +if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then + WISH_RES=wish_static.${RES} + TK_RES= +else + WISH_RES=wish_static.${RES} + TK_RES=tk_dll.${RES} fi +TK_SHARED_BUILD=${SHARED_BUILD} + +CFG_TK_SHARED_LIB_SUFFIX=${TK_SHARED_LIB_SUFFIX} +CFG_TK_UNSHARED_LIB_SUFFIX=${TK_UNSHARED_LIB_SUFFIX} +CFG_TK_EXPORT_FILE_SUFFIX=${TK_EXPORT_FILE_SUFFIX} + +# Add X include path, it must be in a format +# like -I"C:/Dir" and not -I"C:\Dir" or VC++ will puke. + + val=$srcdir/../xlib + + if test "$val" = "" ; then + { echo "configure: error: Empty value for variable XINCLUDES" 1>&2; exit 1; } + fi + + case "${host}" in + *windows32* | *mingw32*) + if test "${CYGPATH}" = ""; then + { echo "configure: error: CYGPATH variable is not defined." 1>&2; exit 1; } + elif test "${CYGPATH}" = "echo"; then + # No cygpath when cross compiling + XINCLUDES=$val + else + # store literal argument text in a variable + val=$val + # Convert Cygwin to Windows path (/tmp/foo -> C:\Tmp\foo) + val="`${CYGPATH} $val`" + # Convert path like C:\Tmp\foo to C:/Tmp/foo + XINCLUDES="`echo $val | sed -e s#\\\\\\\\#/#g`" + fi + ;; + *) + # Default to a no-op under Unix or Cygwin gcc + XINCLUDES=$val + ;; + esac + +XINCLUDES="-I\"${XINCLUDES}\"" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -file=$TCL_BIN_DIR/tclConfig.sh -. $file -SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS -SHLIB_LD=$TCL_SHLIB_LD -SHLIB_LD_LIBS=$TCL_SHLIB_LD_LIBS -SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX -SHLIB_VERSION=$TCL_SHLIB_VERSION -DL_LIBS=$TCL_DL_LIBS -LD_FLAGS=$TCL_LD_FLAGS -TK_LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS -LIBOBJS= -TK_VERSION=8.0 -TK_MAJOR_VERSION=8 -TK_MINOR_VERSION=0 -TK_PATCH_LEVEL=p2 -VERSION=${TK_VERSION} -MATH_LIBS=-lm -LIBOBJS= -TK_SHLIB_CFLAGS="" -eval "TK_LIB_FILE=libtk${TCL_UNSHARED_LIB_SUFFIX}" -TK_UNSHARED_LIB_FILE="$TK_LIB_FILE" -TK_SRC_DIR=`cd $srcdir/..; pwd` -XINCLUDES="-I`cd $srcdir/../xlib; pwd`" -XLIBSW= -TK_BUILD_INCLUDES="-I`cd $srcdir/../generic; pwd` -I`cd $srcdir/../xlib; pwd`" -TK_BUILD_LIB_SPEC="-L`pwd` -ltk`echo ${VERSION} | tr -d .`" -TK_LIB_SPEC="-L${exec_prefix}/lib -ltk`echo ${VERSION} | tr -d .`" @@ -991,7 +2421,7 @@ EOF # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | - case `(ac_space=' '; set) 2>&1 | grep ac_space` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). @@ -1070,7 +2500,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.12.2" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -1079,9 +2509,8 @@ do done ac_given_srcdir=$srcdir -ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile ../unix/tkConfig.sh" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile tkConfig.sh" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -1094,6 +2523,7 @@ s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g @@ -1112,38 +2542,100 @@ s%@includedir@%$includedir%g s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@CC@%$CC%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g s%@host_vendor@%$host_vendor%g s%@host_os@%$host_os%g -s%@CC@%$CC%g +s%@build@%$build%g +s%@build_alias@%$build_alias%g +s%@build_cpu@%$build_cpu%g +s%@build_vendor@%$build_vendor%g +s%@build_os@%$build_os%g +s%@AR@%$AR%g +s%@RANLIB@%$RANLIB%g +s%@RC@%$RC%g +s%@SET_MAKE@%$SET_MAKE%g s%@OBJEXT@%$OBJEXT%g -s%@NM@%$NM%g -s%@AS@%$AS%g -s%@LD@%$LD%g -s%@DLLTOOL@%$DLLTOOL%g -s%@WINDRES@%$WINDRES%g -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@TCL_ALLOC_OBJ@%$TCL_ALLOC_OBJ%g -s%@DLL_LDFLAGS@%$DLL_LDFLAGS%g -s%@DLL_LDLIBS@%$DLL_LDLIBS%g -s%@LIBOBJS@%$LIBOBJS%g -s%@DL_LIBS@%$DL_LIBS%g -s%@LD_FLAGS@%$LD_FLAGS%g -s%@MATH_LIBS@%$MATH_LIBS%g -s%@TK_BUILD_INCLUDES@%$TK_BUILD_INCLUDES%g -s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g -s%@TK_LIB_FILE@%$TK_LIB_FILE%g -s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g +s%@EXEEXT@%$EXEEXT%g +s%@CYGPATH@%$CYGPATH%g +s%@CPP@%$CPP%g +s%@MAN2TCLFLAGS@%$MAN2TCLFLAGS%g +s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g +s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g +s%@TCL_LIB_FILE@%$TCL_LIB_FILE%g +s%@TK_VERSION@%$TK_VERSION%g s%@TK_MAJOR_VERSION@%$TK_MAJOR_VERSION%g s%@TK_MINOR_VERSION@%$TK_MINOR_VERSION%g s%@TK_PATCH_LEVEL@%$TK_PATCH_LEVEL%g +s%@TK_DBGX@%$TK_DBGX%g +s%@TK_LIB_FILE@%$TK_LIB_FILE%g +s%@GNU_TK_LIB_FILE@%$GNU_TK_LIB_FILE%g +s%@MSVC_TK_LIB_FILE@%$MSVC_TK_LIB_FILE%g +s%@TK_DLL_FILE@%$TK_DLL_FILE%g +s%@TK_LIB_FLAG@%$TK_LIB_FLAG%g +s%@TK_STUB_LIB_FILE@%$TK_STUB_LIB_FILE%g +s%@TK_STUB_LIB_FLAG@%$TK_STUB_LIB_FLAG%g +s%@TK_STUB_LIB_SPEC@%$TK_STUB_LIB_SPEC%g +s%@TK_STUB_LIB_PATH@%$TK_STUB_LIB_PATH%g +s%@TK_BUILD_STUB_LIB_SPEC@%$TK_BUILD_STUB_LIB_SPEC%g +s%@TK_BUILD_STUB_LIB_PATH@%$TK_BUILD_STUB_LIB_PATH%g s%@TK_SRC_DIR@%$TK_SRC_DIR%g -s%@TK_VERSION@%$TK_VERSION%g +s%@TK_BIN_DIR@%$TK_BIN_DIR%g +s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g +s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g +s%@TK_LIB_FULL_PATH@%$TK_LIB_FULL_PATH%g +s%@TK_SHARED_BUILD@%$TK_SHARED_BUILD%g +s%@WISH_RES@%$WISH_RES%g +s%@TK_RES@%$TK_RES%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_PATCH_LEVEL@%$TCL_PATCH_LEVEL%g +s%@TCL_DLL_FILE@%$TCL_DLL_FILE%g +s%@TCL_STUB_LIB_FILE@%$TCL_STUB_LIB_FILE%g +s%@TCL_STUB_LIB_FLAG@%$TCL_STUB_LIB_FLAG%g +s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g +s%@TCL_BUILD_STUB_LIB_SPEC@%$TCL_BUILD_STUB_LIB_SPEC%g +s%@TCL_DBGX@%$TCL_DBGX%g +s%@CFG_TK_SHARED_LIB_SUFFIX@%$CFG_TK_SHARED_LIB_SUFFIX%g +s%@CFG_TK_UNSHARED_LIB_SUFFIX@%$CFG_TK_UNSHARED_LIB_SUFFIX%g +s%@CFG_TK_EXPORT_FILE_SUFFIX@%$CFG_TK_EXPORT_FILE_SUFFIX%g +s%@DEPARG@%$DEPARG%g +s%@CFLAGS_DEFAULT@%$CFLAGS_DEFAULT%g +s%@CFLAGS_DEBUG@%$CFLAGS_DEBUG%g +s%@CFLAGS_OPTIMIZE@%$CFLAGS_OPTIMIZE%g +s%@CFLAGS_WARNING@%$CFLAGS_WARNING%g +s%@EXTRA_CFLAGS@%$EXTRA_CFLAGS%g +s%@STLIB_LD@%$STLIB_LD%g +s%@SHLIB_LD@%$SHLIB_LD%g +s%@SHLIB_LD_LIBS@%$SHLIB_LD_LIBS%g +s%@SHLIB_CFLAGS@%$SHLIB_CFLAGS%g +s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g +s%@CC_OBJNAME@%$CC_OBJNAME%g +s%@CC_EXENAME@%$CC_EXENAME%g +s%@LDFLAGS_DEFAULT@%$LDFLAGS_DEFAULT%g +s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g +s%@LDFLAGS_OPTIMIZE@%$LDFLAGS_OPTIMIZE%g +s%@LDFLAGS_CONSOLE@%$LDFLAGS_CONSOLE%g +s%@LDFLAGS_WINDOW@%$LDFLAGS_WINDOW%g +s%@RC_OUT@%$RC_OUT%g +s%@RC_TYPE@%$RC_TYPE%g +s%@RC_INCLUDE@%$RC_INCLUDE%g +s%@RES@%$RES%g +s%@LIBS_GUI@%$LIBS_GUI%g +s%@DLLSUFFIX@%$DLLSUFFIX%g +s%@LIBPREFIX@%$LIBPREFIX%g +s%@LIBSUFFIX@%$LIBSUFFIX%g +s%@EXESUFFIX@%$EXESUFFIX%g +s%@LIBRARIES@%$LIBRARIES%g +s%@MAKE_LIB@%$MAKE_LIB%g +s%@POST_MAKE_LIB@%$POST_MAKE_LIB%g +s%@MAKE_DLL@%$MAKE_DLL%g +s%@MAKE_EXE@%$MAKE_EXE%g +s%@TK_XINCLUDES@%$TK_XINCLUDES%g s%@XINCLUDES@%$XINCLUDES%g -s%@XLIBSW@%$XLIBSW%g CEOF EOF @@ -1185,7 +2677,7 @@ EOF cat >> $CONFIG_STATUS <<EOF -CONFIG_FILES=\${CONFIG_FILES-"Makefile ../unix/tkConfig.sh"} +CONFIG_FILES=\${CONFIG_FILES-"Makefile tkConfig.sh"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then @@ -1220,10 +2712,6 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then top_srcdir="$ac_dots$ac_given_srcdir" ;; esac - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac echo creating "$ac_file" rm -f "$ac_file" @@ -1239,7 +2727,6 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g s%@top_srcdir@%$top_srcdir%g -s%@INSTALL@%$INSTALL%g " $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file fi; done rm -f conftest.s* |