diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2012-11-10 17:53:08 -0800 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2012-11-10 17:53:08 -0800 |
| commit | 585beebf3e85f25242dfaf89deb1862022a49116 (patch) | |
| tree | c8f115121dd5fb4e2355870c9f04a79afa68cbec | |
| parent | 55f0bfd0b9c9c172108003e2daacbde7abb06e66 (diff) | |
| download | xrdp-proprietary-585beebf3e85f25242dfaf89deb1862022a49116.tar.gz xrdp-proprietary-585beebf3e85f25242dfaf89deb1862022a49116.zip | |
do not build xrdpvr unless --enable-xrdpvr is used
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 134afce4..5193171f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,12 @@ else FREERDPDIR = endif +if XRDP_XRDPVR +XRDPVRDIR = xrdpvr +else +XRDPVRDIR = +endif + SUBDIRS = \ common \ vnc \ @@ -21,4 +27,4 @@ SUBDIRS = \ instfiles \ genkeymap \ xrdpapi \ - xrdpvr + $(XRDPVRDIR) diff --git a/configure.ac b/configure.ac index 610b7e19..6dd4052e 100644 --- a/configure.ac +++ b/configure.ac @@ -47,6 +47,10 @@ 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]) +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]) AM_CONDITIONAL(GOT_PREFIX, test "x${prefix}" != "xNONE"]) @@ -122,7 +126,7 @@ AC_CONFIG_FILES([Makefile instfiles/pam.d/Makefile genkeymap/Makefile xrdpapi/Makefile - xrdpvr/Makefile + xrdpvr/Makefile ]) # fontdump/Makefile # xrdp/cursors/Makefile |