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
---
 nxcompshad/Makefile.in  |  6 ++++--
 nxcompshad/configure.in | 12 ++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'nxcompshad')

diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index 68bb1fbad..9c2b6f4fd 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -36,6 +36,8 @@ CXXFLAGS    = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
 CXXINCLUDES =
 CXXDEFINES  =
 
+CPPFLAGS    = @CPPFLAGS@
+
 #
 # C programs don't share the C++ flags. They should
 # have their own @CCFLAGS@.
@@ -99,9 +101,9 @@ DEPENDINCLUDES = -I/usr/include/g++ -I/usr/include/g++-3
 .SUFFIXES: .cpp.c
 
 .cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(CXXINCLUDES) $(CXXDEFINES) $<
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CXXINCLUDES) $(CXXDEFINES) $<
 .c.o:
-	$(CC) -c $(CCFLAGS) $(CCINCLUDES) $(CCDEFINES) $<
+	$(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CCINCLUDES) $(CCDEFINES) $<
 
 LIBRARY = Xcompshad
 
diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in
index 7ec064cc6..226b13ef8 100644
--- a/nxcompshad/configure.in
+++ b/nxcompshad/configure.in
@@ -10,8 +10,12 @@ AC_SUBST(pkgconfigdir)
 
 dnl Reset default compilation flags.
 
-CXXFLAGS="$CXXFLAGS -O3"
-CPPFLAGS="$CPPFLAGS -O3"
+if test "x$CXXFLAGS" == "x"; then
+  CXXFLAGS="-O3"
+fi
+if test "x$CPPFLAGS" == "x"; then
+  CPPFLAGS="-O3"
+fi
 
 dnl Reset default linking directives.
 
@@ -80,8 +84,8 @@ case "${gcc_version}" in
 
      *)
         AC_MSG_RESULT([yes])
-        CXXFLAGS="$CXXFLAGS -Wmissing-declarations -Wnested-externs"
-        CPPFLAGS="$CPPFLAGS -Wmissing-declarations -Wnested-externs"
+        CXXFLAGS="$CXXFLAGS -Wmissing-declarations"
+        CPPFLAGS="$CPPFLAGS -Wmissing-declarations"
         ;;
 esac
 
-- 
cgit v1.2.3