[Rivet-svn] r1816 - in trunk: . bin pyext

[blackhole at projects.hepforge.org]

Author: buckley
Date: Sun Sep  6 22:25:33 2009
New Revision: 1816

Log:
Fixes for unusual GSL builds

Modified:
   trunk/bin/rivet
   trunk/configure.ac
   trunk/pyext/setup.py.in

Modified: trunk/bin/rivet
==============================================================================
--- trunk/bin/rivet	Thu Sep  3 20:17:25 2009	(r1815)
+++ trunk/bin/rivet	Sun Sep  6 22:25:33 2009	(r1816)
@@ -28,6 +28,7 @@
     import dl
     sys.setdlopenflags(sys.getdlopenflags() | dl.RTLD_GLOBAL)
 
+
 ## Try to use Psyco optimiser
 try:
     import psyco

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Thu Sep  3 20:17:25 2009	(r1815)
+++ trunk/configure.ac	Sun Sep  6 22:25:33 2009	(r1816)
@@ -51,7 +51,7 @@
   GSLCBLASPATH=$GSLPATH
   GSL_CXXFLAGS=`$GSLCONFIG --cflags`
 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"
 AC_SUBST(GSL_CXXFLAGS)

Modified: trunk/pyext/setup.py.in
==============================================================================
--- trunk/pyext/setup.py.in	Thu Sep  3 20:17:25 2009	(r1815)
+++ trunk/pyext/setup.py.in	Sun Sep  6 22:25:33 2009	(r1816)
@@ -15,9 +15,9 @@
 ext = Extension('_rivet',
                 ['@srcdir@/rivet_wrap.cc'],
                 define_macros = [("SWIG_TYPE_TABLE", "hepmccompat")],
-                include_dirs=[incdir, '@HEPMCINCPATH@', '@BOOSTINCPATH@'],
+                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@'],
+                library_dirs=[srcdir, os.path.join(srcdir,'.libs'), '@HEPMCLIBPATH@', '@GSLLIBPATH@'],
                 libraries=['HepMC', 'Rivet'])
 
 ## Setup definition