[Rivet-svn] r2537 - in trunk: . bin

[blackhole at projects.hepforge.org]

Author: buckley
Date: Sat Jun 26 18:08:14 2010
New Revision: 2537

Log:
Building a rivetenv.sh file inside the Rivet build process itself... if this works, then we can remove that code from the bootstrap in favour of this more robust one. It doesn't get installed, and I've not tried to make a csh version... do we *really* need one?

Modified:
   trunk/bin/rivet-config.in
   trunk/configure.ac

Modified: trunk/bin/rivet-config.in
==============================================================================
--- trunk/bin/rivet-config.in	Sat Jun 26 10:47:24 2010	(r2536)
+++ trunk/bin/rivet-config.in	Sat Jun 26 18:08:14 2010	(r2537)
@@ -71,7 +71,16 @@
 fi
 
 tmp=$( echo "$*" | egrep -- '--\<ldflags\>')
-test -n "$tmp" && OUT="$OUT -L at libdir@"
+if test -n "$tmp"; then
+    lrivet="@libdir@"
+    test -n "$lrivet" && OUT="$OUT -L${lrivet}"
+    lhepmc="@HEPMCLIBPATH@"
+    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 -- '--\<ldadd\>')
 test -n "$tmp" && OUT="$OUT -lRivet"

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Sat Jun 26 10:47:24 2010	(r2536)
+++ trunk/configure.ac	Sat Jun 26 18:08:14 2010	(r2537)
@@ -301,6 +301,7 @@
 AC_CONFIG_FILES(autopackage/data.apspec)
 AC_CONFIG_FILES(bin/Makefile bin/rivet-config)
 AC_CONFIG_FILES(Makefile Doxyfile)
+AC_CONFIG_FILES(rivetenv.sh)
 
 AC_OUTPUT