# HG changeset patch
# User Michael Goffioul <michael.goffioul@gmail.com>
# Date 1266773277 0
# Node ID 43145faf9af809dc84760ed35f845976cea126bd
# Parent  36317747577a2f862358d660c40490325b24c291
Move $(pcre_config --cflags) from CPPFLAGS to XTRA_CXXFLAGS

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-21  Michael Goffioul  <michael.goffioul@gmail.com>
+
+	* configure.ac: Add pcre_config --cflags to XTRA_CXXFLAGS instead of
+	CPPFLAGS.
+
 2010-02-17  John W. Eaton  <jwe@octave.org>
 
 	* configure.ac: Add $COLAMD_LDFLAGS $COLAMD_LIBS $AMD_LDFLAGS,
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -615,10 +615,10 @@
 
 ### Check for pcre/regex library.
 
-## check for pcre-config, and if so, set CPPFLAGS appropriately
+## check for pcre-config, and if so, set XTRA_CXXFLAGS appropriately
 AC_CHECK_PROG(WITH_PCRE_CONFIG, pcre-config, yes, no)
 if test $WITH_PCRE_CONFIG = yes ; then
-  CPPFLAGS="$CPPFLAGS $(pcre-config --cflags)"
+  XTRA_CXXFLAGS="$XTRA_CXXFLAGS $(pcre-config --cflags)"
 fi
 
 ## NB: no need to do separate check for pcre.h header -- checking macros is good enough