[Rivet-svn] r2380 - in trunk: . src test

[blackhole at projects.hepforge.org]

Author: buckley
Date: Sun Apr  4 15:43:41 2010
New Revision: 2380

Log:
Making GSL searching respect the results of the gsl-config script (largely by not attempting a second automated search... the pkgcheck macros aren't quite flexible enough to do that correctly :( )

Modified:
   trunk/configure.ac
   trunk/src/Makefile.am
   trunk/test/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Sun Apr  4 11:33:29 2010	(r2379)
+++ trunk/configure.ac	Sun Apr  4 15:43:41 2010	(r2380)
@@ -42,20 +42,7 @@
 AC_PROG_LIBTOOL
 
 ## GNU Scientific Library
-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
-  GSL_CXXFLAGS=`$GSLCONFIG --cflags`
-fi
-AC_CEDAR_LIBRARYANDHEADERS([gsl], , , [AC_MSG_ERROR([GNU Scientific Library is required])])
-AC_CEDAR_LIBRARY([gslcblas], , , [AC_MSG_ERROR([GSL CBLAS is required])])
-GSL_LDFLAGS="-l$GSLLIBNAME -l$GSLCBLASLIBNAME"
-AC_SUBST(GSL_CXXFLAGS)
-AC_SUBST(GSL_LDFLAGS)
+AC_SEARCH_GSL
 
 ## Boost C++ header library
 AC_CEDAR_HEADERS([Boost], , , [AC_MSG_ERROR([Boost is required])])
@@ -236,8 +223,8 @@
 ## Set default build flags
 AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include"
 #AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdir)/include/eigen2"
+AM_CPPFLAGS="$AM_CPPFLAGS \$(GSL_CPPFLAGS)"
 AM_CPPFLAGS="$AM_CPPFLAGS -I\$(BOOSTINCPATH) \$(BOOST_CPPFLAGS)"
-AM_CPPFLAGS="$AM_CPPFLAGS -I\$(GSLINCPATH)"
 AM_CPPFLAGS="$AM_CPPFLAGS -I\$(HEPMCINCPATH)"
 AM_CPPFLAGS="$AM_CPPFLAGS -I\$(FASTJETINCPATH)"
 AC_CEDAR_CHECKCXXFLAG([-pedantic], [AM_CXXFLAGS="$AM_CXXFLAGS -pedantic "])

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	Sun Apr  4 11:33:29 2010	(r2379)
+++ trunk/src/Makefile.am	Sun Apr  4 15:43:41 2010	(r2380)
@@ -9,7 +9,7 @@
 
 libRivet_la_LDFLAGS = \
   -L$(prefix)/lib \
-  -L$(GSLLIBPATH) -L$(GSLCBLASLIBPATH) \
+  -L$(GSLLIBPATH) \
   -export-dynamic $(VERSIONINFOFLAGS)
 
 libRivet_la_LIBADD  = \

Modified: trunk/test/Makefile.am
==============================================================================
--- trunk/test/Makefile.am	Sun Apr  4 11:33:29 2010	(r2379)
+++ trunk/test/Makefile.am	Sun Apr  4 15:43:41 2010	(r2380)
@@ -4,7 +4,7 @@
 testBoost_CPPFLAGS = -I$(top_srcdir)/include $(AM_CPPFLAGS)
 
 testMatVec_SOURCES = testMatVec.cc
-testMatVec_LDADD   = -lm -L$(GSLLIBPATH) -L$(GSLCBLASLIBPATH) -lgsl -lgslcblas
+testMatVec_LDADD   = -lm -L$(GSL_LDFLAGS)
 testMatVec_CPPFLAGS = -I$(top_srcdir)/include $(AM_CPPFLAGS)
 
 testCmp_SOURCES = testCmp.cc