From 73fbf15ef5222c06938a5aa2f443e8491a534902 Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 22 Apr 2010 04:34:35 +0000
Subject: [PATCH] Move $(DEFS) from CXXFLAGS to CPPFLAGS. This is to get
 -DHAVE_CONFIG_H into the flags when making makefile.dep. Without this, making
 makefile.dep fails on OpenSlaris because it can't find <pcre.h>. With
 HAVE_CONFIG_H it knows to look in <pcre/pcre.h>.

---
 Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index f0b3b7f03..2cd8833c7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,8 +40,8 @@ DEFS += -D_FORTIFY_SOURCE=2
 # For mtrace debugging -- see MTRACE define in main.cc for instructions
 # Should only be enabled during debugging and not in any real release.
 # DEFS += -DMTRACE=1
-CXXFLAGS = @CXXFLAGS@ $(DBGFLAGS) $(CCOPT) $(DEFS)
-CPPFLAGS = @CPPFLAGS@
+CXXFLAGS = @CXXFLAGS@ $(DBGFLAGS) $(CCOPT)
+CPPFLAGS = @CPPFLAGS@ $(DEFS)
 export CFLAGS = $(CXXFLAGS)
 # CFLAGS = $(DEFS) $(INCLS)
 STATIC =