From 4d481bf99431a22fb5df5e49254c60280bf1815b Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Wed, 3 Jan 2018 03:17:10 +0100 Subject: nxproxy/configure.ac: drop --enable-cxx11. This is a C program, so enabling or disabling C++11 support will not do anything useful. At most it'll lead to errors when using libtool, which is the next change to come... --- nxproxy/configure.ac | 6 ------ 1 file changed, 6 deletions(-) (limited to 'nxproxy') diff --git a/nxproxy/configure.ac b/nxproxy/configure.ac index 811862efd..70f43ec6e 100644 --- a/nxproxy/configure.ac +++ b/nxproxy/configure.ac @@ -34,12 +34,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 -- cgit v1.2.3 From d1897719ae47dc013184d9676516d5d0fb9e85f2 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Wed, 3 Jan 2018 03:18:12 +0100 Subject: nxproxy/configure.ac: enable libtool support. Using libtool, the nxproxy binary will be replaced by a shell script wrapper that correctly pulls in required libraries (like libXcomp), thus making it possible to start the binary directly in the build directory. This wrapper is dropped during installation time. --- nxproxy/configure.ac | 3 +++ 1 file changed, 3 insertions(+) (limited to 'nxproxy') diff --git a/nxproxy/configure.ac b/nxproxy/configure.ac index 70f43ec6e..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]) -- cgit v1.2.3 From 1c1431c0ff41afa8221ea8a1e0d4514746ebbaa3 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Wed, 3 Jan 2018 03:22:31 +0100 Subject: nxproxy/src/Makefile.am: build library using RUNPATH instead of RPATH. Will only be useful at build time, since installation strips any RPATH/RUNPATH again. --- nxproxy/src/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'nxproxy') 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 = \ -- cgit v1.2.3