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 b260e1c1afb027133b1352d81688440bd7bb4235 Merge: 793eb35 f2c3af8 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 9 09:12:05 2018 +0100 Merge branch 'feature/use-libtirpc' into 3.6.x-rpm-debug Makefile | 11 +++++++---- nx-X11/config/cf/Imake.tmpl | 3 +++ nx-X11/config/cf/README | 1 + nx-X11/programs/Xserver/Imakefile | 12 ++++++++++-- nx-X11/programs/Xserver/os/Imakefile | 8 ++++++++ nx-libs.spec | 13 +++++++++---- 6 files changed, 38 insertions(+), 10 deletions(-) diff --cc nx-X11/programs/Xserver/Imakefile index 74eb5ab,57ec4b2..a2e3c71 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@@ -292,16 -292,23 +292,24 @@@ NXAGENTOBJS = hw/nxagent/miinitext. XPMLIB = -lXpm XMLLIB = `pkg-config --libs libxml-2.0` PIXMANLIB = `pkg-config --libs pixman-1` - ZLIB = $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs 'zlib' || echo "-lz") + ZLIB = $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs 'zlib' || printf '%s' '-lz') PNGLIB = `pkg-config --libs libpng` JPEGLIB = -ljpeg +TIRPCLIB = $$(pkg-config --exists 'libtirpc' >/dev/null 2>&1 && pkg-config --libs 'libtirpc') + TIRPC_LIB = + + #if HasSecureRPC + #if UseTIRPC + TIRPC_LIB = $$(pkg-config --libs 'libtirpc') + #endif + #endif + NXAGENT = hw/nxagent/LibraryTargetName(nxagent) NXCOMPEXT = hw/nxagent/compext/LibraryTargetName(compext) -NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXCOMPEXT) $(NXAGENT) $(MI) +NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXCOMPEXT) $(NXAGENT) $(MI) $(TIRPCLIB) NXAGENTSYSLIBS = $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB) $(XMLLIB) - NXCOMPEXTSYSLIBS = $(PIXMANLIB) $(ZLIB) $(PNGLIB) $(JPEGLIB) + NXCOMPEXTSYSLIBS = $(PIXMANLIB) $(ZLIB) $(PNGLIB) $(JPEGLIB) $(TIRPC_LIB) #if HasParallelMake MakeMutex($(NXAGENTDIRS) $(NXCOMPEXT) $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXCOMPEXTSYSLIBS) $(NXAGENTSYSLIBS)) #endif -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git