mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 18:14:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #1925: Fixed conditional compile of mcserver

Browse Source
This commit is contained in:
Enrico Weigelt, metux IT service 2009-12-13 09:34:46 +01:00
parent bf951d52ed
commit a295a9df47
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/vfs/mc-vfs/mcfsutil.c
View File

@ -25,7 +25,7 @@
#include <config.h> #include <config.h>
#ifdef ENABLE_VFS_MCFS #if defined(ENABLE_VFS_MCFS) || defined(ENABLE_MCSERVER)
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
@ -210,4 +210,4 @@ rpc_get (int sock, ...)
} }
} }
} }
#endif /* ENABLE_VFS_MCFS */ #endif /* ENABLE_VFS_MCFS || ENABLE_MCSERVER */

14
m4.include/mc-mcserver.m4
View File

@ -7,19 +7,18 @@ dnl If PAM is found, other methods are not checked.
AC_DEFUN([MC_MCSERVER_CHECKS], [ AC_DEFUN([MC_MCSERVER_CHECKS], [
dnl dnl
dnl mcfs support dnl mcfs server support
dnl dnl
AC_ARG_ENABLE([mcserver], AC_ARG_ENABLE([mcserver],
[ --enable-mcserver Support mc-specific networking file system server [[no]]], [ --enable-mcserver Support mc-specific networking file system server [[no]]],
[if test "x$enableval" != "xno"; then [enable_mcserver="$enableval"]
AC_DEFINE(ENABLE_MCSERVER, 1, [Define to enable mc-specific networking file system server])
AC_MC_VFS_ADDNAME([mcfs])
enable_mcserver=yes
fi]
) )
if test x"$enable_mcserver" = "xyes"; then if test x"$enable_mcserver" = "xyes"; then
AC_MC_VFS_MCFS_SET AC_DEFINE(ENABLE_MCSERVER, 1, [Define to enable mc-specific networking file system server])
AC_REQUIRE_SOCKET
AC_CHECK_RPC
use_net_code=true
dnl Check if PAM can be used for mcserv dnl Check if PAM can be used for mcserv
AC_CHECK_LIB(dl, dlopen, [LIB_DL="-ldl"]) AC_CHECK_LIB(dl, dlopen, [LIB_DL="-ldl"])
@ -65,5 +64,6 @@ AC_DEFUN([MC_MCSERVER_CHECKS], [
fi fi
fi fi
fi fi
AM_CONDITIONAL(ENABLE_MCSERVER, [test x"$enable_mcserver" = "xyes"])
AC_SUBST(MCSERVLIBS) AC_SUBST(MCSERVLIBS)
]) ])

5
m4.include/mc-vfs.m4
View File

@ -49,13 +49,10 @@ AC_DEFUN([MC_WITH_VFS],
AC_CHECK_RPC AC_CHECK_RPC
AC_REQUIRE_SOCKET AC_REQUIRE_SOCKET
MC_MCSERVER_CHECKS
use_net_code=true use_net_code=true
fi fi
fi fi
AC_DEFINE(ENABLE_VFS, 1, [Define to enable VFS support]) AC_DEFINE(ENABLE_VFS, 1, [Define to enable VFS support])
if $use_net_code; then if $use_net_code; then
AC_DEFINE(USE_NETCODE, 1, [Define to use networked VFS]) AC_DEFINE(USE_NETCODE, 1, [Define to use networked VFS])
@ -94,5 +91,7 @@ AC_DEFUN([AC_MC_VFS_CHECKS],[
AM_CONDITIONAL(ENABLE_VFS_UNDELFS, [false]) AM_CONDITIONAL(ENABLE_VFS_UNDELFS, [false])
fi fi
MC_MCSERVER_CHECKS
AM_CONDITIONAL(ENABLE_VFS, [test x"$enable_vfs" = x"yes"]) AM_CONDITIONAL(ENABLE_VFS, [test x"$enable_vfs" = x"yes"])
]) ])