diff -cr itcl-1.5/configure newitcl-1.5/configure *** itcl-1.5/configure Mon Apr 25 15:17:41 1994 --- newitcl-1.5/configure Wed Oct 5 18:29:21 1994 *************** *** 7,139 **** #!/bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf. ! # Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc. ! # This program is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2, or (at your option) # any later version. ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! # Usage: configure [--srcdir=DIR] [--host=HOST] [--gas] [--nfp] ! # [--prefix=PREFIX] [--exec-prefix=PREFIX] [--with-PACKAGE[=VALUE]] ! # Ignores all args except --srcdir, --prefix, --exec-prefix, and ! # --with-PACKAGE[=VALUE] unless this script has special code to handle it. ! for arg do - # Handle --exec-prefix with a space before the argument. - if test x$next_exec_prefix = xyes; then exec_prefix=$arg; next_exec_prefix= - # Handle --host with a space before the argument. - elif test x$next_host = xyes; then next_host= - # Handle --prefix with a space before the argument. - elif test x$next_prefix = xyes; then prefix=$arg; next_prefix= - # Handle --srcdir with a space before the argument. - elif test x$next_srcdir = xyes; then srcdir=$arg; next_srcdir= - else - case $arg in - # For backward compatibility, recognize -exec-prefix and --exec_prefix. - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* | --exec=* | --exe=* | --ex=* | --e=*) - exec_prefix=`echo $arg | sed 's/[-a-z_]*=//'` ;; - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- | --exec | --exe | --ex | --e) - next_exec_prefix=yes ;; - - -gas | --gas | --ga | --g) ;; - - -host=* | --host=* | --hos=* | --ho=* | --h=*) ;; - -host | --host | --hos | --ho | --h) - next_host=yes ;; - - -nfp | --nfp | --nf) ;; - - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=`echo $arg | sed 's/[-a-z_]*=//'` ;; - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - next_prefix=yes ;; - - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=* | --s=*) - srcdir=`echo $arg | sed 's/[-a-z_]*=//'` ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr | --s) - next_srcdir=yes ;; - - -with-* | --with-*) - package=`echo $arg|sed -e 's/-*with-//' -e 's/=.*//'` - # Reject names that aren't valid shell variable names. - if test -n "`echo $package| sed 's/[-a-zA-Z0-9_]//g'`"; then - echo "configure: $package: invalid package name" >&2; exit 1 - fi - package=`echo $package| sed 's/-/_/g'` - case "$arg" in - *=*) val="`echo $arg|sed 's/[^=]*=//'`" ;; - *) val=1 ;; - esac - eval "with_$package='$val'" ;; ! -v | -verbose | --verbose | --verbos | --verbo | --verb | --ver | --ve | --v) ! verbose=yes ;; ! *) ;; esac ! fi done ! trap 'rm -fr conftest* confdefs* core; exit 1' 1 3 15 ! trap 'rm -f confdefs*' 0 # NLS nuisances. # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). ! if test "${LC_ALL+set}" = 'set' ; then LC_ALL=C; export LC_ALL; fi ! if test "${LANG+set}" = 'set' ; then LANG=C; export LANG; fi ! rm -f conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo > confdefs.h - compile='${CC-cc} $CFLAGS conftest.c -o conftest $LIBS >/dev/null 2>&1' # A filename unique to this package, relative to the directory that # configure is in, which we can look for to find out if srcdir is correct. ! unique_file=src/itcl_core.c # Find the source files, if location was not specified. if test -z "$srcdir"; then ! srcdirdefaulted=yes # Try the directory containing this script, then `..'. ! prog=$0 ! confdir=`echo $prog|sed 's%/[^/][^/]*$%%'` ! test "X$confdir" = "X$prog" && confdir=. ! srcdir=$confdir ! if test ! -r $srcdir/$unique_file; then srcdir=.. fi fi ! if test ! -r $srcdir/$unique_file; then ! if test x$srcdirdefaulted = xyes; then ! echo "configure: Can not find sources in \`${confdir}' or \`..'." 1>&2 else ! echo "configure: Can not find sources in \`${srcdir}'." 1>&2 fi - exit 1 fi ! # Preserve a srcdir of `.' to avoid automounter screwups with pwd. ! # But we can't avoid them for `..', to make subdirectories work. ! case $srcdir in ! .|/*|~*) ;; ! *) srcdir=`cd $srcdir; pwd` ;; # Make relative path absolute. ! esac ! - # Save the original args to write them into config.status later. - configure_args="$*" # Make sure to not get the incompatible SysV /etc/install and --- 7,326 ---- #!/bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 1.11 ! # Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc. ! # This configure script is free software; you can redistribute it and/or ! # modify it under the terms of the GNU General Public License as published ! # by the Free Software Foundation; either version 2, or (at your option) # any later version. ! # This script is distributed in the hope that it will be useful, but ! # WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General ! # Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! # Save the original args to write them into config.status later. ! configure_args="$*" ! ! # Only options that might do something get documented. ! ac_usage="Usage: configure [options] [host] ! Options: [defaults in brackets after descriptions] ! --build=BUILD configure for building on BUILD [BUILD=HOST] ! --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) ! --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ! --exec-prefix=PREFIX install host dependent files in PREFIX [/usr/local] ! --help print this message ! --host=HOST configure for HOST [guessed] ! --prefix=PREFIX install host independent files in PREFIX [/usr/local] ! --quiet, --silent do not print \`checking for...' messages ! --srcdir=DIR find the sources in DIR [configure dir or ..] ! --target=TARGET configure for TARGET [TARGET=HOST] ! --verbose print results of checks ! --version print the version of autoconf that created configure ! --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] ! --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) ! --x-includes=DIR X include files are in DIR ! --x-libraries=DIR X library files are in DIR" ! ! # Initialize some variables set by options. ! # The variables have the same names as the options, with ! # dashes changed to underlines. ! build=NONE ! exec_prefix= ! host=NONE ! no_create= ! nonopt=NONE ! norecursion= ! prefix= ! program_prefix= ! program_suffix= ! program_transform_name= ! silent= ! srcdir= ! target=NONE ! verbose= ! x_includes= ! x_libraries= ! ac_prev= ! for ac_option do ! # If the previous option needs an argument, assign it. ! if test -n "$ac_prev"; then ! eval "$ac_prev=\$ac_option" ! ac_prev= ! continue ! fi ! ! # Accept (but ignore some of) the important Cygnus configure ! # options, so we can diagnose typos. ! ! case "$ac_option" in ! -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; ! *) ac_optarg= ;; ! esac ! ! case "$ac_option" in ! ! -build | --build | --buil | --bui | --bu | --b) ! ac_prev=build ;; ! -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*) ! build="$ac_optarg" ;; ! ! -disable-* | --disable-*) ! ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` ! # Reject names that aren't valid shell variable names. ! if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then ! echo "configure: $ac_feature: invalid feature name" >&2; exit 1 ! fi ! ac_feature=`echo $ac_feature| sed 's/-/_/g'` ! eval "enable_${ac_feature}=no" ;; ! -enable-* | --enable-*) ! ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` ! # Reject names that aren't valid shell variable names. ! if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then ! echo "configure: $ac_feature: invalid feature name" >&2; exit 1 ! fi ! ac_feature=`echo $ac_feature| sed 's/-/_/g'` ! case "$ac_option" in ! *=*) ;; ! *) ac_optarg=yes ;; esac ! eval "enable_${ac_feature}='$ac_optarg'" ;; ! ! # For backward compatibility, recognize -exec-prefix and --exec_prefix. ! -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ ! | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ ! | --exec | --exe | --ex) ! ac_prev=exec_prefix ;; ! -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ ! | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ ! | --exec=* | --exe=* | --ex=*) ! exec_prefix="$ac_optarg" ;; ! ! -gas | --gas | --ga | --g) ! with_gas=yes ;; # Obsolete; use --with-gas. ! ! -help | --help | --hel | --he) ! cat << EOF ! $ac_usage ! EOF ! exit 0 ;; ! ! -host | --host | --hos | --ho) ! ac_prev=host ;; ! -host=* | --host=* | --hos=* | --ho=*) ! host="$ac_optarg" ;; ! ! -nfp | --nfp | --nf) ! with_fp=no ;; # Obsolete; use --without-fp. ! ! -no-create | --no-create | --no-creat | --no-crea | --no-cre \ ! | --no-cr | --no-c) ! no_create=yes ;; ! ! -norecursion | --norecursion | --norecursio | --norecursi \ ! | --norecurs | --norecur | --norecu | --norec | --nore | --nor) ! norecursion=yes ;; ! ! -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ! ac_prev=prefix ;; ! -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) ! prefix="$ac_optarg" ;; ! ! -program-prefix | --program-prefix | --program-prefi | --program-pref \ ! | --program-pre | --program-pr | --program-p) ! ac_prev=program_prefix ;; ! -program-prefix=* | --program-prefix=* | --program-prefi=* \ ! | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) ! program_prefix="$ac_optarg" ;; ! ! -program-suffix | --program-suffix | --program-suffi | --program-suff \ ! | --program-suf | --program-su | --program-s) ! ac_prev=program_suffix ;; ! -program-suffix=* | --program-suffix=* | --program-suffi=* \ ! | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) ! program_suffix="$ac_optarg" ;; ! ! -program-transform-name | --program-transform-name \ ! | --program-transform-nam | --program-transform-na \ ! | --program-transform-n | --program-transform- \ ! | --program-transform | --program-transfor \ ! | --program-transfo | --program-transf \ ! | --program-trans | --program-tran \ ! | --progr-tra | --program-tr | --program-t) ! ac_prev=program_transform_name ;; ! -program-transform-name=* | --program-transform-name=* \ ! | --program-transform-nam=* | --program-transform-na=* \ ! | --program-transform-n=* | --program-transform-=* \ ! | --program-transform=* | --program-transfor=* \ ! | --program-transfo=* | --program-transf=* \ ! | --program-trans=* | --program-tran=* \ ! | --progr-tra=* | --program-tr=* | --program-t=*) ! program_transform_name="$ac_optarg" ;; ! ! -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ! | -silent | --silent | --silen | --sile | --sil) ! silent=yes ;; ! ! -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ! ac_prev=srcdir ;; ! -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) ! srcdir="$ac_optarg" ;; ! ! -target | --target | --targe | --targ | --tar | --ta | --t) ! ac_prev=target ;; ! -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) ! target="$ac_optarg" ;; ! ! -v | -verbose | --verbose | --verbos | --verbo | --verb) ! verbose=yes ;; ! ! -version | --version | --versio | --versi | --vers) ! echo "configure generated by autoconf version 1.11" ! exit 0 ;; ! ! -with-* | --with-*) ! ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` ! # Reject names that aren't valid shell variable names. ! if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then ! echo "configure: $ac_package: invalid package name" >&2; exit 1 ! fi ! ac_package=`echo $ac_package| sed 's/-/_/g'` ! case "$ac_option" in ! *=*) ;; ! *) ac_optarg=yes ;; ! esac ! eval "with_${ac_package}='$ac_optarg'" ;; ! ! -without-* | --without-*) ! ac_package=`echo $ac_option|sed -e 's/-*without-//'` ! # Reject names that aren't valid shell variable names. ! if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then ! echo "configure: $ac_package: invalid package name" >&2; exit 1 ! fi ! ac_package=`echo $ac_package| sed 's/-/_/g'` ! eval "with_${ac_package}=no" ;; ! ! --x) with_x=yes ;; # Obsolete; use --with-x. ! ! -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ ! | --x-incl | --x-inc | --x-in | --x-i) ! ac_prev=x_includes ;; ! -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ ! | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) ! x_includes="$ac_optarg" ;; ! ! -x-libraries | --x-libraries | --x-librarie | --x-librari \ ! | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) ! ac_prev=x_libraries ;; ! -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ ! | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) ! x_libraries="$ac_optarg" ;; ! ! -*) echo "configure: $ac_option: invalid option; use --help to show usage" >&2; exit 1 ! ;; ! ! *) ! if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then ! echo "configure: warning: $ac_option: invalid host type" >&2 ! fi ! if test "x$nonopt" != xNONE; then ! echo "configure: can only configure for one host and one target at a time" >&2; exit 1 ! fi ! nonopt="$ac_option" ! ;; ! ! esac done ! if test -n "$ac_prev"; then ! echo "configure: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" >&2; exit 1 ! fi ! ! trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15 ! trap 'rm -fr confdefs* $ac_clean_files' 0 ! ! # Save the original args if we used an alternate arg parser. ! ac_configure_temp="${configure_args-$*}" ! # Strip out --no-create and --norecursion so they don't pile up. ! configure_args= ! for ac_arg in $ac_configure_temp; do ! case "$ac_arg" in ! -no-create | --no-create | --no-creat | --no-crea | --no-cre \ ! | --no-cr | --no-c) ;; ! -norecursion | --norecursion | --norecursio | --norecursi \ ! | --norecurs | --norecur | --norecu | --norec | --nore | --nor) ;; ! *) configure_args="$configure_args $ac_arg" ;; ! esac ! done # NLS nuisances. # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). ! if test "${LC_ALL+set}" = 'set'; then LC_ALL=C; export LC_ALL; fi ! if test "${LANG+set}" = 'set'; then LANG=C; export LANG; fi ! # confdefs.h avoids OS command line length limits that DEFS can exceed. ! rm -rf conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo > confdefs.h # A filename unique to this package, relative to the directory that # configure is in, which we can look for to find out if srcdir is correct. ! ac_unique_file=src/itcl_core.c # Find the source files, if location was not specified. if test -z "$srcdir"; then ! ac_srcdir_defaulted=yes # Try the directory containing this script, then `..'. ! ac_prog=$0 ! ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` ! test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. ! srcdir=$ac_confdir ! if test ! -r $srcdir/$ac_unique_file; then srcdir=.. fi fi ! if test ! -r $srcdir/$ac_unique_file; then ! if test x$ac_srcdir_defaulted = xyes; then ! echo "configure: can not find sources in ${ac_confdir} or .." >&2; exit 1 else ! echo "configure: can not find sources in ${srcdir}" >&2; exit 1 fi fi ! ac_ext=c ! # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ! ac_cpp='${CPP}' ! ac_compile='${CC-cc} $CFLAGS $LDFLAGS conftest.${ac_ext} -o conftest $LIBS >/dev/null 2>&1' # Make sure to not get the incompatible SysV /etc/install and *************** *** 141,214 **** # or the SunOS /usr/etc/install directory, or the AIX /bin/install, # or the AFS install, which mishandles nonexistent args, or # /usr/ucb/install on SVR4, which tries to use the nonexistent group ! # `staff'. On most BSDish systems install is in /usr/bin, not /usr/ucb ! # anyway. Sigh. ! if test "z${INSTALL}" = "z" ; then ! echo checking for install ! IFS="${IFS= }"; saveifs="$IFS"; IFS="${IFS}:" ! for dir in $PATH; do ! test -z "$dir" && dir=. ! case $dir in ! /etc|/usr/sbin|/usr/etc|/usr/afsws/bin|/usr/ucb) ;; *) ! if test -f $dir/installbsd; then ! INSTALL="$dir/installbsd -c" # OSF1 ! INSTALL_PROGRAM='$(INSTALL)' ! INSTALL_DATA='$(INSTALL) -m 644' ! break ! fi ! if test -f $dir/install; then ! if grep dspmsg $dir/install >/dev/null 2>&1; then ! : # AIX ! else ! INSTALL="$dir/install -c" ! INSTALL_PROGRAM='$(INSTALL)' ! INSTALL_DATA='$(INSTALL) -m 644' ! break fi ! fi ;; esac done ! IFS="$saveifs" fi - INSTALL=${INSTALL-cp} test -n "$verbose" && echo " setting INSTALL to $INSTALL" ! INSTALL_PROGRAM=${INSTALL_PROGRAM-'$(INSTALL)'} test -n "$verbose" && echo " setting INSTALL_PROGRAM to $INSTALL_PROGRAM" ! INSTALL_DATA=${INSTALL_DATA-'$(INSTALL)'} test -n "$verbose" && echo " setting INSTALL_DATA to $INSTALL_DATA" if test -z "$RANLIB"; then # Extract the first word of `ranlib', so it can be a program name with args. ! set dummy ranlib; word=$2 ! echo checking for $word ! IFS="${IFS= }"; saveifs="$IFS"; IFS="${IFS}:" ! for dir in $PATH; do ! test -z "$dir" && dir=. ! if test -f $dir/$word; then RANLIB="ranlib" break fi done ! IFS="$saveifs" fi test -z "$RANLIB" && RANLIB=":" test -n "$RANLIB" && test -n "$verbose" && echo " setting RANLIB to $RANLIB" ! echo checking how to run the C preprocessor if test -z "$CPP"; then # This must be in double quotes, not single quotes, because CPP may get # substituted into the Makefile and ``${CC-cc}'' will simply confuse # make. It must be expanded now. CPP="${CC-cc} -E" ! cat > conftest.c < Syntax Error EOF ! err=`eval "($CPP conftest.c >/dev/null) 2>&1"` ! if test -z "$err"; then : else rm -rf conftest* --- 328,437 ---- # or the SunOS /usr/etc/install directory, or the AIX /bin/install, # or the AFS install, which mishandles nonexistent args, or # /usr/ucb/install on SVR4, which tries to use the nonexistent group ! # `staff', or /sbin/install on IRIX which has incompatible command-line ! # syntax. Sigh. ! # ! # On most BSDish systems install is in /usr/bin, not /usr/ucb ! # anyway. ! # This turns out not to be true, so the mere pathname isn't an indication ! # of whether the program works. What we really need is a set of tests for ! # the install program to see if it actually works in all the required ways. ! # ! # Avoid using ./install, which might have been erroneously created ! # by make from ./install.sh. ! if test -z "${INSTALL}"; then ! test -n "$silent" || echo "checking for a BSD compatible install" ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! case "$ac_dir" in ! ''|.|/etc|/sbin|/usr/sbin|/usr/etc|/usr/afsws/bin|/usr/ucb) ;; *) ! # OSF1 and SCO ODT 3.0 have their own names for install. ! for ac_prog in installbsd 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. ! # OSF/1 installbsd also uses dspmsg, but is usable. ! : ! else ! INSTALL="$ac_dir/$ac_prog -c" ! break 2 ! fi fi ! done ;; esac done ! IFS="$ac_save_ifs" ! fi ! ! if test -z "$INSTALL"; then ! # As a last resort, use the slow shell script. ! for ac_dir in ${srcdir} ${srcdir}/.. ${srcdir}/../..; do ! if test -f $ac_dir/install.sh; then ! INSTALL="$ac_dir/install.sh -c"; break ! fi ! done ! fi ! if test -z "$INSTALL"; then ! echo "configure: can not find install.sh in ${srcdir} or ${srcdir}/.. or ${srcdir}/../.." >&2; exit 1 fi test -n "$verbose" && echo " setting INSTALL to $INSTALL" ! ! # Use test -z because SunOS4 sh mishandles ${INSTALL_PROGRAM-'${INSTALL}'}. ! # It thinks the first close brace ends the variable substitution. ! test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' test -n "$verbose" && echo " setting INSTALL_PROGRAM to $INSTALL_PROGRAM" ! ! test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' test -n "$verbose" && echo " setting INSTALL_DATA to $INSTALL_DATA" if test -z "$RANLIB"; then # Extract the first word of `ranlib', so it can be a program name with args. ! set ac_dummy ranlib; ac_word=$2 ! test -n "$silent" || echo "checking for $ac_word" ! 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 RANLIB="ranlib" break fi done ! IFS="$ac_save_ifs" fi test -z "$RANLIB" && RANLIB=":" test -n "$RANLIB" && test -n "$verbose" && echo " setting RANLIB to $RANLIB" ! test -n "$silent" || echo "checking how to run the C preprocessor" if test -z "$CPP"; then # This must be in double quotes, not single quotes, because CPP may get # substituted into the Makefile and ``${CC-cc}'' will simply confuse # make. It must be expanded now. CPP="${CC-cc} -E" ! cat > conftest.${ac_ext} < Syntax Error EOF ! # Some shells (Coherent) do redirections in the wrong order, so need ! # the parens. ! ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"` ! if test -z "$ac_err"; then ! : ! else ! rm -rf conftest* ! CPP="${CC-cc} -E -traditional-cpp" ! cat > conftest.${ac_ext} < ! Syntax Error ! EOF ! # Some shells (Coherent) do redirections in the wrong order, so need ! # the parens. ! ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"` ! if test -z "$ac_err"; then : else rm -rf conftest* *************** *** 216,222 **** fi rm -f conftest* fi ! test ".${verbose}" != "." && echo " setting CPP to $CPP" CC=${CC-cc} --- 439,447 ---- fi rm -f conftest* fi ! rm -f conftest* ! fi ! test -n "$verbose" && echo " setting CPP to $CPP" CC=${CC-cc} *************** *** 232,241 **** # they don't exist. #-------------------------------------------------------------------- ! echo checking for mode_t in sys/types.h echo '#include "confdefs.h" ! #include ' > conftest.c ! eval "$CPP conftest.c > conftest.out 2>&1" if egrep "mode_t" conftest.out >/dev/null 2>&1; then : else --- 457,466 ---- # they don't exist. #-------------------------------------------------------------------- ! test -n "$silent" || echo "checking for mode_t in sys/types.h" echo '#include "confdefs.h" ! #include ' > conftest.${ac_ext} ! eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1" if egrep "mode_t" conftest.out >/dev/null 2>&1; then : else *************** *** 243,260 **** { test -n "$verbose" && \ ! echo " defining" mode_t to be int ! echo "#define" mode_t int >> confdefs.h DEFS="$DEFS -Dmode_t=int" } fi rm -f conftest* ! echo checking for pid_t in sys/types.h echo '#include "confdefs.h" ! #include ' > conftest.c ! eval "$CPP conftest.c > conftest.out 2>&1" if egrep "pid_t" conftest.out >/dev/null 2>&1; then : else --- 468,485 ---- { test -n "$verbose" && \ ! echo " defining" mode_t to be "int" ! echo "#define" mode_t "int" >> confdefs.h DEFS="$DEFS -Dmode_t=int" } fi rm -f conftest* ! test -n "$silent" || echo "checking for pid_t in sys/types.h" echo '#include "confdefs.h" ! #include ' > conftest.${ac_ext} ! eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1" if egrep "pid_t" conftest.out >/dev/null 2>&1; then : else *************** *** 262,279 **** { test -n "$verbose" && \ ! echo " defining" pid_t to be int ! echo "#define" pid_t int >> confdefs.h DEFS="$DEFS -Dpid_t=int" } fi rm -f conftest* ! echo checking for size_t in sys/types.h echo '#include "confdefs.h" ! #include ' > conftest.c ! eval "$CPP conftest.c > conftest.out 2>&1" if egrep "size_t" conftest.out >/dev/null 2>&1; then : else --- 487,504 ---- { test -n "$verbose" && \ ! echo " defining" pid_t to be "int" ! echo "#define" pid_t "int" >> confdefs.h DEFS="$DEFS -Dpid_t=int" } fi rm -f conftest* ! test -n "$silent" || echo "checking for size_t in sys/types.h" echo '#include "confdefs.h" ! #include ' > conftest.${ac_ext} ! eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1" if egrep "size_t" conftest.out >/dev/null 2>&1; then : else *************** *** 281,298 **** { test -n "$verbose" && \ ! echo " defining" size_t to be unsigned ! echo "#define" size_t unsigned >> confdefs.h DEFS="$DEFS -Dsize_t=unsigned" } fi rm -f conftest* ! echo checking for uid_t in sys/types.h echo '#include "confdefs.h" ! #include ' > conftest.c ! eval "$CPP conftest.c > conftest.out 2>&1" if egrep "uid_t" conftest.out >/dev/null 2>&1; then : else --- 506,523 ---- { test -n "$verbose" && \ ! echo " defining" size_t to be "unsigned" ! echo "#define" size_t "unsigned" >> confdefs.h DEFS="$DEFS -Dsize_t=unsigned" } fi rm -f conftest* ! test -n "$silent" || echo "checking for uid_t in sys/types.h" echo '#include "confdefs.h" ! #include ' > conftest.${ac_ext} ! eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1" if egrep "uid_t" conftest.out >/dev/null 2>&1; then : else *************** *** 300,314 **** { test -n "$verbose" && \ ! echo " defining" uid_t to be int ! echo "#define" uid_t int >> confdefs.h DEFS="$DEFS -Duid_t=int" } { test -n "$verbose" && \ ! echo " defining" gid_t to be int ! echo "#define" gid_t int >> confdefs.h DEFS="$DEFS -Dgid_t=int" } --- 525,539 ---- { test -n "$verbose" && \ ! echo " defining" uid_t to be "int" ! echo "#define" uid_t "int" >> confdefs.h DEFS="$DEFS -Duid_t=int" } { test -n "$verbose" && \ ! echo " defining" gid_t to be "int" ! echo "#define" gid_t "int" >> confdefs.h DEFS="$DEFS -Dgid_t=int" } *************** *** 328,344 **** #-------------------------------------------------------------------- if test -z "$uname_found"; then # Extract the first word of `uname', so it can be a program name with args. ! set dummy uname; word=$2 ! echo checking for $word ! IFS="${IFS= }"; saveifs="$IFS"; IFS="${IFS}:" ! for dir in $PATH; do ! test -z "$dir" && dir=. ! if test -f $dir/$word; then uname_found="1" break fi done ! IFS="$saveifs" fi test -z "$uname_found" && uname_found="0" test -n "$uname_found" && test -n "$verbose" && echo " setting uname_found to $uname_found" --- 553,569 ---- #-------------------------------------------------------------------- if test -z "$uname_found"; then # Extract the first word of `uname', so it can be a program name with args. ! set ac_dummy uname; ac_word=$2 ! test -n "$silent" || echo "checking for $ac_word" ! 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 uname_found="1" break fi done ! IFS="$ac_save_ifs" fi test -z "$uname_found" && uname_found="0" test -n "$uname_found" && test -n "$verbose" && echo " setting uname_found to $uname_found" *************** *** 359,375 **** if test -z "$tk_ok"; then # Extract the first word of `xmkmf', so it can be a program name with args. ! set dummy xmkmf; word=$2 ! echo checking for $word ! IFS="${IFS= }"; saveifs="$IFS"; IFS="${IFS}:" ! for dir in $PATH; do ! test -z "$dir" && dir=. ! if test -f $dir/$word; then tk_ok="1" break fi done ! IFS="$saveifs" fi test -z "$tk_ok" && tk_ok="0" test -n "$tk_ok" && test -n "$verbose" && echo " setting tk_ok to $tk_ok" --- 584,600 ---- if test -z "$tk_ok"; then # Extract the first word of `xmkmf', so it can be a program name with args. ! set ac_dummy xmkmf; ac_word=$2 ! test -n "$silent" || echo "checking for $ac_word" ! 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 tk_ok="1" break fi done ! IFS="$ac_save_ifs" fi test -z "$tk_ok" && tk_ok="0" test -n "$tk_ok" && test -n "$verbose" && echo " setting tk_ok to $tk_ok" *************** *** 377,440 **** if test $tk_ok = 1; then # If we find X, set shell vars x_includes and x_libraries to the paths. no_x=true ! echo checking for X include and library files with xmkmf rm -fr conftestdir if mkdir conftestdir; then cd conftestdir ! cat > Imakefile <<\EOF acfindx: ! @echo "im_incroot=$(INCROOT); im_usrlibdir=$(USRLIBDIR); 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 acfindx | grep -v make` # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. ! if test ! -f $im_usrlibdir/libX11.a && test -f $im_libdir/libX11.a; then ! im_usrlibdir=$im_libdir fi ! case "$im_incroot" in /usr/include) ;; ! *) x_includes="$im_incroot" ;; esac ! case "$im_usrlibdir" in /usr/lib | /lib) ;; ! *) x_libraries="$im_usrlibdir" ;; esac fi cd .. rm -fr conftestdir fi ! if test -z "$im_usrlibdir"; then ! echo checking for X include and library files directly ! cat > conftest.c < EOF ! err=`eval "($CPP conftest.c >/dev/null) 2>&1"` ! if test -z "$err"; then rm -rf conftest* no_x= else rm -rf conftest* ! for dir in \ ! /usr/local/include \ ! /usr/unsupported/include \ ! /usr/x386/include \ ! /usr/local/x11r5/include \ ! /usr/include/X11R5 \ ! /usr/include/X11R4 \ ! /usr/X11R5/include \ ! /usr/X11/include \ ! /usr/openwin/include \ /usr/openwin/share/include \ - /usr/lpp/Xamples/include \ ; \ do ! if test -r $dir/X11/Intrinsic.h; then ! x_includes=$dir; no_x= break fi done --- 602,700 ---- if test $tk_ok = 1; then # If we find X, set shell vars x_includes and x_libraries to the paths. no_x=true ! if test "x$with_x" != xno; then ! test -n "$silent" || echo "checking for X include and library files with xmkmf" 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 acfindx 2>/dev/null | grep -v make` # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. ! if test ! -f $ac_im_usrlibdir/libX11.a && test -f $ac_im_libdir/libX11.a ! then ! ac_im_usrlibdir=$ac_im_libdir fi ! case "$ac_im_incroot" in /usr/include) ;; ! *) test -z "$x_includes" && x_includes="$ac_im_incroot" ;; esac ! case "$ac_im_usrlibdir" in /usr/lib | /lib) ;; ! *) test -z "$x_libraries" && x_libraries="$ac_im_usrlibdir" ;; esac fi cd .. rm -fr conftestdir fi ! if test -z "$ac_im_usrlibdir"; then ! test -n "$silent" || echo "checking for X include and library files directly" ! if test ".$x_direct_test_library" = . ; then ! x_direct_test_library='Xt' ! fi ! if test ".$x_direct_test_include" = . ; then ! x_direct_test_include='X11/Intrinsic.h' ! fi ! cat > conftest.${ac_ext} < EOF ! # Some shells (Coherent) do redirections in the wrong order, so need ! # the parens. ! ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"` ! if test -z "$ac_err"; then rm -rf conftest* no_x= else 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 ! test -z "$x_includes" && x_includes=$ac_dir ! no_x= break fi done *************** *** 443,484 **** # Check for the libraries. First see if replacing the `include' by # `lib' works. ! LIBS_save="${LIBS}" ! LIBS="${LIBS} -lXt" ! have_lib="" ! echo checking for -lXt ! cat > conftest.c < conftest.${ac_ext} < conftest.c < EOF ! err=`eval "($CPP conftest.c >/dev/null) 2>&1"` ! if test -z "$err"; then : else rm -rf conftest* --- 783,796 ---- else echo checking for X11 header files XINCLUDES="# no special path needed" ! cat > conftest.${ac_ext} < EOF ! # Some shells (Coherent) do redirections in the wrong order, so need ! # the parens. ! ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"` ! if test -z "$ac_err"; then : else rm -rf conftest* *************** *** 531,554 **** XLIBSW="-L$x_libraries -lX11" else echo "checking for X11 library archive" ! LIBS_save="${LIBS}" LIBS="${LIBS} -lX11" ! have_lib="" ! echo checking for -lX11 ! cat > conftest.c < conftest.${ac_ext} < conftest.c < conftest.${ac_ext} < conftest.c < conftest.${ac_ext} <conftest.def < config.status <conftest.def < config.status <&1; exit 1 ;; esac done ! trap 'rm -f Makefile src/Makefile man/Makefile library/Makefile; exit 1' 1 3 15 INSTALL='$INSTALL' INSTALL_PROGRAM='$INSTALL_PROGRAM' INSTALL_DATA='$INSTALL_DATA' --- 1164,1186 ---- # # $0 $configure_args ! ac_cs_usage="Usage: config.status [--recheck] [--version] [--help]" ! for ac_option do ! case "\$ac_option" in ! -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ! echo running \${CONFIG_SHELL-/bin/sh} $0 $configure_args --no-create ! exec \${CONFIG_SHELL-/bin/sh} $0 $configure_args --no-create ;; ! -version | --version | --versio | --versi | --vers | --ver | --ve | --v) ! echo "config.status generated by autoconf version 1.11" ! exit 0 ;; ! -help | --help | --hel | --he | --h) ! echo "\$ac_cs_usage"; exit 0 ;; ! *) echo "\$ac_cs_usage"; exit 1 ;; esac done ! trap 'rm -f Makefile src/Makefile man/Makefile library/Makefile; exit 1' 1 2 15 INSTALL='$INSTALL' INSTALL_PROGRAM='$INSTALL_PROGRAM' INSTALL_DATA='$INSTALL_DATA' *************** *** 875,883 **** XINCLUDES='$XINCLUDES' XLIBSW='$XLIBSW' TCL_SRCDIR='$TCL_SRCDIR' ! TCL_LIBDIR='$TCL_LIBDIR' TK_INCDIR='$TK_INCDIR' ! TK_LIBDIR='$TK_LIBDIR' SHLIB='$SHLIB' SHLIB_CCFLAGS='$SHLIB_CCFLAGS' SHLIB_LDFLAGS='$SHLIB_LDFLAGS' --- 1195,1203 ---- XINCLUDES='$XINCLUDES' XLIBSW='$XLIBSW' TCL_SRCDIR='$TCL_SRCDIR' ! TCL_LIBSW='$TCL_LIBSW' TK_INCDIR='$TK_INCDIR' ! TK_LIBSW='$TK_LIBSW' SHLIB='$SHLIB' SHLIB_CCFLAGS='$SHLIB_CCFLAGS' SHLIB_LDFLAGS='$SHLIB_LDFLAGS' *************** *** 885,914 **** SHLIB_SUFFIX='$SHLIB_SUFFIX' LIBS='$LIBS' srcdir='$srcdir' ! DEFS='$DEFS' prefix='$prefix' exec_prefix='$exec_prefix' ! prsub='$prsub' extrasub='$extrasub' EOF cat >> config.status <<\EOF ! top_srcdir=$srcdir CONFIG_FILES=${CONFIG_FILES-"Makefile src/Makefile man/Makefile library/Makefile"} ! for file in .. ${CONFIG_FILES}; do if test "x$file" != x..; then ! srcdir=$top_srcdir # Remove last slash and all that follows it. Not all systems have dirname. ! dir=`echo $file|sed 's%/[^/][^/]*$%%'` ! if test "$dir" != "$file"; then ! test "$top_srcdir" != . && srcdir=$top_srcdir/$dir ! test ! -d $dir && mkdir $dir fi ! echo creating $file ! rm -f $file ! echo "# Generated automatically from `echo $file|sed 's|.*/||'`.in by configure." > $file sed -e " ! $prsub $extrasub s%@INSTALL@%$INSTALL%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g --- 1205,1256 ---- SHLIB_SUFFIX='$SHLIB_SUFFIX' LIBS='$LIBS' srcdir='$srcdir' ! top_srcdir='$top_srcdir' prefix='$prefix' exec_prefix='$exec_prefix' ! DEFS='$DEFS' ! ac_prsub='$ac_prsub' ! ac_vpsub='$ac_vpsub' extrasub='$extrasub' EOF cat >> config.status <<\EOF ! ac_given_srcdir=$srcdir CONFIG_FILES=${CONFIG_FILES-"Makefile src/Makefile man/Makefile library/Makefile"} ! for ac_file in .. ${CONFIG_FILES}; do if test "x$ac_file" != x..; then # 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" ! ac_dir_suffix="/$ac_dir" ! else ! ac_dir_suffix= fi ! ! # A "../" for each directory in $ac_dir_suffix. ! ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` ! case "$ac_given_srcdir" in ! .) srcdir=. ! if test -z "$ac_dir_suffix"; then top_srcdir=. ! else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; ! /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; ! *) # Relative path. ! srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" ! top_srcdir="$ac_dots$ac_given_srcdir" ;; ! esac ! ! echo creating "$ac_file" ! rm -f "$ac_file" ! comment_str="Generated automatically from `echo $ac_file|sed 's|.*/||'`.in by configure." ! case "$ac_file" in ! *.c | *.h | *.C | *.cc | *.m ) echo "/* $comment_str */" > "$ac_file" ;; ! * ) echo "# $comment_str" > "$ac_file" ;; ! esac sed -e " ! $ac_prsub ! $ac_vpsub $extrasub s%@INSTALL@%$INSTALL%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g *************** *** 924,932 **** s%@XINCLUDES@%$XINCLUDES%g s%@XLIBSW@%$XLIBSW%g s%@TCL_SRCDIR@%$TCL_SRCDIR%g ! s%@TCL_LIBDIR@%$TCL_LIBDIR%g s%@TK_INCDIR@%$TK_INCDIR%g ! s%@TK_LIBDIR@%$TK_LIBDIR%g s%@SHLIB@%$SHLIB%g s%@SHLIB_CCFLAGS@%$SHLIB_CCFLAGS%g s%@SHLIB_LDFLAGS@%$SHLIB_LDFLAGS%g --- 1266,1274 ---- s%@XINCLUDES@%$XINCLUDES%g s%@XLIBSW@%$XLIBSW%g s%@TCL_SRCDIR@%$TCL_SRCDIR%g ! s%@TCL_LIBSW@%$TCL_LIBSW%g s%@TK_INCDIR@%$TK_INCDIR%g ! s%@TK_LIBSW@%$TK_LIBSW%g s%@SHLIB@%$SHLIB%g s%@SHLIB_CCFLAGS@%$SHLIB_CCFLAGS%g s%@SHLIB_LDFLAGS@%$SHLIB_LDFLAGS%g *************** *** 934,946 **** s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g s%@LIBS@%$LIBS%g s%@srcdir@%$srcdir%g s%@DEFS@%$DEFS% ! " $top_srcdir/${file}.in >> $file fi; done exit 0 EOF chmod +x config.status ! ${CONFIG_SHELL-/bin/sh} config.status --- 1276,1292 ---- s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g s%@LIBS@%$LIBS%g s%@srcdir@%$srcdir%g + s%@top_srcdir@%$top_srcdir%g + s%@prefix@%$prefix%g + s%@exec_prefix@%$exec_prefix%g s%@DEFS@%$DEFS% ! " $ac_given_srcdir/${ac_file}.in >> $ac_file fi; done exit 0 EOF chmod +x config.status ! # Some shells look in PATH for config.status without the "./". ! test -n "$no_create" || ${CONFIG_SHELL-/bin/sh} ./config.status diff -cr itcl-1.5/configure.in newitcl-1.5/configure.in *** itcl-1.5/configure.in Mon Apr 25 15:17:43 1994 --- newitcl-1.5/configure.in Wed Oct 5 18:21:08 1994 *************** *** 156,165 **** AC_SUBST(TCL_SRCDIR) #-------------------------------------------------------------------- ! # libtcl.a #-------------------------------------------------------------------- ! echo "checking for libtcl.a" ! TCL_LIBDIR="" places="$PWD/../tcl \ $PWD/../tcl7.3 \ $PWD/../tcl7.2 \ --- 156,165 ---- AC_SUBST(TCL_SRCDIR) #-------------------------------------------------------------------- ! # libtcl #-------------------------------------------------------------------- ! echo "checking for libtcl" ! TCL_LIBSW="" places="$PWD/../tcl \ $PWD/../tcl7.3 \ $PWD/../tcl7.2 \ *************** *** 172,189 **** /usr/local/lib \ /usr/lib" for dir in $places; do if test -r $dir/libtcl.a ; then ! TCL_LIBDIR=$dir break fi done ! if test -z "$TCL_LIBDIR" ; then ! echo "== Directory containing libtcl.a? (absolute path)" ! read TCL_LIBDIR fi ! echo "setting TCL_LIBDIR as $TCL_LIBDIR" ! AC_SUBST(TCL_LIBDIR) #-------------------------------------------------------------------- # tk.h --- 172,193 ---- /usr/local/lib \ /usr/lib" for dir in $places; do + if test -r $dir/libtcl.so.* ; then + TCL_LIBSW="-L$dir -ltcl" + break + fi if test -r $dir/libtcl.a ; then ! TCL_LIBSW=$dir/libtcl.a break fi done ! if test -z "$TCL_LIBSW" ; then ! echo "== How should I load libtcl.so or libtcl.a?" ! read TCL_LIBSW fi ! echo "setting TCL_LIBSW as $TCL_LIBSW" ! AC_SUBST(TCL_LIBSW) #-------------------------------------------------------------------- # tk.h *************** *** 215,224 **** AC_SUBST(TK_INCDIR) #-------------------------------------------------------------------- ! # libtk.a #-------------------------------------------------------------------- ! echo "checking for libtk.a" ! TK_LIBDIR="" places="$PWD/../tk \ $PWD/../tk3.6 \ $PWD/../tk3.5 \ --- 219,228 ---- AC_SUBST(TK_INCDIR) #-------------------------------------------------------------------- ! # libtk #-------------------------------------------------------------------- ! echo "checking for libtk" ! TK_LIBSW="" places="$PWD/../tk \ $PWD/../tk3.6 \ $PWD/../tk3.5 \ *************** *** 231,248 **** /usr/local/include \ /usr/include" for dir in $places; do if test -r $dir/libtk.a ; then ! TK_LIBDIR=$dir break fi done ! if test -z "$TK_LIBDIR" ; then ! echo "== Directory containing libtk.a? (absolute path)" ! read TK_LIBDIR fi ! echo "setting TK_LIBDIR as $TK_LIBDIR" ! AC_SUBST(TK_LIBDIR) #-------------------------------------------------------------------- # See if shared libraries can and should be built --- 235,256 ---- /usr/local/include \ /usr/include" for dir in $places; do + if test -r $dir/libtk.so.* ; then + TK_LIBSW="-L$dir -ltk" + break + fi if test -r $dir/libtk.a ; then ! TK_LIBSW=$dir/libtk.a break fi done ! if test -z "$TK_LIBSW" ; then ! echo "== How should I load libtk.so or libtk.a?" ! read TK_LIBSW fi ! echo "setting TK_LIBSW as $TK_LIBSW" ! AC_SUBST(TK_LIBSW) #-------------------------------------------------------------------- # See if shared libraries can and should be built *************** *** 288,293 **** --- 296,308 ---- SHLIB_LDFLAGS="-shared" SHLIB_LOADER="$CC" SHLIB_SUFFIX=".so.$(VERSION)" + ;; + FreeBSD-1.1*) + SHLIB="libitcl.so.$VERSION" + SHLIB_CCFLAGS="-fpic -DPIC" + SHLIB_LDFLAGS="-Bshareable -Bforcearchive" + SHLIB_LOADER="ld" + SHLIB_SUFFIX=".so.$VERSION" ;; *) echo "== Don't know how to build shared libraries for $system" diff -cr itcl-1.5/library/Makefile.in newitcl-1.5/library/Makefile.in *** itcl-1.5/library/Makefile.in Fri Mar 25 13:59:28 1994 --- newitcl-1.5/library/Makefile.in Wed Oct 5 18:21:08 1994 *************** *** 23,29 **** prefix = /usr/local # Directory for Tcl library files: ! LIBRARY_DIR = $(prefix)/library # --------------------------------------------------------------------------- # The information below is modified by the configure script when Makefile --- 23,29 ---- prefix = /usr/local # Directory for Tcl library files: ! LIBRARY_DIR = $(prefix)/lib/itcl # --------------------------------------------------------------------------- # The information below is modified by the configure script when Makefile *************** *** 53,68 **** else true; \ fi; \ done; ! @cd $(SRC_DIR); for i in *.tcl; do \ echo "Installing $$i"; \ rm -f $(LIBRARY_DIR)/$$i; \ $(INSTALL_DATA) $$i $(LIBRARY_DIR); \ chmod 444 $(LIBRARY_DIR)/$$i; \ done; - @echo "updating tclIndex for library files..." - @HERE=`pwd`; cd $(LIBRARY_DIR); \ - echo "source $$HERE/itcl_mkindex.tcl; itcl_mkindex . *.tcl" \ - | $$HERE/../src/itcl_sh; Makefile: $(SRC_DIR)/Makefile.in $(SHELL) config.status --- 53,67 ---- else true; \ fi; \ done; ! @echo "updating tclIndex for library files..." ! @echo "source itcl_mkindex.tcl; itcl_mkindex . *.tcl" \ ! | ../src/itcl_sh; ! @cd $(SRC_DIR); for i in *.tcl tclIndex; do \ echo "Installing $$i"; \ rm -f $(LIBRARY_DIR)/$$i; \ $(INSTALL_DATA) $$i $(LIBRARY_DIR); \ chmod 444 $(LIBRARY_DIR)/$$i; \ done; Makefile: $(SRC_DIR)/Makefile.in $(SHELL) config.status diff -cr itcl-1.5/src/Makefile.in newitcl-1.5/src/Makefile.in *** itcl-1.5/src/Makefile.in Fri Mar 25 14:01:06 1994 --- newitcl-1.5/src/Makefile.in Wed Oct 5 18:21:08 1994 *************** *** 51,61 **** # Tcl library # (the configure script should find it; if not, edit below) ! TCL_LIB = @TCL_LIBDIR@/libtcl.a # Tk library # (the configure script should find it; if not, edit below) ! TK_LIB = @TK_LIBDIR@/libtk.a # Linker switch(es) to use to link with the X11 library archive (the # configure script will try to set this value automatically, but you --- 51,61 ---- # Tcl library # (the configure script should find it; if not, edit below) ! TCL_LIB = @TCL_LIBSW@ # Tk library # (the configure script should find it; if not, edit below) ! TK_LIB = @TK_LIBSW@ # Linker switch(es) to use to link with the X11 library archive (the # configure script will try to set this value automatically, but you *************** *** 143,153 **** rm -f libitcl@SHLIB_SUFFIX@ @SHLIB_LOADER@ @SHLIB_LDFLAGS@ -o $@ $(SOBJS) ! itcl_wish: tkAppInit.o libitcl.a ! $(CC) $(CC_SWITCHES) tkAppInit.o libitcl.a $(LIBS) -o itcl_wish ! itcl_sh: tclAppInit.o libitcl.a ! $(CC) $(CC_SWITCHES) tclAppInit.o libitcl.a $(TCL_LIB) -lm -o itcl_sh test: itcl_sh @( echo cd $(SRC_DIR)/../tests\; source all\; exit ) | ./itcl_sh --- 143,153 ---- rm -f libitcl@SHLIB_SUFFIX@ @SHLIB_LOADER@ @SHLIB_LDFLAGS@ -o $@ $(SOBJS) ! itcl_wish: tkAppInit.o @SHLIB@ libitcl.a ! $(CC) $(CC_SWITCHES) tkAppInit.o -L. -litcl $(LIBS) -o itcl_wish ! itcl_sh: tclAppInit.o @SHLIB@ libitcl.a ! $(CC) $(CC_SWITCHES) tclAppInit.o -L. -litcl $(TCL_LIB) -lm -o itcl_sh test: itcl_sh @( echo cd $(SRC_DIR)/../tests\; source all\; exit ) | ./itcl_sh *************** *** 185,191 **** $(SHELL) config.status clean: ! rm -f *.o *.a *.so *.so.* core errs *~ \#* TAGS *.E a.out errors rm -f itcl_wish itcl_sh *pure* distclean: clean --- 185,191 ---- $(SHELL) config.status clean: ! rm -f *.o *.a *.so *.so.* core *.core errs *~ \#* TAGS *.E a.out errors rm -f itcl_wish itcl_sh *pure* distclean: clean