summaryrefslogtreecommitdiffstats
path: root/xrdp
diff options
context:
space:
mode:
authorVraiment <jemc44@gmail.com>2018-02-08 02:28:16 -0800
committermetalefty <meta@vmeta.jp>2018-02-19 11:41:55 +0900
commit9ed5243de9c8cb511a38b2ee09c3f8be76c40065 (patch)
treee8bf9645240e03137887bcc9fa2d1b24f5f87648 /xrdp
parent31ef2552c4bfdff6d50864997cd59e999bf0d21b (diff)
downloadxrdp-proprietary-9ed5243de9c8cb511a38b2ee09c3f8be76c40065.tar.gz
xrdp-proprietary-9ed5243de9c8cb511a38b2ee09c3f8be76c40065.zip
Make xrdp.ini to be dynamic for each operating system
Diffstat (limited to 'xrdp')
-rw-r--r--xrdp/Makefile.am17
-rw-r--r--xrdp/xrdp.ini.in (renamed from xrdp/xrdp.ini)14
2 files changed, 24 insertions, 7 deletions
diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am
index a259ef32..fe14d88d 100644
--- a/xrdp/Makefile.am
+++ b/xrdp/Makefile.am
@@ -67,6 +67,23 @@ xrdp_LDADD = \
xrdpsysconfdir=$(sysconfdir)/xrdp
+if MACOS
+lib_extension = dylib
+else
+lib_extension = so
+endif
+
+SUBST_VARS = sed \
+ -e 's|@lib_extension[@]|$(lib_extension)|g'
+
+subst_verbose = $(subst_verbose_@AM_V@)
+subst_verbose_ = $(subst_verbose_@AM_DEFAULT_V@)
+subst_verbose_0 = @echo " SUBST $@";
+
+SUFFIXES = .in
+.in:
+ $(subst_verbose)$(SUBST_VARS) $< > $@
+
dist_xrdpsysconf_DATA = \
xrdp.ini \
xrdp_keyboard.ini
diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini.in
index e3ae2841..fb09bbd9 100644
--- a/xrdp/xrdp.ini
+++ b/xrdp/xrdp.ini.in
@@ -155,7 +155,7 @@ tcutils=true
; in sesman.ini. See and configure also sesman.ini.
[Xorg]
name=Xorg
-lib=libxup.so
+lib=libxup.@lib_extension@
username=ask
password=ask
ip=127.0.0.1
@@ -164,7 +164,7 @@ code=20
[X11rdp]
name=X11rdp
-lib=libxup.so
+lib=libxup.@lib_extension@
username=ask
password=ask
ip=127.0.0.1
@@ -174,7 +174,7 @@ code=10
[Xvnc]
name=Xvnc
-lib=libvnc.so
+lib=libvnc.@lib_extension@
username=ask
password=ask
ip=127.0.0.1
@@ -184,7 +184,7 @@ port=-1
[console]
name=console
-lib=libvnc.so
+lib=libvnc.@lib_extension@
ip=127.0.0.1
port=5900
username=na
@@ -193,7 +193,7 @@ password=ask
[vnc-any]
name=vnc-any
-lib=libvnc.so
+lib=libvnc.@lib_extension@
ip=ask
port=ask5900
username=na
@@ -205,7 +205,7 @@ password=ask
[sesman-any]
name=sesman-any
-lib=libvnc.so
+lib=libvnc.@lib_extension@
ip=ask
port=-1
username=ask
@@ -214,7 +214,7 @@ password=ask
[neutrinordp-any]
name=neutrinordp-any
-lib=libxrdpneutrinordp.so
+lib=libxrdpneutrinordp.@lib_extension@
ip=ask
port=ask3389
username=ask