diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2014-07-10 20:14:40 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2014-07-10 20:14:40 -0700 |
| commit | 7d5f7d113365a13422039425f0ffba71c4b775ef (patch) | |
| tree | 2ceaf84a8afcafd5859cab00b68c8cf691938587 | |
| parent | 9795ce010a8d461090cc79af6957713d35053bb1 (diff) | |
| download | xrdp-proprietary-7d5f7d113365a13422039425f0ffba71c4b775ef.tar.gz xrdp-proprietary-7d5f7d113365a13422039425f0ffba71c4b775ef.zip | |
added --enable-rfxcodec
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | xrdp/Makefile.am | 9 | ||||
| -rw-r--r-- | xrdp/xrdp_encoder.c | 4 |
3 files changed, 16 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c3f95bf9..85145cfc 100644 --- a/configure.ac +++ b/configure.ac @@ -51,6 +51,10 @@ AC_ARG_ENABLE(xrdpvr, AS_HELP_STRING([--enable-xrdpvr], [Build xrdpvr module (default: no)]), [xrdpvr=true], [xrdpvr=false]) AM_CONDITIONAL(XRDP_XRDPVR, [test x$xrdpvr = xtrue]) +AC_ARG_ENABLE(rfxcodec, AS_HELP_STRING([--enable-rfxcodec], + [Build using librfxcodec (default: no)]), + [rfxcodec=true], [rfxcodec=false]) +AM_CONDITIONAL(XRDP_RFXCODEC, [test x$rfxcodec = xtrue]) AM_CONDITIONAL(GOT_PREFIX, test "x${prefix}" != "xNONE"]) diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am index 050cde77..96ec07f3 100644 --- a/xrdp/Makefile.am +++ b/xrdp/Makefile.am @@ -15,6 +15,12 @@ EXTRA_INCLUDES += -I$(prefix)/include EXTRA_FLAGS += -L$(prefix)/lib -Wl,-rpath -Wl,$(prefix)/lib endif +if XRDP_RFXCODEC +EXTRA_DEFINES += -DXRDP_RFXCODEC +EXTRA_INCLUDES += -I$(top_srcdir)/librfxcodec/include +EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/librfxencode.a +endif + AM_CFLAGS = \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \ @@ -50,7 +56,8 @@ xrdp_SOURCES = \ xrdp_LDADD = \ $(top_builddir)/common/libcommon.la \ - $(top_builddir)/libxrdp/libxrdp.la + $(top_builddir)/libxrdp/libxrdp.la \ + $(EXTRA_LIBS) xrdp_LDFLAGS = \ $(EXTRA_FLAGS) diff --git a/xrdp/xrdp_encoder.c b/xrdp/xrdp_encoder.c index 679b55fe..5ed1a5c0 100644 --- a/xrdp/xrdp_encoder.c +++ b/xrdp/xrdp_encoder.c @@ -23,6 +23,10 @@ #include "thread_calls.h" #include "fifo.h" +#ifdef XRDP_RFXCODEC +#include "rfxcodec_encode.h" +#endif + #define LLOG_LEVEL 1 #define LLOGLN(_level, _args) \ do \ |