Undo more Android-specific changes, which don't form part of Zipfs, as further preparation for Zipfs TIP.

Rename zipfs.h to tclZipfs.h, so it can be installed together with tcl.h

4 files changed, 3 insertions, 35 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index ebbd61c..c09fb35 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -373,6 +373,7 @@ GENERIC_HDRS = \
 	$(GENERIC_DIR)/tclInt.h \
 	$(GENERIC_DIR)/tclIntDecls.h \
 	$(GENERIC_DIR)/tclIntPlatDecls.h \
+	$(GENERIC_DIR)/tclZipfs.h \
 	$(GENERIC_DIR)/tclTomMath.h \
 	$(GENERIC_DIR)/tclTomMathDecls.h \
 	$(GENERIC_DIR)/tclOO.h \
@@ -383,7 +384,7 @@ GENERIC_HDRS = \
 	$(GENERIC_DIR)/tclPlatDecls.h \
 	$(GENERIC_DIR)/tclPort.h \
 	$(GENERIC_DIR)/tclRegexp.h \
-	$(GENERIC_DIR)/zipfs.h
+	$(GENERIC_DIR)/tclZipfs.h
 
 GENERIC_SRCS = \
 	$(GENERIC_DIR)/regcomp.c \
@@ -954,6 +955,7 @@ install-headers:
 	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
 		$(GENERIC_DIR)/tclOO.h $(GENERIC_DIR)/tclOODecls.h \
 		$(GENERIC_DIR)/tclPlatDecls.h \
+		$(GENERIC_DIR)/tclZipfs.h \
 		$(GENERIC_DIR)/tclTomMath.h \
 		$(GENERIC_DIR)/tclTomMathDecls.h ; \
 	    do \
diff --git a/unix/configure b/unix/configure
index 3e72a0d..c19a77a 100755
--- a/unix/configure
+++ b/unix/configure
@@ -869,7 +869,6 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-encoding         encoding for configuration values (default:
                           iso8859-1)
-  --with-zipfs            include ZIP filesystem
   --with-tzdata           install timezone data (default: autodetect)
 
 Some influential environment variables:
@@ -6212,23 +6211,6 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 
-# Check whether --with-zipfs or --without-zipfs was given.
-if test "${with_zipfs+set}" = set; then
-  withval="$with_zipfs"
-  tcl_ok=$withval
-else
-  tcl_ok=no
-fi;
-echo "$as_me:$LINENO: result: $tcl_ok" >&5
-echo "${ECHO_T}$tcl_ok" >&6
-if test $tcl_ok = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define ZIPFS_IN_TCL 1
-_ACEOF
-
-fi
-
 #--------------------------------------------------------------------
 # The statements below define a collection of compile flags.  This
 # macro depends on the value of SHARED_BUILD, and should be called
diff --git a/unix/configure.in b/unix/configure.in
index 7eeff3b..c7b0edc 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -171,14 +171,6 @@ AS_IF([test $zlib_ok = no], [
   AC_SUBST(ZLIB_INCLUDE,[-I\${ZLIB_DIR}])
 ])
 AC_DEFINE(HAVE_ZLIB, 1, [Is there an installed zlib?])
-AC_ARG_WITH(zipfs,
-    AC_HELP_STRING([--with-zipfs],
-	[include ZIP filesystem]),
-    [tcl_ok=$withval], [tcl_ok=no])
-AC_MSG_RESULT([$tcl_ok])
-if test $tcl_ok = yes; then
-    AC_DEFINE(ZIPFS_IN_TCL, 1, [Include ZIP filesystem?])
-fi
 
 #--------------------------------------------------------------------
 # The statements below define a collection of compile flags.  This
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index e8ccc76..5e4ef0a 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -9,9 +9,6 @@
  */
 
 #include "tclInt.h"
-#ifdef ZIPFS_IN_TCL
-#include "zipfs.h"
-#endif
 #include <stddef.h>
 #include <locale.h>
 #ifdef HAVE_LANGINFO
@@ -544,11 +541,6 @@ TclpInitLibraryPath(
 	     */
 
 	    str = defaultLibraryDir;
-#ifdef ZIPFS_IN_TCL
-	    if (Tclzipfs_Mount(NULL, NULL, NULL, NULL) == TCL_OK) {
-		str = "";
-	    }
-#endif
 	}
 	if (str[0] != '\0') {
 	    objPtr = Tcl_NewStringObj(str, -1);