This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit c261030b4dc0eb404396aa44f0282c900c99d20a Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 9 09:55:57 2018 +0100 Try to workaround weird imake/make issue. --- nx-X11/programs/Xserver/Imakefile | 6 ++++-- nx-X11/programs/Xserver/os/Imakefile | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 57ec4b2..570815e 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -296,12 +296,14 @@ ZLIB = $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs PNGLIB = `pkg-config --libs libpng` JPEGLIB = -ljpeg -TIRPC_LIB = - #if HasSecureRPC #if UseTIRPC TIRPC_LIB = $$(pkg-config --libs 'libtirpc') +#else +TIRPC_LIB = #endif +#else +TIRPC_LIB = #endif NXAGENT = hw/nxagent/LibraryTargetName(nxagent) diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile index 9308c86..8a1e20c 100644 --- a/nx-X11/programs/Xserver/os/Imakefile +++ b/nx-X11/programs/Xserver/os/Imakefile @@ -74,8 +74,6 @@ XDMAUTHOBJS = XDMAUTHSCRS = #endif -TIRPC_INCLUDES = - #if HasSecureRPC RPCDEFS = -DSECURE_RPC RPCOBJS = rpcauth.o @@ -83,12 +81,15 @@ RPCSRCS = rpcauth.c #if UseTIRPC TIRPC_INCLUDES = $$(pkg-config --cflags-only-I 'libtirpc') +#else +TIRPC_INCLUDES = #endif #else RPCDEFS = RPCOBJS = RPCSRCS = +TIRPC_INCLUDES = #endif #if HasBSD44Sockets -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git