Commit 280d8751 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Mike Gabriel

Add patch: 030_nx-X11_configure-args.diff. Allow passing of configure args.

parent 165206eb
...@@ -10,6 +10,7 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low ...@@ -10,6 +10,7 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
[ Jan Engelhardt ] [ Jan Engelhardt ]
* Update patch: 001_add-main-makefile.full+lite.patch, allow passing of * Update patch: 001_add-main-makefile.full+lite.patch, allow passing of
configure args. configure args.
* Add patch: 030_nx-X11_configure-args.diff. Allow passing of configure args.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Feb 2012 13:48:19 +0100 -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Feb 2012 13:48:19 +0100
......
From: Jan Engelhardt <jengelh@medozas.de>
Date: 2012-01-26 23:30:37.605560191 +0100
Upstream: pending
Allow to pass in configure args.
---
nx-X11/lib/X11/Imakefile | 6 ++++--
nx-X11/programs/Xserver/Imakefile | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
Index: nx-X11/lib/X11/Imakefile
===================================================================
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -1147,15 +1147,17 @@ ks_tables.h: $(XINCLUDESRC)/keysymdef.h
includes:: ks_tables.h
+CONFIGURE=./configure
+
#if NXLibraries
$(NX_XCOMPCONFIGTARGET):
cd ../../../nxcomp && \
- ./configure
+ ${CONFIGURE}
$(NX_XCOMPEXTCONFIGTARGET):
cd ../../../nxcompext && \
- ./configure
+ ${CONFIGURE}
#ifdef SunArchitecture
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
Index: nx-X11/programs/Xserver/Imakefile
===================================================================
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -1036,9 +1036,11 @@ NX_XSHADOWLIBDIR = $(XTOP)/../nxcomps
NX_XSHADOWLIBTARGET = $(NX_XSHADOWLIBDIR)/$(NX_XSHADOWLIBNAME)
NX_XSHADOWCONFIGTARGET = $(NX_XSHADOWLIBDIR)/config.status
+CONFIGURE=./configure
+
$(NX_XSHADOWCONFIGTARGET):
cd $(NX_XSHADOWLIBDIR) && \
- ./configure
+ ${CONFIGURE}
#ifdef SunArchitecture
$(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
021_add-nxauth-wrapper.full.patch 021_add-nxauth-wrapper.full.patch
022_add-nxproxy-wrapper.full+lite.patch 022_add-nxproxy-wrapper.full+lite.patch
023_add-x2goagent-wrapper.full.patch 023_add-x2goagent-wrapper.full.patch
030_nx-X11_configure-args.diff
101_nxagent_set-rgb-path.full.patch 101_nxagent_set-rgb-path.full.patch
102_xserver-xext_set-securitypolicy-path.full.patch 102_xserver-xext_set-securitypolicy-path.full.patch
102_xserver-xext_set-securitypolicy-path.debian.patch 102_xserver-xext_set-securitypolicy-path.debian.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment