diff options
| author | mdejong <mdejong> | 2001-07-06 02:25:02 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2001-07-06 02:25:02 (GMT) |
| commit | 55eeb4b96b986ad55e420ef4cfc69f60b5079a9a (patch) | |
| tree | d1509cd512946fb87caf380cc8e2f486161d531c /win/tcl.m4 | |
| parent | 6def9e2b36ded878eebdbd2d7003f0695c3a7271 (diff) | |
| download | tk-55eeb4b96b986ad55e420ef4cfc69f60b5079a9a.zip tk-55eeb4b96b986ad55e420ef4cfc69f60b5079a9a.tar.gz tk-55eeb4b96b986ad55e420ef4cfc69f60b5079a9a.tar.bz2 | |
* 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.
Diffstat (limited to 'win/tcl.m4')
| -rw-r--r-- | win/tcl.m4 | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -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 |