diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | win/Makefile.in | 25 | ||||
| -rwxr-xr-x | win/configure | 46 | ||||
| -rw-r--r-- | win/configure.in | 3 | ||||
| -rw-r--r-- | win/tcl.m4 | 12 |
5 files changed, 57 insertions, 38 deletions
@@ -1,3 +1,12 @@ +2001-07-05 Mo DeJong <mdejong@redhat.com> + + * win/Makefile.in: Subst DEPARG directly instead + of relying on a variable. This will make Cygwin + build faster since an extra exec will be avoided. + * win/configure: Regen. + * win/configure.in: Subst DEPARG. + * win/tcl.m4: Update from Tcl. + 2001-07-04 Jeff Hobbs <jeffh@ActiveState.com> * README: diff --git a/win/Makefile.in b/win/Makefile.in index 30320e8..4463c67 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.40 2001/07/04 00:25:09 mdejong Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.41 2001/07/06 02:25:02 mdejong Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -85,7 +85,7 @@ TCL_BIN_DIR = @TCL_BIN_DIR@ # been replaced by the configure script): TCL_GENERIC_DIR = @TCL_SRC_DIR@/generic -# This program converts between Windows native and Cygwin POSIX pathnames. +# Converts a POSIX path to a Windows native path. CYGPATH = @CYGPATH@ # The name of the Tcl library. @@ -129,11 +129,6 @@ MAN2TCL = man2tcl$(EXEEXT) @SET_MAKE@ -# Macro that expands to the first dependency argument with the appropriate -# path type already resolved. - -DEPARG = "$(shell $(CYGPATH) $<)" - # Setting the VPATH variable to a list of paths will cause the # makefile to look into these paths when resolving .c to .obj # dependencies. @@ -515,7 +510,7 @@ $(TKTEST): $(TK_LIB_FILE) $(TKTEST_OBJS) wish.$(RES) $(CAT32) wish.$(RES) $(CC_EXENAME) $(LDFLAGS_WINDOW) cat32.${OBJEXT}: $(TCL_SRC_DIR)/win/cat.c - $(CC) -c $(CC_SWITCHES) $(DEPARG) $(CC_OBJNAME) + $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) $(CAT32): cat32.${OBJEXT} $(CC) $(CFLAGS) cat32.$(OBJEXT) $(CC_EXENAME) $(LDFLAGS_CONSOLE) @@ -540,19 +535,19 @@ ${TK_LIB_FILE}: ${TK_OBJS} # Special case object file targets winMain.$(OBJEXT): winMain.c - $(CC) -c $(CC_SWITCHES) $(DEPARG) $(CC_OBJNAME) + $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) testMain.$(OBJEXT): winMain.c - $(CC) -c $(CC_SWITCHES) $(DEPARG) -DTK_TEST $(CC_OBJNAME) + $(CC) -c $(CC_SWITCHES) @DEPARG@ -DTK_TEST $(CC_OBJNAME) tkTest.$(OBJEXT): tkTest.c - $(CC) -c $(CC_SWITCHES) $(DEPARG) $(CC_OBJNAME) + $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) tkWinTest.$(OBJEXT): tkWinTest.c - $(CC) -c $(CC_SWITCHES) $(DEPARG) $(CC_OBJNAME) + $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) tkSquare.$(OBJEXT): tkSquare.c - $(CC) -c $(CC_SWITCHES) $(DEPARG) $(CC_OBJNAME) + $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) tclThreadTest.$(OBJEXT): $(TCL_BIN_DIR)/tclThreadTest.$(OBJEXT) @@ -566,10 +561,10 @@ tclThreadTest.$(OBJEXT): $(TCL_BIN_DIR)/tclThreadTest.$(OBJEXT) # Implicit rule for all object files that will end up in the Tcl library .c.$(OBJEXT): - $(CC) -c $(STUB_CC_SWITCHES) -DBUILD_tk ${DEPARG} $(CC_OBJNAME) + $(CC) -c $(STUB_CC_SWITCHES) -DBUILD_tk @DEPARG@ $(CC_OBJNAME) .rc.$(RES): - $(RC) @RC_OUT@ $@ @RC_TYPE@ @RC_DEFINES@ @RC_INCLUDE@ "$(GENERIC_DIR_NATIVE)" @RC_INCLUDE@ "$(TCL_GENERIC_NATIVE)" @RC_INCLUDE@ "$(RC_DIR_NATIVE)" $(DEPARG) + $(RC) @RC_OUT@ $@ @RC_TYPE@ @RC_DEFINES@ @RC_INCLUDE@ "$(GENERIC_DIR_NATIVE)" @RC_INCLUDE@ "$(TCL_GENERIC_NATIVE)" @RC_INCLUDE@ "$(RC_DIR_NATIVE)" @DEPARG@ depend: diff --git a/win/configure b/win/configure index e2fce04..748570d 100755 --- a/win/configure +++ b/win/configure @@ -1132,8 +1132,6 @@ fi echo "$ac_t""$do64bit" 1>&6 - echo $ac_n "checking compiler flags""... $ac_c" 1>&6 -echo "configure:1137: checking compiler flags" >&5 # Set some defaults (may get changed below) EXTRA_CFLAGS="" @@ -1141,7 +1139,7 @@ echo "configure:1137: checking compiler flags" >&5 # 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:1145: checking for $ac_word" >&5 +echo "configure:1143: 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 @@ -1169,8 +1167,16 @@ else fi + if test "$CYGPATH" = "echo" || test "$ac_cv_cygwin" = "yes"; then + DEPARG='"$<"' + else + DEPARG='"$(shell $(CYGPATH) $<)"' + fi + # 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:1180: checking compiler flags" >&5 if test "${GCC}" = "yes" ; then if test "$do64bit" = "yes" ; then echo "configure: warning: "64bit mode not supported with GCC on Windows"" 1>&2 @@ -1190,7 +1196,7 @@ fi MAKE_EXE="\${CC} -o \$@" LIBPREFIX="lib" - if "$CC" -v 2>&1 | egrep '\/gcc-lib\/i[3-6]86[^\/]*-cygwin' >/dev/null; then + if test "$ac_cv_cygwin" = "yes"; then extra_cflags="-mno-cygwin" extra_ldflags="-mno-cygwin" else @@ -1315,7 +1321,7 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1319: checking how to run the C preprocessor" >&5 +echo "configure:1325: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1330,13 +1336,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1334 "configure" +#line 1340 "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:1340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1346: \"$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 : @@ -1347,13 +1353,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1351 "configure" +#line 1357 "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:1357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1363: \"$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 : @@ -1364,13 +1370,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1368 "configure" +#line 1374 "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:1374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1380: \"$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 : @@ -1396,17 +1402,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:1400: checking for errno.h" >&5 +echo "configure:1406: 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 1405 "configure" +#line 1411 "configure" #include "confdefs.h" #include <errno.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1416: \"$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* @@ -1438,7 +1444,7 @@ fi echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 -echo "configure:1442: checking for build with symbols" >&5 +echo "configure:1448: 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" @@ -1469,7 +1475,7 @@ TK_DBGX=${DBGX} echo $ac_n "checking the location of tclConfig.sh""... $ac_c" 1>&6 -echo "configure:1473: checking the location of tclConfig.sh" >&5 +echo "configure:1479: checking the location of tclConfig.sh" >&5 if test -d ../../tcl8.4$TK_PATCH_LEVEL/win; then TCL_BIN_DIR_DEFAULT=../../tcl8.4$TK_PATCH_LEVEL/win @@ -1495,7 +1501,7 @@ fi echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6 -echo "configure:1499: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 +echo "configure:1505: 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 @@ -1517,7 +1523,7 @@ echo "configure:1499: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:1521: checking for tclsh" >&5 +echo "configure:1527: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1684,6 +1690,7 @@ fi + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1868,6 +1875,7 @@ 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%@TK_SHARED_BUILD@%$TK_SHARED_BUILD%g +s%@DEPARG@%$DEPARG%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 6f006df..1de35e1 100644 --- a/win/configure.in +++ b/win/configure.in @@ -2,7 +2,7 @@ # generate the file "configure", which is run during Tk installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.34 2001/07/04 00:25:09 mdejong Exp $ +# RCS: @(#) $Id: configure.in,v 1.35 2001/07/06 02:25:02 mdejong Exp $ AC_INIT(../generic/tk.h) @@ -212,6 +212,7 @@ AC_SUBST(CFG_TK_EXPORT_FILE_SUFFIX) AC_SUBST(TK_SHARED_BUILD) AC_SUBST(CYGPATH) +AC_SUBST(DEPARG) AC_SUBST(CFLAGS_DEFAULT) AC_SUBST(CFLAGS_DEBUG) AC_SUBST(CFLAGS_OPTIMIZE) @@ -325,15 +325,21 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ AC_ARG_ENABLE(64bit,[ --enable-64bit enable 64bit support (where applicable)], [do64bit=$enableval], [do64bit=no]) AC_MSG_RESULT($do64bit) - AC_MSG_CHECKING([compiler flags]) # Set some defaults (may get changed below) EXTRA_CFLAGS="" AC_CHECK_PROG(CYGPATH, cygpath, cygpath -w, echo) + if test "$CYGPATH" = "echo" || test "$ac_cv_cygwin" = "yes"; then + DEPARG='"$<"' + else + DEPARG='"$(shell $(CYGPATH) $<)"' + fi + # set various compiler flags depending on whether we are using gcc or cl - + + AC_MSG_CHECKING([compiler flags]) if test "${GCC}" = "yes" ; then if test "$do64bit" = "yes" ; then AC_MSG_WARN("64bit mode not supported with GCC on Windows") @@ -353,7 +359,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ MAKE_EXE="\${CC} -o \[$]@" LIBPREFIX="lib" - if "$CC" -v 2>&1 | egrep '\/gcc-lib\/i[[3-6]]86[[^\/]]*-cygwin' >/dev/null; then + if test "$ac_cv_cygwin" = "yes"; then extra_cflags="-mno-cygwin" extra_ldflags="-mno-cygwin" else |