# HG changeset patch
# User Rik <rik@octave.org>
# Date 1344355262 25200
# Node ID 4e0ab3b2841899bcda5379763bf3ffd579cd5746
# Parent  ca222e6932b7db1f85f81d8deeb3faded7844fa8
Eliminate duplicate PTHREAD_CFLAGS inclusion in build process.

* configure.ac: Add PTHREAD_CFLAGS to CXXFLAGS.

* build-aux/common.mx: Remove PTHREAD_CFLAGS from AM_CPFLAGS and AM_CXXFLAGS.

diff -r ca222e6932b7 -r 4e0ab3b28418 build-aux/common.mk
--- a/build-aux/common.mk	Tue Aug 07 07:09:54 2012 -0700
+++ b/build-aux/common.mk	Tue Aug 07 09:01:02 2012 -0700
@@ -117,7 +117,7 @@
 XTRA_CFLAGS = @XTRA_CFLAGS@
 WARN_CFLAGS = @WARN_CFLAGS@
 AM_CFLAGS = $(CONFIGURE_CFLAGS) \
-  $(INCFLAGS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(PTHREAD_CFLAGS)
+  $(INCFLAGS) $(XTRA_CFLAGS) $(WARN_CFLAGS)
 BUG_CFLAGS = $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS)
 
 BUILD_CC = @BUILD_CC@
@@ -140,7 +140,7 @@
 XTRA_CXXFLAGS = @XTRA_CXXFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 AM_CXXFLAGS = $(CONFIGURE_CXXFLAGS) \
-  $(INCFLAGS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(PTHREAD_CFLAGS)
+  $(INCFLAGS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS)
 BUG_CXXFLAGS = $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS)
 
 BUILD_CXX = @BUILD_CXX@
diff -r ca222e6932b7 -r 4e0ab3b28418 configure.ac
--- a/configure.ac	Tue Aug 07 07:09:54 2012 -0700
+++ b/configure.ac	Tue Aug 07 09:01:02 2012 -0700
@@ -345,6 +345,7 @@
 ## They seem to be required for the OpenGL tests on Debian systems.
 LIBS="$PTHREAD_LIBS $LIBS"
 CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
 
 ### When compiling math for x87, problems may arise in some code comparing
 ### floating-point intermediate results.