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

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

5 files changed, 20 insertions, 21 deletions

diff --git a/m4.include/mc-ext2fs-attr.m4 b/m4.include/mc-ext2fs-attr.m4
index 6a57cd5..42e4a29 100644
--- a/m4.include/mc-ext2fs-attr.m4
+++ b/m4.include/mc-ext2fs-attr.m4
@@ -12,9 +12,8 @@ AC_DEFUN([mc_EXT2FS_ATTR],
 
         if test x"$found_e2p" = "xyes"; then
             AC_DEFINE(ENABLE_EXT2FS_ATTR, 1, [Define to enable support for ext2fs attributes])
-            AC_SUBST(EXT2FS_CFLAGS)
-            AC_SUBST(E2P_CFLAGS)
             MCLIBS="$MCLIBS $E2P_LIBS"
+            CPPFLAGS="$CPPFLAGS $EXT2FS_CFLAGS $E2P_CFLAGS"
             ext2fs_attr_msg="yes"
         else
             AC_MSG_WARN([e2p library not found or version too old (must be >= 1.42.4)])
diff --git a/m4.include/mc-glib.m4 b/m4.include/mc-glib.m4
index 4008207..f93962f 100644
--- a/m4.include/mc-glib.m4
+++ b/m4.include/mc-glib.m4
@@ -8,12 +8,12 @@ AC_DEFUN([mc_G_MODULE_SUPPORTED], [
     g_module_supported=""
 
     found_gmodule=no
-    PKG_CHECK_MODULES(GMODULE, [gmodule-no-export-2.0 >= 2.30], [found_gmodule=yes], [:])
+    PKG_CHECK_MODULES(GMODULE, [gmodule-no-export-2.0 >= 2.32], [found_gmodule=yes], [:])
     if test x"$found_gmodule" = xyes; then
         g_module_supported="gmodule-no-export-2.0"
     else
         dnl try fallback to the generic gmodule
-        PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.30], [found_gmodule=yes], [:])
+        PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.32], [found_gmodule=yes], [:])
         if test x"$found_gmodule" = xyes; then
             g_module_supported="gmodule-2.0"
         fi
@@ -78,9 +78,9 @@ AC_DEFUN([mc_CHECK_GLIB], [
         AS_HELP_STRING([--with-glib-static], [Link glib statically @<:@no@:>@]))
 
     glib_found=no
-    PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.30], [glib_found=yes], [:])
+    PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.32], [glib_found=yes], [:])
     if test x"$glib_found" = xno; then
-        AC_MSG_ERROR([glib-2.0 not found or version too old (must be >= 2.30)])
+        AC_MSG_ERROR([glib-2.0 not found or version too old (must be >= 2.32)])
     fi
 
 ])
diff --git a/m4.include/mc-vfs.m4 b/m4.include/mc-vfs.m4
index f14fcfe..82567bd 100644
--- a/m4.include/mc-vfs.m4
+++ b/m4.include/mc-vfs.m4
@@ -13,7 +13,7 @@ m4_include([m4.include/vfs/mc-vfs-extfs.m4])
 m4_include([m4.include/vfs/mc-vfs-sfs.m4])
 m4_include([m4.include/vfs/mc-vfs-ftp.m4])
 m4_include([m4.include/vfs/mc-vfs-sftp.m4])
-m4_include([m4.include/vfs/mc-vfs-fish.m4])
+m4_include([m4.include/vfs/mc-vfs-shell.m4])
 m4_include([m4.include/vfs/mc-vfs-undelfs.m4])
 m4_include([m4.include/vfs/mc-vfs-tarfs.m4])
 m4_include([m4.include/vfs/mc-vfs-cpiofs.m4])
@@ -71,7 +71,7 @@ AC_DEFUN([mc_VFS_CHECKS],
 
     mc_VFS_CPIOFS
     mc_VFS_EXTFS
-    mc_VFS_FISH
+    mc_VFS_SHELL
     mc_VFS_FTP
     mc_VFS_SFS
     mc_VFS_SFTP
@@ -80,7 +80,7 @@ AC_DEFUN([mc_VFS_CHECKS],
 
     AM_CONDITIONAL(ENABLE_VFS, [test x"$enable_vfs" = x"yes"])
 
-    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
 	mc_ENABLE_VFS_NET
     fi
 
diff --git a/m4.include/vfs/mc-vfs-fish.m4 b/m4.include/vfs/mc-vfs-fish.m4
deleted file mode 100644
index d3463ee..0000000
--- a/m4.include/vfs/mc-vfs-fish.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl Enable FISH protocol (classic)
-AC_DEFUN([mc_VFS_FISH],
-[
-    AC_ARG_ENABLE([vfs-fish],
-		    AS_HELP_STRING([--enable-vfs-fish], [Support for FISH filesystem @<:@yes@:>@]))
-    if test "$enable_vfs" = "yes" -a "x$enable_vfs_fish" != xno; then
-	enable_vfs_fish="yes"
-	mc_VFS_ADDNAME([fish])
-	AC_DEFINE([ENABLE_VFS_FISH], [1], [Support for FISH vfs])
-    fi
-    AM_CONDITIONAL(ENABLE_VFS_FISH, [test "$enable_vfs" = "yes" -a x"$enable_vfs_fish" = x"yes"])
-])
diff --git a/m4.include/vfs/mc-vfs-shell.m4 b/m4.include/vfs/mc-vfs-shell.m4
new file mode 100644
index 0000000..b07b22b
--- /dev/null
+++ b/m4.include/vfs/mc-vfs-shell.m4
@@ -0,0 +1,12 @@
+dnl Enable SHELL protocol
+AC_DEFUN([mc_VFS_SHELL],
+[
+    AC_ARG_ENABLE([vfs-shell],
+		    AS_HELP_STRING([--enable-vfs-shell], [Support for SHELL filesystem @<:@yes@:>@]))
+    if test "$enable_vfs" = "yes" -a "x$enable_vfs_shell" != xno; then
+	enable_vfs_shell="yes"
+	mc_VFS_ADDNAME([shell])
+	AC_DEFINE([ENABLE_VFS_SHELL], [1], [Support for SHELL vfs])
+    fi
+    AM_CONDITIONAL(ENABLE_VFS_SHELL, [test "$enable_vfs" = "yes" -a x"$enable_vfs_shell" = x"yes"])
+])