1
1

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 <slavazanko@gmail.com>
Этот коммит содержится в:
Slava Zanko 2010-07-20 15:54:55 +03:00 коммит произвёл Andrew Borodin
родитель 9b89d60522
Коммит 12446899f7
2 изменённых файлов: 7 добавлений и 7 удалений

Просмотреть файл

@ -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"

Просмотреть файл

@ -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"])
])