From 6960eeef4ac3fe1cec883b6fef15f404dbbd5787 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gmail.com>
Date: Mon, 20 Aug 2012 13:35:28 -0700
Subject: build: Set AM_C* instead of CFLAGS/CPPFLAGS

---
 Makefile.am  |  3 ++-
 configure.ac | 11 ++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 61dc9c3..23ae5e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,8 @@ AM_CPPFLAGS = -DLIBRARYBUILD \
 	-I$(top_srcdir)/src/libnurbs/internals \
 	-I$(top_srcdir)/src/libnurbs/interface \
 	-I$(top_srcdir)/src/libnurbs/nurbtess
+AM_CFLAGS = $(GL_CFLAGS) $(WARNCFLAGS)
+AM_CXXFLAGS = $(GL_CFLAGS) $(WARNCXXFLAGS)
 
 GLU_LIBRARY_VERSION=1:3:1
 lib_LTLIBRARIES = libGLU.la
@@ -123,6 +125,5 @@ libGLU_la_SOURCES =						\
 	src/libnurbs/nurbtess/sampleMonoPoly.cc			\
 	src/libnurbs/nurbtess/sampledLine.cc			\
 	src/libnurbs/nurbtess/searchTree.cc
-libGLU_la_CFLAGS = $(GL_CFLAGS)
 libGLU_la_LIBADD = $(GL_LIBS)
 libGLU_la_LDFLAGS = -version-number $(GLU_LIBRARY_VERSION) -no-undefined -export-symbols-regex '^glu'
diff --git a/configure.ac b/configure.ac
index dd63141..e0ee467 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,14 +61,19 @@ PKG_CHECK_MODULES(GL, [gl], [], [
 
 dnl Set up C warning flags.
 if test "x$GCC" = xyes; then
-    CFLAGS="$CFLAGS -Wall"
-    CXXFLAGS="$CXXFLAGS -Wall"
+    WARNCFLAGS="-Wall"
+    if test "x$GXX" = xyes; then
+        WARNCXXFLAGS="-Wall"
+    fi
 else
     AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
     if test "x$SUNCC" = "xyes"; then
-        WARNFLAGS="-v"
+        WARNCFLAGS="-v"
+        WARNCXXFLAGS="-v"
     fi
 fi
+AC_SUBST([WARNCFLAGS])
+AC_SUBST([WARNCXXFLAGS])
 
 AC_OUTPUT([
     Makefile
-- 
cgit v1.2.1