Index: trunk/m4/pythia8.m4
===================================================================
--- trunk/m4/pythia8.m4	(revision 8338)
+++ trunk/m4/pythia8.m4	(revision 8339)
@@ -1,122 +1,122 @@
 dnl pythia8.m4 -- checks for PYTHIA 8 library
 dnl
 
 AC_DEFUN([WO_PROG_PYTHIA8],
 [dnl
 AC_REQUIRE([AC_PROG_CXX])
 
 AC_ARG_ENABLE([pythia8],
   [AS_HELP_STRING([--enable-pythia8],
     [enable PYTHIA8 for shower and hadronization [[no]]])],
   [], [enable_pythia8="no"])
 
 if test "$enable_pythia8" = "yes"; then
   ACX_CHECK_PYTHIA8()
   if test "${pyconfig}" = "no"; then
      enable_pythia8="no"
   else
      wo_require_stdcpp="yes"
   fi
 else
   AC_MSG_CHECKING([for PYTHIA8])
   AC_MSG_RESULT([(disabled)])
 fi
 
 AC_SUBST([PYTHIA8_CXXFLAGS])
 AC_SUBST([PYTHIA8_LIBS])
 
 if test "$enable_pythia8" = "yes"; then
    PYTHIA8_AVAILABLE_FLAG=".true."
 else
    PYTHIA8_AVAILABLE_FLAG=".false."
 fi
 AC_SUBST([PYTHIA8_AVAILABLE_FLAG])
 
 AM_CONDITIONAL([PYTHIA8_AVAILABLE], [test "$enable_pythia8" = "yes"])
 ])
 
 dnl #####################################################################
 dnl CHECK PYTHIA8 BEGIN
 dnl
 dnl By defaults, this searches the PYTHIA8 library in standard system
 dnl locations but an alternative path can be specified using the
 dnl --with-pythia8=... configure option
 dnl
 dnl If PYTHIA8 is found and functional, the variables PYTHIA8_CXXFLAGS
 dnl and PYTHIA8_LIBS are set
 AC_DEFUN([ACX_CHECK_PYTHIA8],
 [
 dnl ckeck if a directory is specified for PYTHIA8
 AC_ARG_WITH(pythia8,
             [AC_HELP_STRING([--with-pythia8=dir], 
                             [assume the given directory for PYTHIA8])])
 
 dnl search for the pythia8-config script
 if test "$with_pythia8" = ""; then
    AC_PATH_PROG(pyconfig, pythia8-config, no)
 else
    AC_PATH_PROG(pyconfig, pythia8-config, no, ${with_pythia8}/bin)
 fi
 
 if test "${pyconfig}" = "no"; then
    AC_MSG_CHECKING(PYTHIA8)
    AC_MSG_RESULT(no);
    $2
 else
 
    dnl now see if PYTHIA8 is functional
    save_CXXFLAGS="$CXXFLAGS"
    save_LIBS="$LIBS"
 
    CXXFLAGS="${CXXFLAGS} `${pyconfig} --cxxflags`"
-   LIBS="${LIBS} `${pyconfig} --libs`"
+   LIBS="${LIBS} -Wl,-rpath,`${pyconfig} --libdir` `${pyconfig} --libs`"
 
    AC_MSG_CHECKING([if PYTHIA8 is functional])
    AC_LANG_PUSH(C++)
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <Pythia8/Pythia.h>
    ]], [[
 Pythia8::Pythia* pythia=new Pythia8::Pythia;
    ]])], [pyok='yes'], [pyok='no'])
    AC_MSG_RESULT([$pyok])
    AC_LANG_POP()
    CXXFLAGS="$save_CXXFLAGS"
    LIBS="$save_LIBS"
 
    AC_MSG_CHECKING(PYTHIA8)
    if test "${pyok}" = "yes"; then
       PYTHIA8_CXXFLAGS="`${pyconfig} --cxxflags`"
-      PYTHIA8_LIBS="`${pyconfig} --libs`"
+      PYTHIA8_LIBS="-Wl,-rpath,`${pyconfig} --libdir` `${pyconfig} --libs`"
       AC_MSG_RESULT(yes)
       $1
    else
       AC_MSG_RESULT(no)
       $2
    fi
 
    AC_MSG_CHECKING(the PYTHIA8 version)
    AC_LANG([C++])
 
    save_CXXFLAGS="$CXXFLAGS"	
    save_LIBS="$LIBS"
    CXXFLAGS="${CXXFLAGS} `${pyconfig} --cxxflags`"
-   LIBS="${LIBS} `${pyconfig} --libs`"
+   LIBS="${LIBS} -Wl,-rpath,`${pyconfig} --libdir` `${pyconfig} --libs`"
    AC_LINK_IFELSE([dnl
      AC_LANG_PROGRAM([[#include "Pythia8/Pythia.h"]],
        [[
        Pythia8::Pythia* pythia=new Pythia8::Pythia;
        ]])],
     [dnl
     wo_pythia8_version=`./conftest | $GREP 'PYTHIA version' | $SED 's/.* PYTHIA version //g'  | $SED 's/|.*//g'`
     VERSION_KNOWN="true"
     AC_MSG_RESULT([$wo_pythia8_version])],
     [dnl
     AC_MSG_RESULT([unknown])
     VERSION_KNOWN="no"])
     PYTHIA8_VERSION=$wo_pythia8_version    
     AC_SUBST([PYTHIA8_VERSION])   
 
 fi
 ])
 
 dnl CHECK PYTHIA8 END