Honour compiler/linker option flags.

debian/patches/026_nxcomp_honour-optflags.full+lite.patch

-Description: Honour compiler/linker option flags
-Forwarded: pending
-Author: Orion Poplawski <orion@cora.nwra.com>
-diff -up a/nxcomp/configure.in b/nxcomp/configure.in
---- a/nxcomp/configure.in	2012-11-10 06:40:55.000000000 -0700
-+++ b/nxcomp/configure.in	2012-12-11 13:13:19.390229196 -0700
-@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
- 
- dnl Set our default compilation flags.
- 
--CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
--CFLAGS="-O3"
-+CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions"
-+CFLAGS="$CFLAGS -O3"
- 
- dnl Reset default linking directives.
- 
-diff -up a/nxproxy/configure.in b/nxproxy/configure.in
---- a/nxproxy/configure.in	2012-11-10 06:40:55.000000000 -0700
-+++ b/nxproxy/configure.in	2012-12-11 13:16:19.955301045 -0700
-@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
- 
- dnl Reset default compilation flags.
- 
--CXXFLAGS="-O3"
--CPPFLAGS="-O3"
-+CXXFLAGS="$CXXFLAGS -O3"
-+CPPFLAGS="$CPPFLAGS -O3"
- 
- dnl Prefer headers and libraries from nx-X11 if present.
- 

debian/patches/026_nxcompext_honour-optflags.full.patch

-Description: Honour compiler/linker option flags
-Forwarded: pending
-Author: Orion Poplawski <orion@cora.nwra.com>
-diff -up a/nxcompext/configure.in b/nxcompext/configure.in
---- a/nxcompext/configure.in	2012-11-10 06:40:55.000000000 -0700
-+++ b/nxcompext/configure.in	2012-12-11 13:15:26.712576302 -0700
-@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
- 
- dnl Reset default compilation flags.
- 
--CXXFLAGS="-O3"
--CFLAGS="-O3"
-+CXXFLAGS="$CXXFLAGS -O3"
-+CFLAGS="$CFLAGS -O3"
- 
- dnl Reset default linking directives.
- 

debian/patches/026_nxcompshad_honour-optflags.full.patch

-Description: Honour compiler/linker option flags
-Forwarded: pending
-Author: Orion Poplawski <orion@cora.nwra.com>
-diff -up a/nxcompshad/configure.in b/nxcompshad/configure.in
---- a/nxcompshad/configure.in	2012-11-10 06:40:56.000000000 -0700
-+++ b/nxcompshad/configure.in	2012-12-11 13:13:25.915196300 -0700
-@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
- 
- dnl Reset default compilation flags.
- 
--CXXFLAGS="-O3"
--CPPFLAGS="-O3"
-+CXXFLAGS="$CXXFLAGS -O3"
-+CPPFLAGS="$CPPFLAGS -O3"
- 
- dnl Reset default linking directives.
- 

debian/patches/series

-026_nxcompext_honour-optflags.full.patch
-026_nxcomp_honour-optflags.full+lite.patch
-026_nxcompshad_honour-optflags.full.patch
 027_nxcomp_abstract-X11-socket.full+lite.patch
 028_nx-X11_abstract-kernel-sockets.full.patch
 029_nxcomp_ppc64.full+lite.patch

nxcomp/configure.in

@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
 
 dnl Set our default compilation flags.
 
-CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
-CFLAGS="-O3"
+CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions"
+CFLAGS="$CFLAGS -O3"
 
 dnl Reset default linking directives.
 

nxcompext/configure.in

@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
 
 dnl Reset default compilation flags.
 
-CXXFLAGS="-O3"
-CFLAGS="-O3"
+CXXFLAGS="$CXXFLAGS -O3"
+CFLAGS="$CFLAGS -O3"
 
 dnl Reset default linking directives.
 

nxcompshad/configure.in

@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
 
 dnl Reset default compilation flags.
 
-CXXFLAGS="-O3"
-CPPFLAGS="-O3"
+CXXFLAGS="$CXXFLAGS -O3"
+CPPFLAGS="$CPPFLAGS -O3"
 
 dnl Reset default linking directives.
 

nxproxy/configure.in

@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
 
 dnl Reset default compilation flags.
 
-CXXFLAGS="-O3"
-CPPFLAGS="-O3"
+CXXFLAGS="$CXXFLAGS -O3"
+CPPFLAGS="$CPPFLAGS -O3"
 
 dnl Prefer headers and libraries from nx-X11 if present.