[X2Go-Commits] [nx-libs] 22/29: Allow to pass in configure args (030_nx-X11_configure-args.full.patch).

git-admin at x2go.org git-admin at x2go.org
Tue Feb 10 05:21:46 CET 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 9f4b494fa49db53a440f544246d6922dbd0c4684
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Mon Feb 9 15:34:02 2015 +0100

    Allow to pass in configure args (030_nx-X11_configure-args.full.patch).
---
 .../patches/030_nx-X11_configure-args.full.patch   |   51 --------------------
 debian/patches/series                              |    1 -
 nx-X11/lib/X11/Imakefile                           |    6 ++-
 nx-X11/programs/Xserver/Imakefile                  |    4 +-
 4 files changed, 7 insertions(+), 55 deletions(-)

diff --git a/debian/patches/030_nx-X11_configure-args.full.patch b/debian/patches/030_nx-X11_configure-args.full.patch
deleted file mode 100644
index 67184d3..0000000
--- a/debian/patches/030_nx-X11_configure-args.full.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: Allow to pass in configure args.
- Allow to pass in configure args.
-Forward: pending
-Author: Jan Engelhardt <jengelh at medozas.de>
-Last-Update: 2012-02-14
----
- 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)
diff --git a/debian/patches/series b/debian/patches/series
index de6e090..1288ab3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-030_nx-X11_configure-args.full.patch
 031_nx-X11_parallel-make.full.patch
 051_nxcomp_macos105-fdisset.full+lite.patch
 052_nxcomp_macos10-nxauth-location.full+lite.patch
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index d8d0601..2431949 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -1147,15 +1147,17 @@ ks_tables.h: $(XINCLUDESRC)/keysymdef.h util/makekeys.c
 
 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)
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 1d12173..b5e5b5b 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -1036,9 +1036,11 @@ NX_XSHADOWLIBDIR    = $(XTOP)/../nxcompshad
 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)

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list