chansrv: added --enable-fuse option

ulab-next
Jay Sorg 12 years ago
parent 02d52444c3
commit cdb039080f

@ -43,6 +43,10 @@ AC_ARG_ENABLE(simplesound, AS_HELP_STRING([--enable-simplesound],
[Build simple pulse audio interface (default: no)]), [Build simple pulse audio interface (default: no)]),
[simplesound=true], [simplesound=false]) [simplesound=true], [simplesound=false])
AM_CONDITIONAL(XRDP_SIMPLESOUND, [test x$simplesound = xtrue]) AM_CONDITIONAL(XRDP_SIMPLESOUND, [test x$simplesound = xtrue])
AC_ARG_ENABLE(fuse, AS_HELP_STRING([--enable-fuse],
[Build fuse(clipboard file / drive redir) (default: no)]),
[fuse=true], [fuse=false])
AM_CONDITIONAL(XRDP_FUSE, [test x$fuse = xtrue])
AM_CONDITIONAL(GOT_PREFIX, test "x${prefix}" != "xNONE"]) AM_CONDITIONAL(GOT_PREFIX, test "x${prefix}" != "xNONE"])
@ -70,6 +74,14 @@ then
[AC_MSG_ERROR([please install libjpeg-dev or libjpeg-devel])]) [AC_MSG_ERROR([please install libjpeg-dev or libjpeg-devel])])
fi fi
# checking for fuse
if ! test -z "$enable_fuse"
then
AC_CHECK_HEADER([fuse.h], [],
[AC_MSG_ERROR([please install libfuse-dev or fuse-devel])],
[#define _FILE_OFFSET_BITS 64])
fi
# checking for libpulse libpulse-simple # checking for libpulse libpulse-simple
if ! test -z "$enable_simplesound" if ! test -z "$enable_simplesound"
then then

@ -10,6 +10,11 @@ EXTRA_DEFINES += -DXRDP_SIMPLESOUND
EXTRA_LIBS += -lpthread -lpulse -lpulse-simple EXTRA_LIBS += -lpthread -lpulse -lpulse-simple
endif endif
if XRDP_FUSE
EXTRA_DEFINES += -DXRDP_FUSE
EXTRA_LIBS += -lfuse
endif
AM_CFLAGS = \ AM_CFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
@ -36,7 +41,7 @@ xrdp_chansrv_SOURCES = \
chansrv_fuse.c chansrv_fuse.c
xrdp_chansrv_LDFLAGS = \ xrdp_chansrv_LDFLAGS = \
$(EXTRA_FLAGS) -lfuse $(EXTRA_FLAGS)
xrdp_chansrv_LDADD = \ xrdp_chansrv_LDADD = \
-L/usr/X11R6/lib \ -L/usr/X11R6/lib \

@ -16,9 +16,7 @@
* limitations under the License. * limitations under the License.
*/ */
#define XRDP_USE_FUSE 1 #ifdef XRDP_FUSE
#ifdef XRDP_USE_FUSE
#define FUSE_USE_VERSION 26 #define FUSE_USE_VERSION 26
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64
@ -54,14 +52,13 @@ static char *g_mountpoint = 0;
static tintptr g_bufsize = 0; static tintptr g_bufsize = 0;
static char *g_buffer = 0; static char *g_buffer = 0;
static int g_fd = 0; static int g_fd = 0;
struct file_item *g_file_items = 0;
int g_file_items_count = 0;
static time_t g_time = 0; static time_t g_time = 0;
static int g_uid = 0; static int g_uid = 0;
static int g_gid = 0; static int g_gid = 0;
extern struct file_item *g_file_items; /* in chansrv_file.c */
extern int g_file_items_count; /* in chansrv_file.c */
struct dirbuf struct dirbuf
{ {
char *p; char *p;

@ -47,15 +47,14 @@
} \ } \
while (0) while (0)
struct file_item *g_file_items = 0;
int g_file_items_count = 0;
extern int g_cliprdr_chan_id; /* in chansrv.c */ extern int g_cliprdr_chan_id; /* in chansrv.c */
extern struct clip_s2c g_clip_s2c; /* in clipboard.c */ extern struct clip_s2c g_clip_s2c; /* in clipboard.c */
extern struct clip_c2s g_clip_c2s; /* in clipboard.c */ extern struct clip_c2s g_clip_c2s; /* in clipboard.c */
extern struct file_item *g_file_items; /* in chansrv_fuse.c */
extern int g_file_items_count; /* in chansrv_fuse.c */
struct cb_file_info struct cb_file_info
{ {
char pathname[256]; char pathname[256];

Loading…
Cancel
Save