* acinclude.m4 (MC_EXTFS_CHECKS): New macro.

(MC_WITH_VFS): Call MC_EXTFS_CHECKS.
* configure.in: Generate vfs/extfs/uzip.
* vfs/extfs/uzip: Move to vfs/extfs/uzip.in.
* vfs/extfs/Makefile.am: Corresponding adjustments.

ChangeLog

@@ -1,3 +1,11 @@
+2002-11-28  Pavel Roskin  <proski@gnu.org>
+
+	* acinclude.m4 (MC_EXTFS_CHECKS): New macro.
+	(MC_WITH_VFS): Call MC_EXTFS_CHECKS.
+	* configure.in: Generate vfs/extfs/uzip.
+	* vfs/extfs/uzip: Move to vfs/extfs/uzip.in.
+	* vfs/extfs/Makefile.am: Corresponding adjustments.
+
 2002-11-26  Pavel Roskin  <proski@gnu.org>
 
 	* syntax/sql.syntax: Add highlighting for dot and backticks.

acinclude.m4

@@ -35,6 +35,26 @@ AC_DEFUN([MC_UNDELFS_CHECKS], [
 
 
 
+dnl MC_EXTFS_CHECKS
+dnl    Check for tools used in extfs scripts.
+AC_DEFUN([MC_EXTFS_CHECKS], [
+    AC_PATH_PROG([ZIP], [zip], [/usr/bin/zip])
+    AC_PATH_PROG([UNZIP], [unzip], [/usr/bin/unzip])
+    AC_CACHE_CHECK([for zipinfo code in unzip], [mc_cv_have_zipinfo],
+	[mc_cv_have_zipinfo=no
+	if $UNZIP -Z </dev/null 2>&1 >/dev/null; then
+	    mc_cv_have_zipinfo=yes
+	fi])
+    if test "x$mc_cv_have_zipinfo" = xyes; then
+	HAVE_ZIPINFO=1
+    else
+	HAVE_ZIPINFO=0
+    fi
+    AC_SUBST([HAVE_ZIPINFO])
+])
+
+
+
 dnl MC_MCSERVER_CHECKS
 dnl    Check how mcserver should check passwords.
 dnl    Possible methods are PAM, pwdauth and crypt.
@@ -102,6 +122,8 @@ dnl        "no" (--without-vfs).
 
 dnl Private define
 AC_DEFUN([MC_WITH_VFS],[
+  MC_EXTFS_CHECKS
+
   dnl FIXME: network checks should probably be in their own macro.
   AC_CHECK_LIB(nsl, t_accept)
   AC_CHECK_LIB(socket, socket)

configure.in

@@ -563,6 +563,7 @@ vfs/extfs/ucpio
 vfs/extfs/ulha 
 vfs/extfs/uha
 vfs/extfs/urar
+vfs/extfs/uzip
 vfs/extfs/uzoo
 
 doc/mc.1 doc/mcedit.1 doc/mcserv.8

vfs/extfs/Makefile.am

@@ -5,7 +5,7 @@ EXTFS_MISC  = README extfs.ini unarj.diff sfs.ini
 
 # Filters that don't need adaptation to the local system
 EXTFS_CONST = a apt audio deba debd dpkg hp48 mailfs patchfs rpm bpp \
-	rpms trpm uarj uzip
+	rpms trpm uarj
 
 # Filters that need adaptation to the local system - source files
 EXTFS_IN    = 			\
@@ -13,6 +13,7 @@ EXTFS_IN    = 			\
 	lslR.in 		\
 	ucpio.in 		\
 	urar.in 		\
+	uzip.in 		\
 	uzoo.in 		\
 	ftplist.in 		\
 	uar.in 			\

vfs/extfs/uzip.in

@@ -15,11 +15,11 @@ use strict;
 #
 
 # Location of the zip program
-my $app_zip = '/usr/bin/zip';
+my $app_zip = "@ZIP@";
 # Location of the unzip program
-my $app_unzip = '/usr/bin/unzip';
+my $app_unzip = "@UNZIP@";
 # Set this to 1 if zipinfo (unzip -Z) is to be used (recommended), otherwise 0.
-my $op_has_zipinfo = 1;
+my $op_has_zipinfo = @HAVE_ZIPINFO@;
 
 # Command used to list archives (zipinfo mode)
 my $cmd_list_zi = "$app_unzip -Z -l -T";