Index: trunk/m4/hepmc.m4
===================================================================
--- trunk/m4/hepmc.m4	(revision 8337)
+++ trunk/m4/hepmc.m4	(revision 8338)
@@ -1,192 +1,192 @@
 dnl hepmc.m4 -- checks for HepMC library
 dnl
 
 ### Determine paths to HEPMC components
 ### If successful, set the conditional HEPMC_AVAILABLE
 ### Also: HEPMC_VERSION HEPMC_INCLUDES LDFLAGS_HEPMC
 AC_DEFUN([WO_PROG_HEPMC],
 [dnl
 AC_REQUIRE([AC_PROG_CXX])
 AC_REQUIRE([AC_PROG_FC])
 
 AC_ARG_ENABLE([hepmc],
   [AS_HELP_STRING([--enable-hepmc],
     [enable HepMC for handling event data [[yes]]])],
   [], [enable_hepmc="yes"])
 
 hepmc_is_v3="no"
 hepmcok="no"
 
 if test "$enable_hepmc" = "yes"; then
    ACX_CHECK_HEPMC3()
    if test "${hepmcok}" = "no"; then
      AC_MSG_NOTICE([HepMC3 not found, incompatible, or HepMC3-config not found])
      AC_MSG_NOTICE([looking for HepMC2 instead ... ])
      if test -n "$HEPMC_DIR"; then
        wo_hepmc_includes="-I$HEPMC_DIR/include"
      fi
      AC_MSG_CHECKING([the HepMC version])
      AC_LANG([C++])
      wo_cxxflags_tmp=$CXXFLAGS
      CXXFLAGS="$CXXFLAGS $wo_hepmc_includes"
      AC_LINK_IFELSE([dnl
        AC_LANG_PROGRAM([[#include "HepMC/Version.h"]],
          [[std::cout << HepMC::versionName();]])],
        [dnl
        wk_hepmc_version=`./conftest`
        AC_MSG_RESULT([$wk_hepmc_version])],
        [dnl
        AC_MSG_RESULT([unknown])
        enable_hepmc="no"])
      CXXFLAGS=$wo_cxxflags_tmp
      
      HEPMC_VERSION=$wk_hepmc_version
      AC_SUBST([HEPMC_VERSION])
 
      if test -n "$HEPMC_DIR"; then
        wo_hepmc_ldflags="-Wl,-rpath,$HEPMC_DIR/lib -L$HEPMC_DIR/lib -lHepMC"
      else
        wo_hepmc_ldflags="-lHepMC"
      fi
      if test "$enable_hepmc" = "yes"; then
        wo_require_stdcpp="yes"
        AC_MSG_CHECKING([for GenEvent class in -lHepMC])
        wo_libs_tmp=$LIBS
        LIBS="$wo_hepmc_ldflags $wo_libs_tmp"
        AC_LANG([C++])
        wo_cxxflags_tmp=$CXXFLAGS
        CXXFLAGS="$CXXFLAGS $wo_hepmc_includes"
        AC_LINK_IFELSE([dnl
          AC_LANG_PROGRAM([[#include "HepMC/GenEvent.h"]],
            [[using namespace HepMC;  GenEvent* evt = new GenEvent();]])],
          [],
          [enable_hepmc="no"])
        AC_MSG_RESULT([$enable_hepmc])
        CXXFLAGS=$wo_cxxflags_tmp
        LIBS=$wo_libs_tmp
      else
        AC_MSG_CHECKING([for HepMC])
        AC_MSG_RESULT([(disabled)])
      fi
      
      if test "$enable_hepmc" = "yes"; then
        HEPMC_INCLUDES=$wo_hepmc_includes
        LDFLAGS_HEPMC=$wo_hepmc_ldflags
      fi
    else
       hepmc_is_v3="yes"
       AC_MSG_CHECKING([the HepMC3 version])
       save_CXXFLAGS="$CXXFLAGS"
       save_LIBS="$LIBS"
       CXXFLAGS="${CXXFLAGS} --std=c++11 `${hepmcconfig} --cxxflags`"
-      LIBS="${LIBS} `${hepmcconfig} --libs`"
+      LIBS="${LIBS} -Wl,-rpath,`${hepmcconfig} --libdir` `${hepmcconfig} --libs`"
       AC_LANG([C++])
       AC_LINK_IFELSE([dnl
         AC_LANG_PROGRAM([[
 #include <stdio.h>
 #include <iostream>
 #include "HepMC3/Version.h"
 ]],
           [[using namespace HepMC3; std::cout << HepMC3::version();]])],
         [dnl
         wk_hepmc_version=`./conftest`
         AC_MSG_RESULT([$wk_hepmc_version])],
         [dnl
         AC_MSG_RESULT([unknown])
         enable_hepmc="no"])  
       CXXFLAGS="$save_CXXFLAGS"
       LIBS="$save_LIBS"  
       HEPMC_VERSION=$wk_hepmc_version
       AC_SUBST([HEPMC_VERSION])   
    fi
 fi
 
 HEPMC_AVAILABLE_FLAG=$enable_hepmc
 
 AC_SUBST([HEPMC_INCLUDES])
 AC_SUBST([LDFLAGS_HEPMC])
 AC_SUBST([HEPMC_AVAILABLE_FLAG])
 
 AM_CONDITIONAL([HEPMC_AVAILABLE], [test "$enable_hepmc" = "yes"])
 AM_CONDITIONAL([HEPMC2_AVAILABLE], [test "$enable_hepmc" = "yes" -a "$hepmc_is_v3" = "no"])
 AM_CONDITIONAL([HEPMC3_AVAILABLE], [test "$enable_hepmc" = "yes" -a "$hepmc_is_v3" = "yes"])
 if test "$enable_hepmc" = "yes" -a "$hepmc_is_v3" = "yes"; then
    HEPMC3_AVAILABLE_FLAG=".true."
 else
    HEPMC3_AVAILABLE_FLAG=".false."
 fi
 if test "$enable_hepmc" = "yes" -a "$hepmc_is_v3" = "no"; then
    HEPMC2_AVAILABLE_FLAG=".true."
 else
    HEPMC2_AVAILABLE_FLAG=".false."
 fi
 AC_SUBST([HEPMC2_AVAILABLE_FLAG])
 AC_SUBST([HEPMC3_AVAILABLE_FLAG])
 AM_CONDITIONAL([HEPMC_IS_VERSION3], [test "$enable_hepmc" = "yes" -a "$hepmc_is_v3" = "yes"])
 ])
 
 dnl #####################################################################
 dnl CHECK HEPMC3 BEGIN
 dnl
 dnl This script can be used in configure scripts to check for the
 dnl usability of the HepMC3 library.
 dnl
 dnl By defaults, it searches the HepMC3 library in standard system
 dnl locations but an alternative path can be specified using the
 dnl --with-hepmc=... configure option
 dnl
 dnl If HepMC3 is found and functional, the variables HEPMC_CXXFLAGS
 dnl and HEPMC_LIBS are set
 AC_DEFUN([ACX_CHECK_HEPMC3],
 [
 dnl ckeck if a directory is specified for HepMC
 AC_ARG_WITH(HepMC,
             [AC_HELP_STRING([--with-hepmc=dir], 
                             [assume the given directory for HepMC])])
 
 dnl search for the Hepmc3-config script
 if test "$with_hepmc" = ""; then
    AC_PATH_PROG(hepmcconfig, HepMC3-config, no)
 else
    AC_PATH_PROG(hepmcconfig, HepMC3-config, no, ${with_hepmc}/bin)
 fi
 
 if test "${hepmcconfig}" = "no"; then
    AC_MSG_CHECKING([for HepMC3 or newer])
    AC_MSG_RESULT(no);
    $2
 else
 
    dnl now see if HepMC is functional
    save_CXXFLAGS="$CXXFLAGS"
    save_LIBS="$LIBS"
 
    CXXFLAGS="${CXXFLAGS} --std=c++11 `${hepmcconfig} --cxxflags`"
    LIBS="${LIBS} `${hepmcconfig} --libs`"
 
    AC_MSG_CHECKING([if HepMC is functional])
    AC_LANG_PUSH(C++)
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <HepMC3/GenEvent.h>
    ]], [[
 using namespace HepMC3; GenEvent evt(Units::GEV,Units::MM);
    ]])], [hepmcok='yes'], [hepmcok='no'])
    AC_MSG_RESULT([$hepmcok])
    AC_LANG_POP()
    CXXFLAGS="$save_CXXFLAGS"
    LIBS="$save_LIBS"
 
    AC_MSG_CHECKING(HepMC3)
    if test "${hepmcok}" = "yes"; then
       HEPMC_INCLUDES="--std=c++11 `${hepmcconfig} --cxxflags`"
       LDFLAGS_HEPMC="-Wl,-rpath,`${hepmcconfig} --libdir` `${hepmcconfig} --libs`"
       AC_MSG_RESULT(yes)
       $1
    else
       AC_MSG_RESULT(no)
       $2
    fi
 fi
 ])
 
 dnl CHECK HEPMC3 END