[Rivet-svn] r1817 - in tags/rivet-1.1.3: . pyext

[blackhole at projects.hepforge.org]

Author: buckley
Date: Sun Sep  6 23:25:19 2009
New Revision: 1817

Log:
GSL build fixes

Modified:
   tags/rivet-1.1.3/configure.ac
   tags/rivet-1.1.3/pyext/setup.py.in

Modified: tags/rivet-1.1.3/configure.ac
==============================================================================
--- tags/rivet-1.1.3/configure.ac	Sun Sep  6 22:25:33 2009	(r1816)
+++ tags/rivet-1.1.3/configure.ac	Sun Sep  6 23:25:19 2009	(r1817)
@@ -53,7 +53,7 @@
   GSLPATH=`$GSLCONFIG --prefix`
   GSLCBLASPATH=$GSLPATH
 fi
-AC_CEDAR_LIBRARY([gsl], , , [AC_MSG_ERROR([GNU Scientific Library is required])])
+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"
 GSL_CXXFLAGS=

Modified: tags/rivet-1.1.3/pyext/setup.py.in
==============================================================================
--- tags/rivet-1.1.3/pyext/setup.py.in	Sun Sep  6 22:25:33 2009	(r1816)
+++ tags/rivet-1.1.3/pyext/setup.py.in	Sun Sep  6 23:25:19 2009	(r1817)
@@ -15,9 +15,9 @@
 ext = Extension('_rivet',
                 ['@srcdir@/rivet_wrap.cc'],
                 define_macros = [("SWIG_TYPE_TABLE", "hepmccompat")],
-                include_dirs=[incdir, '@HEPMCINCPATH@', '@BOOSTINCPATH@'],
-                #should replace '.libs' -> os.path.join(srcdir,'@LT_OBJDIR@'), but doesn't work
-                library_dirs=[srcdir, os.path.join(srcdir,'.libs'), '@HEPMCLIBPATH@'],
+                include_dirs=[incdir, '@HEPMCINCPATH@', '@BOOSTINCPATH@', '@GSLINCPATH@'],
+                # Should replace '.libs' -> os.path.join(srcdir,'@LT_OBJDIR@'), but doesn't work
+                library_dirs=[srcdir, os.path.join(srcdir,'.libs'), '@HEPMCLIBPATH@', '@GSLLIBPATH@'],
                 libraries=['HepMC', 'Rivet'])
 
 ## Setup definition