Adding upstream version 3:4.8.31.upstream/3%4.8.31upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 169 insertions, 170 deletions

diff --git a/configure b/configure
index a227ecd..f9e53e3 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for GNU Midnight Commander 4.8.30-git.
+# Generated by GNU Autoconf 2.71 for GNU Midnight Commander 4.8.31-pre1-git.
 #
 # Report bugs to <https://www.midnight-commander.org/wiki/NewTicket>.
 #
@@ -621,8 +621,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GNU Midnight Commander'
 PACKAGE_TARNAME='mc'
-PACKAGE_VERSION='4.8.30-git'
-PACKAGE_STRING='GNU Midnight Commander 4.8.30-git'
+PACKAGE_VERSION='4.8.31-pre1-git'
+PACKAGE_STRING='GNU Midnight Commander 4.8.31-pre1-git'
 PACKAGE_BUGREPORT='https://www.midnight-commander.org/wiki/NewTicket'
 PACKAGE_URL='https://www.midnight-commander.org/'
 
@@ -750,8 +750,8 @@ ENABLE_VFS_SFS_FALSE
 ENABLE_VFS_SFS_TRUE
 ENABLE_VFS_FTP_FALSE
 ENABLE_VFS_FTP_TRUE
-ENABLE_VFS_FISH_FALSE
-ENABLE_VFS_FISH_TRUE
+ENABLE_VFS_SHELL_FALSE
+ENABLE_VFS_SHELL_TRUE
 ENABLE_VFS_EXTFS_FALSE
 ENABLE_VFS_EXTFS_TRUE
 HAVE_ZIPINFO
@@ -988,7 +988,7 @@ enable_background
 enable_vfs
 enable_vfs_cpio
 enable_vfs_extfs
-enable_vfs_fish
+enable_vfs_shell
 enable_vfs_ftp
 enable_vfs_sfs
 enable_vfs_sftp
@@ -1585,7 +1585,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU Midnight Commander 4.8.30-git to adapt to many kinds of systems.
+\`configure' configures GNU Midnight Commander 4.8.31-pre1-git to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1660,7 +1660,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU Midnight Commander 4.8.30-git:";;
+     short | recursive ) echo "Configuration of GNU Midnight Commander 4.8.31-pre1-git:";;
    esac
   cat <<\_ACEOF
 
@@ -1697,7 +1697,7 @@ Optional Features:
   --disable-vfs           Disable VFS
   --enable-vfs-cpio       Support for cpio filesystem [yes]
   --enable-vfs-extfs      Support for extfs filesystem [yes]
-  --enable-vfs-fish       Support for FISH filesystem [yes]
+  --enable-vfs-shell      Support for SHELL filesystem [yes]
   --enable-vfs-ftp        Support for FTP filesystem [yes]
   --enable-vfs-sfs        Support for sfs filesystem [yes]
   --enable-vfs-sftp       Support for SFTP filesystem [auto]
@@ -1872,7 +1872,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU Midnight Commander configure 4.8.30-git
+GNU Midnight Commander configure 4.8.31-pre1-git
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2477,7 +2477,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU Midnight Commander $as_me 4.8.30-git, which was
+It was created by GNU Midnight Commander $as_me 4.8.31-pre1-git, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3764,7 +3764,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mc'
- VERSION='4.8.30-git'
+ VERSION='4.8.31-pre1-git'
 
 
 # Some tools Automake needs.
@@ -19153,8 +19153,8 @@ fi
     else
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5
-printf %s "checking for CHECK... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for check >= 0.9.10" >&5
+printf %s "checking for check >= 0.9.10... " >&6; }
 
 if test -n "$CHECK_CFLAGS"; then
     pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS"
@@ -19194,7 +19194,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -19203,12 +19203,12 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "check >= 0.9.10" 2>&1`
+                CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "check >= 0.9.10" 2>&1`
         else
-	        CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "check >= 0.9.10" 2>&1`
+                CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "check >= 0.9.10" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$CHECK_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$CHECK_PKG_ERRORS" >&5
 
 
                 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'Check' testing framework not found. Check your environment" >&5
@@ -19220,7 +19220,7 @@ printf "%s\n" "$as_me: WARNING: 'Check' testing framework not found. Check your
                 fi
 
 elif test $pkg_failed = untried; then
-     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
                 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'Check' testing framework not found. Check your environment" >&5
@@ -19232,8 +19232,8 @@ printf "%s\n" "$as_me: WARNING: 'Check' testing framework not found. Check your
                 fi
 
 else
-	CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS
-	CHECK_LIBS=$pkg_cv_CHECK_LIBS
+        CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS
+        CHECK_LIBS=$pkg_cv_CHECK_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -19294,19 +19294,19 @@ fi
     glib_found=no
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
-printf %s "checking for GLIB... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.32" >&5
+printf %s "checking for glib-2.0 >= 2.32... " >&6; }
 
 if test -n "$GLIB_CFLAGS"; then
     pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.30\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.30") 2>&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.32\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.32") 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.30" 2>/dev/null`
+  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.32" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -19318,12 +19318,12 @@ if test -n "$GLIB_LIBS"; then
     pkg_cv_GLIB_LIBS="$GLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.30\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.30") 2>&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.32\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.32") 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.30" 2>/dev/null`
+  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.32" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -19335,7 +19335,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -19344,27 +19344,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.30" 2>&1`
+                GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.32" 2>&1`
         else
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.30" 2>&1`
+                GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.32" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GLIB_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$GLIB_PKG_ERRORS" >&5
 
-	:
+        :
 elif test $pkg_failed = untried; then
-     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	:
+        :
 else
-	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
-	GLIB_LIBS=$pkg_cv_GLIB_LIBS
+        GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
+        GLIB_LIBS=$pkg_cv_GLIB_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	glib_found=yes
+        glib_found=yes
 fi
     if test x"$glib_found" = xno; then
-        as_fn_error $? "glib-2.0 not found or version too old (must be >= 2.30)" "$LINENO" 5
+        as_fn_error $? "glib-2.0 not found or version too old (must be >= 2.32)" "$LINENO" 5
     fi
 
 
@@ -19375,19 +19375,19 @@ fi
     found_gmodule=no
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5
-printf %s "checking for GMODULE... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gmodule-no-export-2.0 >= 2.32" >&5
+printf %s "checking for gmodule-no-export-2.0 >= 2.32... " >&6; }
 
 if test -n "$GMODULE_CFLAGS"; then
     pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-no-export-2.0 >= 2.30\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gmodule-no-export-2.0 >= 2.30") 2>&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-no-export-2.0 >= 2.32\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gmodule-no-export-2.0 >= 2.32") 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-no-export-2.0 >= 2.30" 2>/dev/null`
+  pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-no-export-2.0 >= 2.32" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -19399,12 +19399,12 @@ if test -n "$GMODULE_LIBS"; then
     pkg_cv_GMODULE_LIBS="$GMODULE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-no-export-2.0 >= 2.30\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gmodule-no-export-2.0 >= 2.30") 2>&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-no-export-2.0 >= 2.32\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gmodule-no-export-2.0 >= 2.32") 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-no-export-2.0 >= 2.30" 2>/dev/null`
+  pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-no-export-2.0 >= 2.32" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -19416,7 +19416,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -19425,43 +19425,43 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-no-export-2.0 >= 2.30" 2>&1`
+                GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-no-export-2.0 >= 2.32" 2>&1`
         else
-	        GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-no-export-2.0 >= 2.30" 2>&1`
+                GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-no-export-2.0 >= 2.32" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GMODULE_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$GMODULE_PKG_ERRORS" >&5
 
-	:
+        :
 elif test $pkg_failed = untried; then
-     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	:
+        :
 else
-	GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS
-	GMODULE_LIBS=$pkg_cv_GMODULE_LIBS
+        GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS
+        GMODULE_LIBS=$pkg_cv_GMODULE_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	found_gmodule=yes
+        found_gmodule=yes
 fi
     if test x"$found_gmodule" = xyes; then
         g_module_supported="gmodule-no-export-2.0"
     else
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5
-printf %s "checking for GMODULE... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gmodule-2.0 >= 2.32" >&5
+printf %s "checking for gmodule-2.0 >= 2.32... " >&6; }
 
 if test -n "$GMODULE_CFLAGS"; then
     pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.30\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.30") 2>&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.32\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.32") 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0 >= 2.30" 2>/dev/null`
+  pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0 >= 2.32" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -19473,12 +19473,12 @@ if test -n "$GMODULE_LIBS"; then
     pkg_cv_GMODULE_LIBS="$GMODULE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.30\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.30") 2>&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.32\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.32") 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 >= 2.30" 2>/dev/null`
+  pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 >= 2.32" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -19490,7 +19490,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -19499,24 +19499,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-2.0 >= 2.30" 2>&1`
+                GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-2.0 >= 2.32" 2>&1`
         else
-	        GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-2.0 >= 2.30" 2>&1`
+                GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-2.0 >= 2.32" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GMODULE_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$GMODULE_PKG_ERRORS" >&5
 
-	:
+        :
 elif test $pkg_failed = untried; then
-     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	:
+        :
 else
-	GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS
-	GMODULE_LIBS=$pkg_cv_GMODULE_LIBS
+        GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS
+        GMODULE_LIBS=$pkg_cv_GMODULE_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	found_gmodule=yes
+        found_gmodule=yes
 fi
         if test x"$found_gmodule" = xyes; then
             g_module_supported="gmodule-2.0"
@@ -19719,8 +19719,8 @@ fi
     found_slang=no
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SLANG" >&5
-printf %s "checking for SLANG... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for slang >= 2.0" >&5
+printf %s "checking for slang >= 2.0... " >&6; }
 
 if test -n "$SLANG_CFLAGS"; then
     pkg_cv_SLANG_CFLAGS="$SLANG_CFLAGS"
@@ -19760,7 +19760,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -19769,24 +19769,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SLANG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "slang >= 2.0" 2>&1`
+                SLANG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "slang >= 2.0" 2>&1`
         else
-	        SLANG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "slang >= 2.0" 2>&1`
+                SLANG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "slang >= 2.0" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SLANG_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$SLANG_PKG_ERRORS" >&5
 
-	:
+        :
 elif test $pkg_failed = untried; then
-     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	:
+        :
 else
-	SLANG_CFLAGS=$pkg_cv_SLANG_CFLAGS
-	SLANG_LIBS=$pkg_cv_SLANG_LIBS
+        SLANG_CFLAGS=$pkg_cv_SLANG_CFLAGS
+        SLANG_LIBS=$pkg_cv_SLANG_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	found_slang=yes
+        found_slang=yes
 fi
     if test x"$found_slang" = xno; then
         as_fn_error $? "S-Lang >= 2.0.0 library not found" "$LINENO" 5
@@ -27337,8 +27337,8 @@ fi
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EXT2FS" >&5
-printf %s "checking for EXT2FS... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ext2fs >= 1.42.4" >&5
+printf %s "checking for ext2fs >= 1.42.4... " >&6; }
 
 if test -n "$EXT2FS_CFLAGS"; then
     pkg_cv_EXT2FS_CFLAGS="$EXT2FS_CFLAGS"
@@ -27378,7 +27378,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -27387,31 +27387,31 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        EXT2FS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ext2fs >= 1.42.4" 2>&1`
+                EXT2FS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ext2fs >= 1.42.4" 2>&1`
         else
-	        EXT2FS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ext2fs >= 1.42.4" 2>&1`
+                EXT2FS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ext2fs >= 1.42.4" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$EXT2FS_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$EXT2FS_PKG_ERRORS" >&5
 
-	:
+        :
 elif test $pkg_failed = untried; then
-     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	:
+        :
 else
-	EXT2FS_CFLAGS=$pkg_cv_EXT2FS_CFLAGS
-	EXT2FS_LIBS=$pkg_cv_EXT2FS_LIBS
+        EXT2FS_CFLAGS=$pkg_cv_EXT2FS_CFLAGS
+        EXT2FS_LIBS=$pkg_cv_EXT2FS_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	found_ext2fs=yes
+        found_ext2fs=yes
 fi
 
     if test x"$found_ext2fs" = "xyes"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for E2P" >&5
-printf %s "checking for E2P... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for e2p >= 1.42.4" >&5
+printf %s "checking for e2p >= 1.42.4... " >&6; }
 
 if test -n "$E2P_CFLAGS"; then
     pkg_cv_E2P_CFLAGS="$E2P_CFLAGS"
@@ -27451,7 +27451,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -27460,33 +27460,32 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        E2P_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "e2p >= 1.42.4" 2>&1`
+                E2P_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "e2p >= 1.42.4" 2>&1`
         else
-	        E2P_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "e2p >= 1.42.4" 2>&1`
+                E2P_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "e2p >= 1.42.4" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$E2P_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$E2P_PKG_ERRORS" >&5
 
-	:
+        :
 elif test $pkg_failed = untried; then
-     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	:
+        :
 else
-	E2P_CFLAGS=$pkg_cv_E2P_CFLAGS
-	E2P_LIBS=$pkg_cv_E2P_LIBS
+        E2P_CFLAGS=$pkg_cv_E2P_CFLAGS
+        E2P_LIBS=$pkg_cv_E2P_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	found_e2p=yes
+        found_e2p=yes
 fi
 
         if test x"$found_e2p" = "xyes"; then
 
 printf "%s\n" "#define ENABLE_EXT2FS_ATTR 1" >>confdefs.h
 
-
-
             MCLIBS="$MCLIBS $E2P_LIBS"
+            CPPFLAGS="$CPPFLAGS $EXT2FS_CFLAGS $E2P_CFLAGS"
             ext2fs_attr_msg="yes"
         else
             { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: e2p library not found or version too old (must be >= 1.42.4)" >&5
@@ -27707,31 +27706,31 @@ fi
 
 
 
-    # Check whether --enable-vfs-fish was given.
-if test ${enable_vfs_fish+y}
+    # Check whether --enable-vfs-shell was given.
+if test ${enable_vfs_shell+y}
 then :
-  enableval=$enable_vfs_fish;
+  enableval=$enable_vfs_shell;
 fi
 
-    if test "$enable_vfs" = "yes" -a "x$enable_vfs_fish" != xno; then
-	enable_vfs_fish="yes"
+    if test "$enable_vfs" = "yes" -a "x$enable_vfs_shell" != xno; then
+	enable_vfs_shell="yes"
 
     if test x"$vfs_flags" = "x" ; then
-	vfs_flags="fish"
+	vfs_flags="shell"
     else
-	vfs_flags="$vfs_flags, fish"
+	vfs_flags="$vfs_flags, shell"
     fi
 
 
-printf "%s\n" "#define ENABLE_VFS_FISH 1" >>confdefs.h
+printf "%s\n" "#define ENABLE_VFS_SHELL 1" >>confdefs.h
 
     fi
-     if test "$enable_vfs" = "yes" -a x"$enable_vfs_fish" = x"yes"; then
-  ENABLE_VFS_FISH_TRUE=
-  ENABLE_VFS_FISH_FALSE='#'
+     if test "$enable_vfs" = "yes" -a x"$enable_vfs_shell" = x"yes"; then
+  ENABLE_VFS_SHELL_TRUE=
+  ENABLE_VFS_SHELL_FALSE='#'
 else
-  ENABLE_VFS_FISH_TRUE='#'
-  ENABLE_VFS_FISH_FALSE=
+  ENABLE_VFS_SHELL_TRUE='#'
+  ENABLE_VFS_SHELL_FALSE=
 fi
 
 
@@ -27803,8 +27802,8 @@ fi
     if test "$enable_vfs" != "no" -a x"$enable_vfs_sftp" != x"no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSSH" >&5
-printf %s "checking for LIBSSH... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libssh2 >= 1.2.8" >&5
+printf %s "checking for libssh2 >= 1.2.8... " >&6; }
 
 if test -n "$LIBSSH_CFLAGS"; then
     pkg_cv_LIBSSH_CFLAGS="$LIBSSH_CFLAGS"
@@ -27844,7 +27843,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -27853,24 +27852,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBSSH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libssh2 >= 1.2.8" 2>&1`
+                LIBSSH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libssh2 >= 1.2.8" 2>&1`
         else
-	        LIBSSH_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libssh2 >= 1.2.8" 2>&1`
+                LIBSSH_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libssh2 >= 1.2.8" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBSSH_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$LIBSSH_PKG_ERRORS" >&5
 
-	:
+        :
 elif test $pkg_failed = untried; then
-     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	:
+        :
 else
-	LIBSSH_CFLAGS=$pkg_cv_LIBSSH_CFLAGS
-	LIBSSH_LIBS=$pkg_cv_LIBSSH_LIBS
+        LIBSSH_CFLAGS=$pkg_cv_LIBSSH_CFLAGS
+        LIBSSH_LIBS=$pkg_cv_LIBSSH_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	found_libssh=yes
+        found_libssh=yes
 fi
         if test x"$found_libssh" = "xyes"; then
 
@@ -27956,8 +27955,8 @@ fi
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for COM_ERR" >&5
-printf %s "checking for COM_ERR... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for com_err >= 1.42.4" >&5
+printf %s "checking for com_err >= 1.42.4... " >&6; }
 
 if test -n "$COM_ERR_CFLAGS"; then
     pkg_cv_COM_ERR_CFLAGS="$COM_ERR_CFLAGS"
@@ -27997,7 +27996,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -28006,24 +28005,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        COM_ERR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "com_err >= 1.42.4" 2>&1`
+                COM_ERR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "com_err >= 1.42.4" 2>&1`
         else
-	        COM_ERR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "com_err >= 1.42.4" 2>&1`
+                COM_ERR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "com_err >= 1.42.4" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$COM_ERR_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$COM_ERR_PKG_ERRORS" >&5
 
-	:
+        :
 elif test $pkg_failed = untried; then
-     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	:
+        :
 else
-	COM_ERR_CFLAGS=$pkg_cv_COM_ERR_CFLAGS
-	COM_ERR_LIBS=$pkg_cv_COM_ERR_LIBS
+        COM_ERR_CFLAGS=$pkg_cv_COM_ERR_CFLAGS
+        COM_ERR_LIBS=$pkg_cv_COM_ERR_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	com_err=yes
+        com_err=yes
 fi
 
 	if test x"$com_err" = "xyes"; then
@@ -28072,7 +28071,7 @@ else
 fi
 
 
-    if test x"$enable_vfs_ftp" = x"yes" -o x"$enable_vfs_fish" = x"yes" -o x"$enable_vfs_sftp" = x"yes"; then
+    if test x"$enable_vfs_ftp" = x"yes" -o x"$enable_vfs_shell" = x"yes" -o x"$enable_vfs_sftp" = x"yes"; then
 
 
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
@@ -30538,7 +30537,7 @@ fi
 ac_config_files="$ac_config_files src/man2hlp/man2hlp"
 
 
-ac_config_files="$ac_config_files Makefile contrib/Makefile misc/Makefile misc/mc.charsets misc/mc.menu misc/mcedit.menu misc/skins/Makefile misc/ext.d/Makefile misc/ext.d/doc.sh misc/ext.d/misc.sh misc/ext.d/text.sh misc/ext.d/web.sh misc/macros.d/Makefile misc/mc.ext.ini src/Makefile src/consaver/Makefile src/editor/Makefile src/man2hlp/Makefile src/subshell/Makefile src/viewer/Makefile src/diffviewer/Makefile src/filemanager/Makefile src/vfs/Makefile src/vfs/cpio/Makefile src/vfs/extfs/Makefile src/vfs/extfs/helpers/Makefile src/vfs/extfs/helpers/a+ src/vfs/extfs/helpers/apt+ src/vfs/extfs/helpers/audio src/vfs/extfs/helpers/deb src/vfs/extfs/helpers/deba src/vfs/extfs/helpers/debd src/vfs/extfs/helpers/dpkg+ src/vfs/extfs/helpers/iso9660 src/vfs/extfs/helpers/hp48+ src/vfs/extfs/helpers/lslR src/vfs/extfs/helpers/mailfs src/vfs/extfs/helpers/patchfs src/vfs/extfs/helpers/rpms+ src/vfs/extfs/helpers/s3+ src/vfs/extfs/helpers/uace src/vfs/extfs/helpers/ualz src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc src/vfs/extfs/helpers/uarj src/vfs/extfs/helpers/ucab src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib src/vfs/extfs/helpers/unar src/vfs/extfs/helpers/urar src/vfs/extfs/helpers/uwim src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo src/vfs/fish/Makefile src/vfs/fish/helpers/Makefile src/vfs/ftpfs/Makefile src/vfs/sftpfs/Makefile src/vfs/local/Makefile src/vfs/sfs/Makefile src/vfs/tar/Makefile src/vfs/undelfs/Makefile lib/Makefile lib/event/Makefile lib/filehighlight/Makefile lib/mcconfig/Makefile lib/search/Makefile lib/skin/Makefile lib/strutil/Makefile lib/tty/Makefile lib/vfs/Makefile lib/widget/Makefile misc/syntax/Makefile doc/Makefile doc/hints/Makefile doc/hints/l10n/Makefile doc/man/Makefile doc/man/es/Makefile doc/man/hu/Makefile doc/man/it/Makefile doc/man/pl/Makefile doc/man/ru/Makefile doc/man/sr/Makefile doc/hlp/Makefile doc/hlp/es/Makefile doc/hlp/hu/Makefile doc/hlp/it/Makefile doc/hlp/pl/Makefile doc/hlp/ru/Makefile doc/hlp/sr/Makefile po/Makefile.in"
+ac_config_files="$ac_config_files Makefile contrib/Makefile misc/Makefile misc/mc.charsets misc/mc.menu misc/mcedit.menu misc/skins/Makefile misc/ext.d/Makefile misc/ext.d/doc.sh misc/ext.d/misc.sh misc/ext.d/text.sh misc/ext.d/web.sh misc/macros.d/Makefile misc/mc.ext.ini src/Makefile src/consaver/Makefile src/editor/Makefile src/man2hlp/Makefile src/subshell/Makefile src/viewer/Makefile src/diffviewer/Makefile src/filemanager/Makefile src/vfs/Makefile src/vfs/cpio/Makefile src/vfs/extfs/Makefile src/vfs/extfs/helpers/Makefile src/vfs/extfs/helpers/a+ src/vfs/extfs/helpers/apt+ src/vfs/extfs/helpers/audio src/vfs/extfs/helpers/deb src/vfs/extfs/helpers/deba src/vfs/extfs/helpers/debd src/vfs/extfs/helpers/dpkg+ src/vfs/extfs/helpers/iso9660 src/vfs/extfs/helpers/hp48+ src/vfs/extfs/helpers/lslR src/vfs/extfs/helpers/mailfs src/vfs/extfs/helpers/patchfs src/vfs/extfs/helpers/rpms+ src/vfs/extfs/helpers/s3+ src/vfs/extfs/helpers/uace src/vfs/extfs/helpers/ualz src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc src/vfs/extfs/helpers/uarj src/vfs/extfs/helpers/ucab src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib src/vfs/extfs/helpers/unar src/vfs/extfs/helpers/urar src/vfs/extfs/helpers/uwim src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo src/vfs/shell/Makefile src/vfs/shell/helpers/Makefile src/vfs/ftpfs/Makefile src/vfs/sftpfs/Makefile src/vfs/local/Makefile src/vfs/sfs/Makefile src/vfs/tar/Makefile src/vfs/undelfs/Makefile lib/Makefile lib/event/Makefile lib/filehighlight/Makefile lib/mcconfig/Makefile lib/search/Makefile lib/skin/Makefile lib/strutil/Makefile lib/tty/Makefile lib/vfs/Makefile lib/widget/Makefile misc/syntax/Makefile doc/Makefile doc/hints/Makefile doc/hints/l10n/Makefile doc/man/Makefile doc/man/es/Makefile doc/man/hu/Makefile doc/man/it/Makefile doc/man/pl/Makefile doc/man/ru/Makefile doc/man/sr/Makefile doc/hlp/Makefile doc/hlp/es/Makefile doc/hlp/hu/Makefile doc/hlp/it/Makefile doc/hlp/pl/Makefile doc/hlp/ru/Makefile doc/hlp/sr/Makefile po/Makefile.in"
 
 
 ac_config_files="$ac_config_files misc/syntax/Syntax"
@@ -30720,8 +30719,8 @@ if test -z "${ENABLE_VFS_EXTFS_TRUE}" && test -z "${ENABLE_VFS_EXTFS_FALSE}"; th
   as_fn_error $? "conditional \"ENABLE_VFS_EXTFS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${ENABLE_VFS_FISH_TRUE}" && test -z "${ENABLE_VFS_FISH_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_VFS_FISH\" was never defined.
+if test -z "${ENABLE_VFS_SHELL_TRUE}" && test -z "${ENABLE_VFS_SHELL_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_VFS_SHELL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ENABLE_VFS_FTP_TRUE}" && test -z "${ENABLE_VFS_FTP_FALSE}"; then
@@ -31266,7 +31265,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GNU Midnight Commander $as_me 4.8.30-git, which was
+This file was extended by GNU Midnight Commander $as_me 4.8.31-pre1-git, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31336,7 +31335,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-GNU Midnight Commander config.status 4.8.30-git
+GNU Midnight Commander config.status 4.8.31-pre1-git
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
@@ -31818,8 +31817,8 @@ do
     "src/vfs/extfs/helpers/uwim") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uwim" ;;
     "src/vfs/extfs/helpers/uzip") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uzip" ;;
     "src/vfs/extfs/helpers/uzoo") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uzoo" ;;
-    "src/vfs/fish/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/fish/Makefile" ;;
-    "src/vfs/fish/helpers/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/fish/helpers/Makefile" ;;
+    "src/vfs/shell/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/shell/Makefile" ;;
+    "src/vfs/shell/helpers/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/shell/helpers/Makefile" ;;
     "src/vfs/ftpfs/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/ftpfs/Makefile" ;;
     "src/vfs/sftpfs/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/sftpfs/Makefile" ;;
     "src/vfs/local/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/local/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index c1a1460..5cf1f2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -654,8 +654,8 @@ src/vfs/extfs/helpers/uwim
 src/vfs/extfs/helpers/uzip
 src/vfs/extfs/helpers/uzoo
 
-src/vfs/fish/Makefile
-src/vfs/fish/helpers/Makefile
+src/vfs/shell/Makefile
+src/vfs/shell/helpers/Makefile
 
 src/vfs/ftpfs/Makefile