From 4fb7b8e30f68d1f1354303e6eb994def22e96c2a Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Tue, 5 Jul 2011 21:37:11 +1000
Subject: [PATCH] Use AM_CXX* for c++ build variables

---
 Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6050a553..288f944b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 AUTOMAKE_OPTIONS = dist-bzip2 dist-xz foreign
 ACLOCAL_AMFLAGS = -I m4
 
-AM_CXXFLAGS = $(BOOST_CFLAGS) $(BOOST_FILESYSTEM_CFLAGS) $(COMMON_CXXFLAGS)
-AM_LDFLAGS  = $(BOOST_LIB) $(BOOST_FILESYSTEM_LIB) $(COMMON_LDFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(COMMON_CXXFLAGS)
+AM_LDFLAGS  = $(BOOST_LDFLAGS) $(BOOST_FILESYSTEM_LIB) $(COMMON_LDFLAGS)
 
 SUBDIRS = test
 
@@ -63,4 +63,4 @@ SUFFIXES = .cpp .cpp.rl
 
 lib_LTLIBRARIES  = libutil.la
 libutil_la_SOURCES  = $(UTIL_INCLUDE) $(UTIL_FILES)
-libutil_la_CXXFLAGS = -fPIC $(COMMON_CXXFLAGS)
+libutil_la_CXXFLAGS = -fPIC $(AM_CXXFLAGS)