On 18.02.2014 10:41, Michel Stempin wrote:
Le 18/02/2014 10:22, Dirk Neukirchen a écrit :
On 18.02.2014 08:04, Michel Stempin wrote:
Signed-off-by: Michel Stempin michel.stem...@wanadoo.fr
---
utils/mc/Makefile |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/mc/Makefile b/utils/mc/Makefile
index f43c5a1..e036da3 100644
--- a/utils/mc/Makefile
+++ b/utils/mc/Makefile
@@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/nls.mk
define Package/mc
SECTION:=utils
CATEGORY:=Utilities
- DEPENDS:=+glib2 +libncurses $(LIBRPC_DEPENDS) $(ICONV_DEPENDS)
+ DEPENDS:=+glib2 +libncurses $(LIBRPC_DEPENDS) $(ICONV_DEPENDS) +libssh2
TITLE:=midnight commander - a powerful file manager
URL:=http://www.midnight-commander.org/
SUBMENU:=filemanager
libssh2 is needed for sftp and there is a configure switch for that:
--enable-vfs-sftp Support for SFTP filesystem [auto]
Maybe disable all vfs and have a minimal and a full package?
--disable-vfs
Thanks for comments!
Maybe providing an option for vfs to mc in menuconfig?
After having a (rested) look at it:
The mc/Makefile is using the wrong configure switch:
- --without-vfs
instead of --disable-vfs
- Fixed another configure switch that got changed
Config.in submenu with default n has the option unset instead of n so
ifeq ($(CONFIG_MC_DIFF_VIEWER),n)
fails - fix that
I hope the dependency is set the right way
Signed-off-by: Dirk Neukirchen dirkneukirc...@web.de
---
diff --git a/utils/mc/Makefile b/utils/mc/Makefile
index b031ee9..cfa6078 100644
--- a/utils/mc/Makefile
+++ b/utils/mc/Makefile
@@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/nls.mk
define Package/mc
SECTION:=utils
CATEGORY:=Utilities
- DEPENDS:=+glib2 +libncurses $(LIBRPC_DEPENDS) $(ICONV_DEPENDS)
+ DEPENDS:=+glib2 +libncurses $(LIBRPC_DEPENDS) $(ICONV_DEPENDS)
+!MC_DISABLE_VFS:libssh2
TITLE:=midnight commander - a powerful file manager
URL:=http://www.midnight-commander.org/
SUBMENU:=Filemanager
@@ -44,31 +44,33 @@ define Package/mc/description
endef
CONFIGURE_ARGS += \
- --enable-utf8 \
--disable-doxygen-doc \
--with-screen=ncurses \
--without-gpm-mouse \
--without-x \
ac_cv_search_addwstr=no
-ifeq ($(CONFIG_MC_DIFF_VIEWER),n)
+ifeq ($(CONFIG_MC_DIFF_VIEWER),)
CONFIGURE_ARGS += \
--without-diff-viewer
endif
-ifeq ($(CONFIG_MC_EDITOR),n)
+ifeq ($(CONFIG_MC_EDITOR),)
CONFIGURE_ARGS += \
- --without-edit
+ --without-internal-edit
endif
-ifeq ($(CONFIG_MC_SUBSHELL),n)
+ifeq ($(CONFIG_MC_SUBSHELL),)
CONFIGURE_ARGS += \
--without-subshell
endif
ifeq ($(CONFIG_MC_DISABLE_VFS),y)
CONFIGURE_ARGS += \
- --without-vfs
+ --disable-vfs
+else
+CONFIGURE_ARGS += \
+ --enable-vfs-sftp
endif
define Package/mc/install
smime.p7s
Description: S/MIME Cryptographic Signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
