From 12446899f78c076fb1d1aa3d002f53994aadac99 Mon Sep 17 00:00:00 2001 From: Slava Zanko Date: Tue, 20 Jul 2010 15:54:55 +0300 Subject: [PATCH] Changes for configure and build with samba: * m4: AC_CONFIG_SUBDIRS() macros should be always called without relation to enable/disable samba support * vfs/samba: configure.ac: renamed --with-configdir to --with-smb-configdir * vfs/samba: configure.ac: renamed --with-codepagedir to --with-smb-codepagedir Signed-off-by: Slava Zanko --- lib/vfs/mc-vfs/samba/configure.ac | 12 ++++++------ m4.include/vfs/mc-vfs-samba.m4 | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/vfs/mc-vfs/samba/configure.ac b/lib/vfs/mc-vfs/samba/configure.ac index 319fcba4f..b2d44b584 100644 --- a/lib/vfs/mc-vfs/samba/configure.ac +++ b/lib/vfs/mc-vfs/samba/configure.ac @@ -528,14 +528,14 @@ AC_ARG_WITH(ssl, ################################################# # set configuration directory location configdir="\$(LIBDIR)" -AC_ARG_WITH(configdir, -[ --with-configdir=DIR Where to put configuration files (\$libdir)], +AC_ARG_WITH(smb-configdir, +[ --with-smb-configdir=DIR Where to put configuration files (\$libdir)], [ case "$withval" in yes|no) # # Just in case anybody does it # - AC_MSG_WARN([--with-configdir called without argument - will use default]) + AC_MSG_WARN([--with-smb-configdir called without argument - will use default]) ;; * ) configdir="$withval" @@ -547,14 +547,14 @@ AC_ARG_WITH(configdir, ################################################# # set codepage directory location codepagedir="\$(LIBDIR)/codepages" -AC_ARG_WITH(codepagedir, -[ --with-codepagedir=DIR Where to put codepage files (\$libdir/codepages)], +AC_ARG_WITH(smb-codepagedir, +[ --with-smb-codepagedir=DIR Where to put codepage files (\$libdir/codepages)], [ case "$withval" in yes|no) # # Just in case anybody does it # - AC_MSG_WARN([--with-codepagedir called without argument - will use default]) + AC_MSG_WARN([--with-smb-codepagedir called without argument - will use default]) ;; * ) codepagedir="$withval" diff --git a/m4.include/vfs/mc-vfs-samba.m4 b/m4.include/vfs/mc-vfs-samba.m4 index db1ad8bc5..4e3a05af2 100644 --- a/m4.include/vfs/mc-vfs-samba.m4 +++ b/m4.include/vfs/mc-vfs-samba.m4 @@ -40,8 +40,8 @@ AC_DEFUN([AC_MC_VFS_SMB], AC_SUBST(configdir) AC_SUBST(codepagedir) - AC_CONFIG_SUBDIRS([lib/vfs/mc-vfs/samba]) fi + AC_CONFIG_SUBDIRS([lib/vfs/mc-vfs/samba]) AM_CONDITIONAL([ENABLE_VFS_SMB], [test x"$enable_vfs_smb" = x"yes"]) ]) -- 2.11.4.GIT