diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-03-09 09:08:35 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-03-15 12:20:05 +0100 |
| commit | 25cc6fce5402549afdea25f9b4a7102d7ec04eaf (patch) | |
| tree | cf9325a957ae0389acf2f1bd866268dbc43752ac | |
| parent | 090d4d19b5211538fcde2066ce66e0ef21665562 (diff) | |
| download | nx-libs-25cc6fce5402549afdea25f9b4a7102d7ec04eaf.tar.gz nx-libs-25cc6fce5402549afdea25f9b4a7102d7ec04eaf.tar.bz2 nx-libs-25cc6fce5402549afdea25f9b4a7102d7ec04eaf.zip | |
nx-X11/programs/Xserver/{,os/}Imakefile: implement libtirpc forcing via UseTIRPC.
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 10 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/Imakefile | 8 |
2 files changed, 17 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 0d45215cf..64c4e2e7f 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -296,10 +296,18 @@ 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') +#endif +#endif + NXAGENT = hw/nxagent/LibraryTargetName(nxagent) NXCOMPEXT = hw/nxagent/compext/LibraryTargetName(compext) NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXCOMPEXT) $(NXAGENT) $(MI) -NXAGENTSYSLIBS = $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB) $(XMLLIB) $(PIXMANLIB) +NXAGENTSYSLIBS = $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB) $(XMLLIB) $(PIXMANLIB) $(TIRPC_LIB) NXCOMPEXTSYSLIBS = $(ZLIB) $(PNGLIB) $(JPEGLIB) #if HasParallelMake MakeMutex($(NXAGENTDIRS) $(NXCOMPEXT) $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXCOMPEXTSYSLIBS) $(NXAGENTSYSLIBS)) diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile index 7932e32cd..da39c57ba 100644 --- a/nx-X11/programs/Xserver/os/Imakefile +++ b/nx-X11/programs/Xserver/os/Imakefile @@ -75,10 +75,17 @@ XDMAUTHOBJS = XDMAUTHSCRS = #endif +TIRPC_INCLUDES = + #if HasSecureRPC RPCDEFS = -DSECURE_RPC RPCOBJS = rpcauth.o RPCSRCS = rpcauth.c + +#if UseTIRPC +TIRPC_INCLUDES = $$(pkg-config --cflags-only-I 'libtirpc') +#endif + #else RPCDEFS = RPCOBJS = @@ -209,6 +216,7 @@ BOOTSTRAPCFLAGS = -I$(TOP)/lib/Xau \ $(NX_INCLUDES) \ `pkg-config --cflags-only-I pixman-1` \ + $(TIRPC_INCLUDES) \ $(NULL) DEPEND_DEFINES = $(XDMCP_DEFINES) \ |