diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-01-05 23:21:52 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-01-05 23:21:52 +0100 |
| commit | 3c81899718e3429e45381beaaba58d4886a5537c (patch) | |
| tree | 509b9d44cc872ba45df0b3c2afc74e90ca0cc6e4 /nxproxy | |
| parent | e13e31f752c0b204f964ee1df272a6b31ce51189 (diff) | |
| parent | 1c1431c0ff41afa8221ea8a1e0d4514746ebbaa3 (diff) | |
| download | nx-libs-3c81899718e3429e45381beaaba58d4886a5537c.tar.gz nx-libs-3c81899718e3429e45381beaaba58d4886a5537c.tar.bz2 nx-libs-3c81899718e3429e45381beaaba58d4886a5537c.zip | |
Merge branch 'Ionic-bugfix/rpath' into 3.6.x
Attributes GH PR #614: https://github.com/ArcticaProject/nx-libs/pull/614
Fixes: ArcticaProject/nx-libs#610
Diffstat (limited to 'nxproxy')
| -rw-r--r-- | nxproxy/configure.ac | 9 | ||||
| -rw-r--r-- | nxproxy/src/Makefile.am | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/nxproxy/configure.ac b/nxproxy/configure.ac index 811862efd..a1dcab442 100644 --- a/nxproxy/configure.ac +++ b/nxproxy/configure.ac @@ -16,6 +16,9 @@ AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2]) +# Initialize libtool +AC_PROG_LIBTOOL + PROXY_VERSION=nxproxy_version AC_SUBST([PROXY_VERSION]) @@ -34,12 +37,6 @@ dnl We will work around this bug by using AX_PTHREAD and linking with pthread su dnl libXcomp for now. AX_PTHREAD([], AC_MSG_ERROR([no POSIX threads support detected])) -AC_ARG_ENABLE([cxx11], - [AS_HELP_STRING([--enable-cxx11], - [enable optional features requiring C++11 support (disabled by default)])], - [AS_IF([test x$enableval = xyes], - [AX_CXX_COMPILE_STDCXX_11([], [mandatory])])]) - AC_CONFIG_FILES([ Makefile man/Makefile diff --git a/nxproxy/src/Makefile.am b/nxproxy/src/Makefile.am index 4fd2eefd6..ecf2a0486 100644 --- a/nxproxy/src/Makefile.am +++ b/nxproxy/src/Makefile.am @@ -15,6 +15,7 @@ nxproxy_LDADD = \ nxproxy_LDFLAGS = \ $(PTHREAD_LDFLAGS) \ + -Wl,--enable-new-dtags \ $(NULL) nxproxy_CFLAGS = \ |