[Rivet-svn] r2715 - in trunk: . bin pyext src

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Thu Oct 14 16:48:41 2010
New Revision: 2715

Log:
cleanup of gsl test. Hopefully this makes Hudson happy again.

Modified:
   trunk/bin/rivet-config.in
   trunk/pyext/setup.py.in
   trunk/rivetenv.csh.in
   trunk/rivetenv.sh.in
   trunk/src/Makefile.am

Modified: trunk/bin/rivet-config.in
==============================================================================
--- trunk/bin/rivet-config.in	Thu Oct 14 13:52:18 2010	(r2714)
+++ trunk/bin/rivet-config.in	Thu Oct 14 16:48:41 2010	(r2715)
@@ -75,8 +75,6 @@
     test -n "$lhepmc" && OUT="$OUT -L${lhepmc}"
     lfastjet="@FASTJETLIBPATH@"
     test -n "$lfastjet" && OUT="$OUT -L${lfastjet}"
-    lgsl="@GSLLIBPATH@"
-    test -n "$lgsl" && OUT="$OUT -L${lgsl}"
 fi
 
 tmp=$( echo "$*" | egrep -- '--\<libs\>|--\<ldadd\>')

Modified: trunk/pyext/setup.py.in
==============================================================================
--- trunk/pyext/setup.py.in	Thu Oct 14 13:52:18 2010	(r2714)
+++ trunk/pyext/setup.py.in	Thu Oct 14 16:48:41 2010	(r2715)
@@ -18,7 +18,7 @@
                 #include_dirs=[incdir, os.path.join(incdir, 'eigen2'), '@HEPMCINCPATH@', '@BOOSTINCPATH@', '@GSLINCPATH@'],
                 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@'],
+                library_dirs=[srcdir, os.path.join(srcdir,'.libs'), '@HEPMCLIBPATH@'],
                 libraries=['HepMC', 'Rivet'])
 
 ## Setup definition

Modified: trunk/rivetenv.csh.in
==============================================================================
--- trunk/rivetenv.csh.in	Thu Oct 14 13:52:18 2010	(r2714)
+++ trunk/rivetenv.csh.in	Thu Oct 14 16:48:41 2010	(r2715)
@@ -4,7 +4,7 @@
 set datarootdir=@datarootdir@
 
 setenv PATH "$exec_prefix/bin:$PATH"
-setenv @LIBPATHVARNAME@ "@libdir@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:@GSLLIBPATH@:$@LIBPATHVARNAME@"
+setenv @LIBPATHVARNAME@ "@libdir@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:$@LIBPATHVARNAME@"
 
 if ($?PYTHONPATH) then
 setenv PYTHONPATH "@RIVET_PYTHONPATH@:$PYTHONPATH"

Modified: trunk/rivetenv.sh.in
==============================================================================
--- trunk/rivetenv.sh.in	Thu Oct 14 13:52:18 2010	(r2714)
+++ trunk/rivetenv.sh.in	Thu Oct 14 16:48:41 2010	(r2715)
@@ -4,7 +4,7 @@
 datarootdir=@datarootdir@
 
 export PATH="$exec_prefix/bin:$PATH"
-export @LIBPATHVARNAME@="@libdir@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:@GSLLIBPATH@:$@LIBPATHVARNAME@"
+export @LIBPATHVARNAME@="@libdir@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:$@LIBPATHVARNAME@"
 export PYTHONPATH="@RIVET_PYTHONPATH@:$PYTHONPATH"
 export TEXMFHOME="@datadir@/Rivet/texmf:$TEXMFHOME"
 export HOMETEXMF="@datadir@/Rivet/texmf:$HOMETEXMF"

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	Thu Oct 14 13:52:18 2010	(r2714)
+++ trunk/src/Makefile.am	Thu Oct 14 16:48:41 2010	(r2715)
@@ -10,7 +10,6 @@
 
 libRivet_la_LDFLAGS = \
   -L$(prefix)/lib \
-  -L$(GSLLIBPATH) \
   -L$(HEPMCLIBPATH) \
   -export-dynamic $(VERSIONINFOFLAGS)