This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.6.x
in repository nx-libs.
commit 990e61cc8931be57bda5526a69e6e204e1ee2dda
Author: Mihai Moldovan <io...@ionic.de>
Date: Sun Feb 25 04:33:52 2018 +0100
nxcompshad/{configure.ac,src/Makefile.am}: only enable new ELF dtags if
target system actually is ELF-based.
---
nxcompshad/configure.ac | 2 ++
nxcompshad/src/Makefile.am | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/nxcompshad/configure.ac b/nxcompshad/configure.ac
index 3113918..181e43a 100644
--- a/nxcompshad/configure.ac
+++ b/nxcompshad/configure.ac
@@ -47,6 +47,8 @@ AC_LANG([C++])
NX_COMPILER_BRAND
NX_DEFAULT_OPTIONS
+NX_TARGET_USE_ELF
+
AC_ARG_ENABLE([cxx11],
[AS_HELP_STRING([--enable-cxx11],
[enable optional features requiring C++11
support (disabled by default)])],
diff --git a/nxcompshad/src/Makefile.am b/nxcompshad/src/Makefile.am
index f7beac8..4580149 100644
--- a/nxcompshad/src/Makefile.am
+++ b/nxcompshad/src/Makefile.am
@@ -39,10 +39,14 @@ AM_CPPFLAGS =
\
libXcompshad_la_LDFLAGS = \
-version-number @LT_COMPSHAD_VERSION@ -no-undefined \
- -Wl,--enable-new-dtags \
-R '$(libdir)/nx/X11' \
$(NULL)
+if TARGET_ELF
+libXcompshad_la_LDFLAGS += \
+ -Wl,--enable-new-dtags \
+endif TARGET_ELF
+
libXcompshadincludedir = $(includedir)/nx
libXcompshadinclude_HEADERS = \
$(top_srcdir)/include/Shadow.h \
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/nx-libs.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
