[Rivet-svn] r3193 - in trunk: . bin

[blackhole at projects.hepforge.org]

Author: buckley
Date: Mon Jul 18 18:17:07 2011
New Revision: 3193

Log:
bin/rivet-buildplugin.in: Pass the AM_CXXFLAGS variable (including the warning flags) to the C++ compiler when building user analysis plugins.

Modified:
   trunk/ChangeLog
   trunk/bin/rivet-buildplugin.in

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Mon Jul 18 18:15:43 2011	(r3192)
+++ trunk/ChangeLog	Mon Jul 18 18:17:07 2011	(r3193)
@@ -1,5 +1,9 @@
 2011-07-18  Andy Buckley  <andy at insectnation.org>
 
+	* bin/rivet-buildplugin.in: Pass the AM_CXXFLAGS
+	variable (including the warning flags) to the C++ compiler when
+	building user analysis plugins.
+
 	* include/LWH/DataPointSet.h: Fix accidental setting of errorMinus
 	= scalefactor * error_Plus_. Thanks to Anton Karneyeu for the bug
 	report!

Modified: trunk/bin/rivet-buildplugin.in
==============================================================================
--- trunk/bin/rivet-buildplugin.in	Mon Jul 18 18:15:43 2011	(r3192)
+++ trunk/bin/rivet-buildplugin.in	Mon Jul 18 18:17:07 2011	(r3193)
@@ -47,8 +47,11 @@
 
 ## Get Rivet system C++ compiler flags
 mycxxflags=""
+if [[ -n "@AM_CXXFLAGS@" ]]; then
+    mycxxflags="@AM_CXXFLAGS@"
+fi
 if [[ -n "@CXXFLAGS@" ]]; then
-    mycxxflags="@CXXFLAGS@"
+    mycxxflags="$mycxxflags @CXXFLAGS@"
 fi
 
 ## Get Rivet system C preprocessor flags (duplicating that in rivet-config.in)