[Rivet-svn] r1813 - in trunk: . include/Rivet/Projections

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu Sep  3 19:51:17 2009
New Revision: 1813

Log:
Disabling file extension passing, since Macs now use the same .so extension as Linux (and we don't care about Windows). Also now passing GSL and GSLcblas -I flags to compiler, as this is responsible for GSL breaking the build when it's not installed system-wide (why on earth would *Scientific* Linux 5 not have GSL as a standard package???)

Modified:
   trunk/configure.ac
   trunk/include/Rivet/Projections/ChargedFinalState.hh

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Thu Sep  3 00:03:29 2009	(r1812)
+++ trunk/configure.ac	Thu Sep  3 19:51:17 2009	(r1813)
@@ -41,14 +41,11 @@
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 
-## Work out library suffix for the build
-RAW_LIB_EXTN=$(echo "$shrext_cmds" | sed -e 's/^\.//')
-LIB_SUFFIX=\\\"$shrext_cmds\\\"
-AC_SUBST(RAW_LIB_EXTN)
-AC_SUBST([LIB_SUFFIX])
-
 ## GNU Scientific Library
-AC_PATH_PROG(GSLCONFIG, gsl-config, [], [$PATH:$GSLPATH/bin])
+GSLCONFIG_PATH=$PATH
+test "$GSLPATH" && GSLCONFIG_PATH=$GSLPATH/bin:$GSLCONFIG_PATH 
+test "$with_gsl" && GSLCONFIG_PATH=$with_gsl/bin:$GSLCONFIG_PATH 
+AC_PATH_PROG(GSLCONFIG, gsl-config, [], [$GSLCONFIG_PATH])
 if test -f "$GSLCONFIG"; then
   GSLPATH=`$GSLCONFIG --prefix`
   GSLCBLASPATH=$GSLPATH
@@ -209,9 +206,10 @@
 ## Set default build flags
 AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include"
 AM_CPPFLAGS="$AM_CPPFLAGS -I\$(BOOSTINCPATH) \$(BOOST_CPPFLAGS)"
+AM_CPPFLAGS="$AM_CPPFLAGS -I\$(GSLINCPATH)"
+AM_CPPFLAGS="$AM_CPPFLAGS -I\$(GSLCBLASINCPATH)"
 AM_CPPFLAGS="$AM_CPPFLAGS -I\$(HEPMCINCPATH)"
 AM_CPPFLAGS="$AM_CPPFLAGS -I\$(FASTJETINCPATH)"
-AM_CXXFLAGS="$AM_CXXFLAGS -DLIB_SUFFIX=$LIB_SUFFIX "
 AC_CEDAR_CHECKCXXFLAG([-pedantic], [AM_CXXFLAGS="$AM_CXXFLAGS -pedantic "])
 AC_CEDAR_CHECKCXXFLAG([-ansi], [AM_CXXFLAGS="$AM_CXXFLAGS -ansi "])
 AC_CEDAR_CHECKCXXFLAG([-Wall], [AM_CXXFLAGS="$AM_CXXFLAGS -Wall "])

Modified: trunk/include/Rivet/Projections/ChargedFinalState.hh
==============================================================================
--- trunk/include/Rivet/Projections/ChargedFinalState.hh	Thu Sep  3 00:03:29 2009	(r1812)
+++ trunk/include/Rivet/Projections/ChargedFinalState.hh	Thu Sep  3 19:51:17 2009	(r1813)
@@ -13,7 +13,6 @@
 
 
   /// Project only charged final state particles.
-  /// @todo Can we make this work nicely with inheritance rather than composition?
   class ChargedFinalState : public FinalState {
 
   public:
@@ -39,6 +38,7 @@
     }
     //@}
 
+
   protected:
     
     /// Apply the projection on the supplied event.