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
---
 nxcompext/Makefile.in  | 6 ++++--
 nxcompext/configure.in | 8 ++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'nxcompext')

diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in
index dd18c8053..415ffabb1 100644
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -34,6 +34,8 @@ CXXFLAGS    = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
 CXXINCLUDES = -I. -I../nxcomp
 CXXDEFINES  =
 
+CPPFLAGS    = @CPPFLAGS@
+
 CC          = @CC@
 CCFLAGS     = @CFLAGS@ @X_CFLAGS@ @DEFS@ \
               -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
@@ -78,9 +80,9 @@ DEPENDINCLUDES =  -I/usr/include/c++ -I/usr/include/g++ -I/usr/include/g++-3
 .SUFFIXES: .cpp.c
 
 .cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(CXXINCLUDES) $<
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CXXINCLUDES) $<
 .c.o:
-	$(CC) -c $(CCFLAGS) $(CCINCLUDES) $<
+	$(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CCINCLUDES) $<
 
 LIBRARY = Xcompext
 
diff --git a/nxcompext/configure.in b/nxcompext/configure.in
index 6078851b4..70bb9d121 100644
--- a/nxcompext/configure.in
+++ b/nxcompext/configure.in
@@ -10,8 +10,12 @@ AC_SUBST(pkgconfigdir)
 
 dnl Reset default compilation flags.
 
-CXXFLAGS="$CXXFLAGS -O3"
-CFLAGS="$CFLAGS -O3"
+if test "x$CXXFLAGS" = "x"; then
+  CXXFLAGS="-O3"
+fi
+if test "x$CFLAGS" == "x"; then
+  CFLAGS="-O3"
+fi
 
 dnl Reset default linking directives.
 
-- 
cgit v1.2.3