summaryrefslogtreecommitdiffstats
path: root/win/tcl.m4
diff options
context:
space:
mode:
authormdejong <mdejong>2001-07-04 00:07:46 (GMT)
committermdejong <mdejong>2001-07-04 00:07:46 (GMT)
commit0962ee532bf11303e62d73a81dcc1d8aa8ef7377 (patch)
tree317b78244e9083510daa68ff541076bcad76beab /win/tcl.m4
parent72849b19b3634415af9c5b82658cddc9ff8b86b8 (diff)
downloadtcl-0962ee532bf11303e62d73a81dcc1d8aa8ef7377.zip
tcl-0962ee532bf11303e62d73a81dcc1d8aa8ef7377.tar.gz
tcl-0962ee532bf11303e62d73a81dcc1d8aa8ef7377.tar.bz2
* win/Makefile.in: Remove PATHTYPE variable.
* win/configure: Regen. * win/configure.in: Don't subst PATHTYPE. * win/tcl.m4 (SC_CONFIG_CFLAGS): Remove PATHTYPE variable. Set CYGPATH to "cygpath -w" if the cygpath executable is found on the path. This approach works for native Cygwin builds and cross compiles.
Diffstat (limited to 'win/tcl.m4')
-rw-r--r--win/tcl.m414
1 files changed, 3 insertions, 11 deletions
diff --git a/win/tcl.m4 b/win/tcl.m4
index f5fdf8c..5e6e36f 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -297,7 +297,6 @@ AC_DEFUN(SC_ENABLE_SYMBOLS, [
# LDFLAGS_WINDOW
# CC_OBJNAME
# CC_EXENAME
-# PATHTYPE
# CYGPATH
# SHLIB_LD
# SHLIB_LD_LIBS
@@ -330,8 +329,8 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
# Set some defaults (may get changed below)
EXTRA_CFLAGS=""
- PATHTYPE='-w'
- CYGPATH='cygpath'
+
+ AC_CHECK_PROG(CYGPATH, cygpath, cygpath -w, echo)
# set various compiler flags depending on whether we are using gcc or cl
@@ -355,20 +354,13 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
LIBPREFIX="lib"
if "$CC" -v 2>&1 | egrep '\/gcc-lib\/i[[3-6]]86[[^\/]]*-cygwin' >/dev/null; then
- mno_cygwin="yes"
extra_cflags="-mno-cygwin"
extra_ldflags="-mno-cygwin"
else
- mno_cygwin="no"
extra_cflags=""
extra_ldflags=""
fi
- if test "$cross_compiling" = "yes" -o "$mno_cygwin" = "yes"; then
- PATHTYPE=''
- CYGPATH='echo '
- fi
-
if test "${SHARED_BUILD}" = "0" ; then
# static
AC_MSG_RESULT([using static flags])
@@ -468,7 +460,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
# Specify the CC output file names based on the target name
CC_OBJNAME="-Fo\[$]@"
- CC_EXENAME="-Fe\"\$(shell \$(CYGPATH) \$(PATHTYPE) '\[$]@')\""
+ CC_EXENAME="-Fe\"\$(shell \$(CYGPATH) '\[$]@')\""
# Specify linker flags depending on the type of app being
# built -- Console vs. Window.