First pass on the Msys style windows build. Moving Zipfs features closer together in the autoconf

3 files changed, 150 insertions, 154 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index d7cc3c7..4540710 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -199,10 +199,6 @@ LD_SEARCH_FLAGS	= @LD_SEARCH_FLAGS@
 BUILD_DLTEST		= @BUILD_DLTEST@
 #BUILD_DLTEST		=
 
-TCL_ZIP_FILE		= @TCL_ZIP_FILE@
-TCL_VFS_PATH		= libtcl.vfs/tcl_library
-TCL_VFS_ROOT		= libtcl.vfs
-
 TCL_LIB_FILE		= @TCL_LIB_FILE@
 #TCL_LIB_FILE		= libtcl.a
 
@@ -247,12 +243,6 @@ ZLIB_INCLUDE		= @ZLIB_INCLUDE@
 
 CC			= @CC@
 OBJEXT		        = @OBJEXT@
-HOST_CC		        = @CC_FOR_BUILD@
-HOST_EXEEXT             = @EXEEXT_FOR_BUILD@
-HOST_OBJEXT             = @OBJEXT_FOR_BUILD@
-ZIPFS_BUILD	        = @ZIPFS_BUILD@
-NATIVE_ZIP		= @ZIP_PROG@
-SHARED_BUILD		= @SHARED_BUILD@
 
 #CC			= purify -best-effort @CC@ -DPURIFY
 
@@ -263,10 +253,6 @@ MAN_FLAGS               = @MAN_FLAGS@
 # If non-empty, install the timezone files that are included with Tcl,
 # otherwise use the ones that ship with the OS.
 INSTALL_TZDATA		= @INSTALL_TZDATA@
-INSTALL_LIBRARIES       = @INSTALL_LIBRARIES@
-INSTALL_MSGS            = @INSTALL_MSGS@
-
-
 
 #--------------------------------------------------------------------------
 # The information below is usually usable as is. The configure script won't
@@ -633,6 +619,23 @@ ZLIB_SRCS = \
 SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \
 	$(OO_SRCS) $(STUB_SRCS) @PLAT_SRCS@ @ZLIB_SRCS@
 
+###
+# Tip 430 - ZipFS Modifications
+###
+
+TCL_ZIP_FILE		= @TCL_ZIP_FILE@
+TCL_VFS_PATH		= libtcl.vfs/tcl_library
+TCL_VFS_ROOT		= libtcl.vfs
+
+HOST_CC		        = @CC_FOR_BUILD@
+HOST_EXEEXT             = @EXEEXT_FOR_BUILD@
+HOST_OBJEXT             = @OBJEXT_FOR_BUILD@
+ZIPFS_BUILD	        = @ZIPFS_BUILD@
+NATIVE_ZIP		= @ZIP_PROG@
+SHARED_BUILD		= @SHARED_BUILD@
+INSTALL_LIBRARIES       = @INSTALL_LIBRARIES@
+INSTALL_MSGS            = @INSTALL_MSGS@
+
 # Minizip
 MINIZIP_OBJS = \
         adler32.$(HOST_OBJEXT) \
@@ -652,7 +655,6 @@ MINIZIP_OBJS = \
 
 ZIP_INSTALL_OBJS =  minizip${EXEEXT_FOR_BUILD}
 
-
 #--------------------------------------------------------------------------
 # Start of rules
 #--------------------------------------------------------------------------
diff --git a/unix/configure b/unix/configure
index cff57cb..44bd2a6 100755
--- a/unix/configure
+++ b/unix/configure
@@ -668,6 +668,9 @@ TCL_VERSION
 INSTALL_MSGS
 INSTALL_LIBRARIES
 ZIPFS_BUILD
+EXEEXT_FOR_BUILD
+CC_FOR_BUILD
+ZIP_PROG
 DTRACE
 LDFLAGS_DEFAULT
 CFLAGS_DEFAULT
@@ -702,9 +705,6 @@ RANLIB
 ZLIB_INCLUDE
 ZLIB_SRCS
 ZLIB_OBJS
-EXEEXT_FOR_BUILD
-CC_FOR_BUILD
-ZIP_PROG
 TCLSH_PROG
 SHARED_BUILD
 TCL_THREADS
@@ -4594,120 +4594,6 @@ if test "$TCLSH_PROG" = ""; then
   TCLSH_PROG='./${TCL_EXE}'
 fi
 
-#
-# Check for --enable-zipfs flag
-#
-SC_ENABLE_ZIPFS
-
-#
-# Find a native zip implementation
-#
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip" >&5
-$as_echo_n "checking for zip... " >&6; }
-    if ${ac_cv_path_zip+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	search_path=`echo ${PATH} | sed -e 's/:/ /g'`
-	for dir in $search_path ; do
-	    for j in `ls -r $dir/zip 2> /dev/null` \
-		    `ls -r $dir/zip 2> /dev/null` ; do
-		if test x"$ac_cv_path_zip" = x ; then
-		    if test -f "$j" ; then
-			ac_cv_path_zip=$j
-			break
-		    fi
-		fi
-	    done
-	done
-
-fi
-
-
-    if test -f "$ac_cv_path_zip" ; then
-	ZIP_PROG="$ac_cv_path_zip"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP_PROG" >&5
-$as_echo "$ZIP_PROG" >&6; }
-    else
-	# It is not an error if an installed version of Zip can't be located.
-	ZIP_PROG=""
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: No zip found on PATH" >&5
-$as_echo "No zip found on PATH" >&6; }
-    fi
-
-
-
-#
-# Find a native compiler
-#
-# Put a plausible default for CC_FOR_BUILD in Makefile.
-if test -z "$CC_FOR_BUILD"; then
-  if test "x$cross_compiling" = "xno"; then
-    CC_FOR_BUILD='$(CC)'
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc" >&5
-$as_echo_n "checking for gcc... " >&6; }
-    if ${ac_cv_path_cc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	search_path=`echo ${PATH} | sed -e 's/:/ /g'`
-	for dir in $search_path ; do
-	    for j in `ls -r $dir/gcc 2> /dev/null` \
-		    `ls -r $dir/gcc 2> /dev/null` ; do
-		if test x"$ac_cv_path_cc" = x ; then
-		    if test -f "$j" ; then
-			ac_cv_path_cc=$j
-			break
-		    fi
-		fi
-	    done
-	done
-
-fi
-
-  fi
-fi
-
-# Also set EXEEXT_FOR_BUILD.
-if test "x$cross_compiling" = "xno"; then
-  EXEEXT_FOR_BUILD='$(EXEEXT)'
-  OBJEXT_FOR_BUILD='$(OBJEXT)'
-else
-  OBJEXT_FOR_BUILD='.no'
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for build system executable suffix" >&5
-$as_echo_n "checking for build system executable suffix... " >&6; }
-if ${bfd_cv_build_exeext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  rm -f conftest*
-     echo 'int main () { return 0; }' > conftest.c
-     bfd_cv_build_exeext=
-     ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5
-     for file in conftest.*; do
-       case $file in
-       *.c | *.o | *.obj | *.ilk | *.pdb) ;;
-       *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;;
-       esac
-     done
-     rm -f conftest*
-     test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_build_exeext" >&5
-$as_echo "$bfd_cv_build_exeext" >&6; }
-  EXEEXT_FOR_BUILD=""
-  test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
-fi
-
-
-if test "$ZIP_PROG" = ""; then
-  ZIP_PROG='./minizip${EXEEXT_FOR_BUILD}'
-fi
-
-
-
-
 #------------------------------------------------------------------------
 #	Add stuff for zlib
 #------------------------------------------------------------------------
@@ -10272,6 +10158,117 @@ $as_echo "$tcl_ok" >&6; }
 #	Zipfs support
 #--------------------------------------------------------------------
 
+#
+# Check for --enable-zipfs flag
+#
+SC_ENABLE_ZIPFS
+
+#
+# Find a native zip implementation
+#
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip" >&5
+$as_echo_n "checking for zip... " >&6; }
+    if ${ac_cv_path_zip+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+	search_path=`echo ${PATH} | sed -e 's/:/ /g'`
+	for dir in $search_path ; do
+	    for j in `ls -r $dir/zip 2> /dev/null` \
+		    `ls -r $dir/zip 2> /dev/null` ; do
+		if test x"$ac_cv_path_zip" = x ; then
+		    if test -f "$j" ; then
+			ac_cv_path_zip=$j
+			break
+		    fi
+		fi
+	    done
+	done
+
+fi
+
+
+    if test -f "$ac_cv_path_zip" ; then
+	ZIP_PROG="$ac_cv_path_zip"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP_PROG" >&5
+$as_echo "$ZIP_PROG" >&6; }
+    else
+	# It is not an error if an installed version of Zip can't be located.
+	ZIP_PROG=""
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: No zip found on PATH" >&5
+$as_echo "No zip found on PATH" >&6; }
+    fi
+
+
+
+#
+# Find a native compiler
+#
+# Put a plausible default for CC_FOR_BUILD in Makefile.
+if test -z "$CC_FOR_BUILD"; then
+  if test "x$cross_compiling" = "xno"; then
+    CC_FOR_BUILD='$(CC)'
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc" >&5
+$as_echo_n "checking for gcc... " >&6; }
+    if ${ac_cv_path_cc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+	search_path=`echo ${PATH} | sed -e 's/:/ /g'`
+	for dir in $search_path ; do
+	    for j in `ls -r $dir/gcc 2> /dev/null` \
+		    `ls -r $dir/gcc 2> /dev/null` ; do
+		if test x"$ac_cv_path_cc" = x ; then
+		    if test -f "$j" ; then
+			ac_cv_path_cc=$j
+			break
+		    fi
+		fi
+	    done
+	done
+
+fi
+
+  fi
+fi
+
+# Also set EXEEXT_FOR_BUILD.
+if test "x$cross_compiling" = "xno"; then
+  EXEEXT_FOR_BUILD='$(EXEEXT)'
+  OBJEXT_FOR_BUILD='$(OBJEXT)'
+else
+  OBJEXT_FOR_BUILD='.no'
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for build system executable suffix" >&5
+$as_echo_n "checking for build system executable suffix... " >&6; }
+if ${bfd_cv_build_exeext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f conftest*
+     echo 'int main () { return 0; }' > conftest.c
+     bfd_cv_build_exeext=
+     ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5
+     for file in conftest.*; do
+       case $file in
+       *.c | *.o | *.obj | *.ilk | *.pdb) ;;
+       *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;;
+       esac
+     done
+     rm -f conftest*
+     test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_build_exeext" >&5
+$as_echo "$bfd_cv_build_exeext" >&6; }
+  EXEEXT_FOR_BUILD=""
+  test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
+fi
+
+
+if test "$ZIP_PROG" = ""; then
+  ZIP_PROG='./minizip${EXEEXT_FOR_BUILD}'
+fi
+
 # Check whether --enable-zipfs was given.
 if test "${enable_zipfs+set}" = set; then :
   enableval=$enable_zipfs; tcl_ok=$enableval
diff --git a/unix/configure.ac b/unix/configure.ac
index b2700cf..35429b5 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -155,28 +155,6 @@ if test "$TCLSH_PROG" = ""; then
   TCLSH_PROG='./${TCL_EXE}'
 fi
 
-#
-# Check for --enable-zipfs flag
-#
-SC_ENABLE_ZIPFS
-
-#
-# Find a native zip implementation
-#
-SC_PROG_ZIP
-
-#
-# Find a native compiler
-#
-AX_CC_FOR_BUILD
-
-if test "$ZIP_PROG" = ""; then
-  ZIP_PROG='./minizip${EXEEXT_FOR_BUILD}'
-fi
-
-
-
-
 #------------------------------------------------------------------------
 #	Add stuff for zlib
 #------------------------------------------------------------------------
@@ -818,6 +796,25 @@ AC_MSG_RESULT([$tcl_ok])
 #	Zipfs support
 #--------------------------------------------------------------------
 
+#
+# Check for --enable-zipfs flag
+#
+SC_ENABLE_ZIPFS
+
+#
+# Find a native zip implementation
+#
+SC_PROG_ZIP
+
+#
+# Find a native compiler
+#
+AX_CC_FOR_BUILD
+
+if test "$ZIP_PROG" = ""; then
+  ZIP_PROG='./minizip${EXEEXT_FOR_BUILD}'
+fi
+
 AC_ARG_ENABLE(zipfs,
     AC_HELP_STRING([--enable-zipfs],
 	[build with Zipfs support (default: on)]),