From a1e9abc7841adec8403c4bba6e394b5540ad8e78 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 23 Jun 2016 14:27:15 +0200
Subject: OPTFLAGS: Properly propagate build option flags to nxcomp{,ext,shad}
 and the nx-X11 build scripts.

 Note:

  - The "normal" way to inject CFLAGS (and CPPFLAGS) into nx-X11 builds is copying those
    options over into the variable CDEBUGFLAGS.
  - LDFLAGS have to be handed to nx-X11 via LOCAL_LDFLAGS.

 This change also includes a slight change in the nx-X11 build order.

 Old build order:

  Main Makefile:

      - [...]
      - libNX_X11
        + implicitly building nxcomp
        + implicitly building nxcompext
      - [...]
      - nxagent
        + implicitly building nxcompshad
      - [...]

 New build ordner:

  Main Makefile:

      - [...]
      - nxcomp
      - setup nx-X11 build env
        + cd nx-X11 && make BuildEnv
      - nxcompext
      - nxcompshad
      - nx-X11/lib/*
      - [...]
      - nxagent
      - [...]

 Fixes ArcticaProject/nx-libs#141
 Fixes X2GoBTS#84
---
 nxcomp/configure.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'nxcomp/configure.in')

diff --git a/nxcomp/configure.in b/nxcomp/configure.in
index 47b29e7bc..6586f22b2 100644
--- a/nxcomp/configure.in
+++ b/nxcomp/configure.in
@@ -10,8 +10,12 @@ AC_SUBST(pkgconfigdir)
 
 dnl Set our default compilation flags.
 
-CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions"
-CFLAGS="$CFLAGS -O3"
+if test "x$CXXFLAGS" = "x"; then
+  CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
+fi
+if test "x$CFLAGS" = "x"; then
+  CFLAGS="$CFLAGS -O3"
+fi
 
 dnl Reset default linking directives.
 
-- 
cgit v1.2.3