From effafed363f9f283c32c0006ee0d244e84a57797 Mon Sep 17 00:00:00 2001 From: mdejong Date: Wed, 27 Jun 2001 01:06:12 +0000 Subject: * win/Makefile.in: Use : to separate VPATH entries. This works for both Cygwin builds and cross builds, the VPSEP variable is simply unneeded complexity. * win/configure: Regen. * win/configure.in: Don't subst VPSEP. * win/tcl.m4 (SC_CONFIG_CFLAGS): Remove VPSEP variable. --- ChangeLog | 9 +++++++++ win/Makefile.in | 7 +++---- win/configure | 26 +++++++++++--------------- win/configure.in | 3 +-- win/tcl.m4 | 3 --- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c7e6cc..c9b70b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2001-06-26 Mo DeJong + * win/Makefile.in: Use : to separate VPATH entries. This + works for both Cygwin builds and cross builds, the VPSEP + variable is simply unneeded complexity. + * win/configure: Regen. + * win/configure.in: Don't subst VPSEP. + * win/tcl.m4 (SC_CONFIG_CFLAGS): Remove VPSEP variable. + +2001-06-26 Mo DeJong + * unix/configure: Regen. * unix/configure.in: Fix last checkin by removing export since that only works in bash. diff --git a/win/Makefile.in b/win/Makefile.in index db61aae..0354bcb 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.45 2001/06/22 23:02:53 mdejong Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.46 2001/06/27 01:06:12 mdejong Exp $ VERSION = @TCL_VERSION@ @@ -146,10 +146,9 @@ DEPARG = "$(shell $(CYGPATH) $(PATHTYPE) $<)" # Setting the VPATH variable to a list of paths will cause the # makefile to look into these paths when resolving .c to .obj -# dependencies. Note the ':' to avoid autoconf's habit of deleting -# all VPATH lines without an explicit ':' in it. +# dependencies. -VPATH = $(GENERIC_DIR)@VPSEP@$(WIN_DIR)@VPSEP@$(COMPAT_DIR) # : +VPATH = $(GENERIC_DIR):$(WIN_DIR):$(COMPAT_DIR) AR = @AR@ RANLIB = @RANLIB@ diff --git a/win/configure b/win/configure index d8c61e0..c8223e7 100755 --- a/win/configure +++ b/win/configure @@ -1130,7 +1130,6 @@ echo "configure:1128: checking compiler flags" >&5 EXTRA_CFLAGS="" PATHTYPE='-w' CYGPATH='cygpath' - VPSEP=';' # set various compiler flags depending on whether we are using gcc or cl @@ -1166,7 +1165,6 @@ echo "configure:1128: checking compiler flags" >&5 if test "$cross_compiling" = "yes" -o "$mno_cygwin" = "yes"; then PATHTYPE='' CYGPATH='echo ' - VPSEP=':' fi if test "${SHARED_BUILD}" = "0" ; then @@ -1289,7 +1287,7 @@ echo "configure:1128: checking compiler flags" >&5 echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 -echo "configure:1293: checking for build with symbols" >&5 +echo "configure:1291: 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" @@ -1319,7 +1317,7 @@ TCL_DBGX=${DBGX} #-------------------------------------------------------------------- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1323: checking how to run the C preprocessor" >&5 +echo "configure:1321: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1334,13 +1332,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1342: \"$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 : @@ -1351,13 +1349,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1359: \"$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 : @@ -1368,13 +1366,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1376: \"$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 : @@ -1400,17 +1398,17 @@ echo "$ac_t""$CPP" 1>&6 ac_safe=`echo "errno.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for errno.h""... $ac_c" 1>&6 -echo "configure:1404: checking for errno.h" >&5 +echo "configure:1402: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1412: \"$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* @@ -1556,7 +1554,6 @@ fi - trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1733,7 +1730,6 @@ s%@CFG_TCL_EXPORT_FILE_SUFFIX@%$CFG_TCL_EXPORT_FILE_SUFFIX%g s%@TCL_SHARED_BUILD@%$TCL_SHARED_BUILD%g s%@PATHTYPE@%$PATHTYPE%g s%@CYGPATH@%$CYGPATH%g -s%@VPSEP@%$VPSEP%g s%@CFLAGS_DEFAULT@%$CFLAGS_DEFAULT%g s%@CFLAGS_DEBUG@%$CFLAGS_DEBUG%g s%@CFLAGS_OPTIMIZE@%$CFLAGS_OPTIMIZE%g diff --git a/win/configure.in b/win/configure.in index 09df34f..793969d 100644 --- a/win/configure.in +++ b/win/configure.in @@ -2,7 +2,7 @@ # generate the file "configure", which is run during Tcl installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.36 2001/06/26 20:28:43 mdejong Exp $ +# RCS: @(#) $Id: configure.in,v 1.37 2001/06/27 01:06:12 mdejong Exp $ AC_INIT(../generic/tcl.h) @@ -188,7 +188,6 @@ AC_SUBST(TCL_SHARED_BUILD) AC_SUBST(PATHTYPE) AC_SUBST(CYGPATH) -AC_SUBST(VPSEP) AC_SUBST(CFLAGS_DEFAULT) AC_SUBST(CFLAGS_DEBUG) AC_SUBST(CFLAGS_OPTIMIZE) diff --git a/win/tcl.m4 b/win/tcl.m4 index 9083f60..5cfc2db 100644 --- a/win/tcl.m4 +++ b/win/tcl.m4 @@ -298,7 +298,6 @@ AC_DEFUN(SC_ENABLE_SYMBOLS, [ # CC_OBJNAME # CC_EXENAME # PATHTYPE -# VPSEP # CYGPATH # SHLIB_LD # SHLIB_LD_LIBS @@ -333,7 +332,6 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ EXTRA_CFLAGS="" PATHTYPE='-w' CYGPATH='cygpath' - VPSEP=';' # set various compiler flags depending on whether we are using gcc or cl @@ -369,7 +367,6 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ if test "$cross_compiling" = "yes" -o "$mno_cygwin" = "yes"; then PATHTYPE='' CYGPATH='echo ' - VPSEP=':' fi if test "${SHARED_BUILD}" = "0" ; then -- cgit v0.12