From a4a77adadb6d17924962c260576791d759261175 Mon Sep 17 00:00:00 2001
From: Phil Carns <carns@mcs.anl.gov>
Date: Mon, 30 Jan 2017 06:52:10 -0600
Subject: [PATCH] fix bug in ld option substitution

---
 darshan-runtime/configure                             | 6 +++---
 darshan-runtime/configure.in                          | 4 ++--
 darshan-runtime/share/ld-opts/darshan-base-ld-opts.in | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/darshan-runtime/configure b/darshan-runtime/configure
index 12cc3b7..1d12fc4 100755
--- a/darshan-runtime/configure
+++ b/darshan-runtime/configure
@@ -1343,7 +1343,7 @@ Optional Features:
   --enable-HDF5-post-1.10
                           Enable HDF5 module for HDF5 version 1.10 or later
   --enable-HDF5-pre-1.10
-                          Enable HDF5 module for HDF5 version 1.8 or earlier
+                          Enable HDF5 module for HDF5 versions earlier than 1.10
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -4217,7 +4217,7 @@ $as_echo "#define __DARSHAN_ENABLE_HDF5110 1" >>confdefs.h
         as_fn_error $? "Cannot set both --enable-HDF5-post-1.10 and --enable-HDF5-pre-1.10" "$LINENO" 5
     fi
     BUILD_HDF5_MODULE=1
-    DARSHAN_HDF5_LD_OPTS="${darshan_share_path}/ld-opts/darshan-hdf5-ld-opts"
+    DARSHAN_HDF5_LD_OPTS="@${darshan_share_path}/ld-opts/darshan-hdf5-ld-opts"
 fi
 
 fi
@@ -4229,7 +4229,7 @@ if test "${enable_HDF5_pre_1_10+set}" = set; then :
         as_fn_error $? "Cannot set both --enable-HDF5-post-1.10 and --enable-HDF5-pre-1.10" "$LINENO" 5
     fi
     BUILD_HDF5_MODULE=1
-    DARSHAN_HDF5_LD_OPTS="${darshan_share_path}/ld-opts/darshan-hdf5-ld-opts"
+    DARSHAN_HDF5_LD_OPTS="@${darshan_share_path}/ld-opts/darshan-hdf5-ld-opts"
 fi
 
 fi
diff --git a/darshan-runtime/configure.in b/darshan-runtime/configure.in
index 3725659..11a8df9 100644
--- a/darshan-runtime/configure.in
+++ b/darshan-runtime/configure.in
@@ -268,7 +268,7 @@ AC_ARG_ENABLE(HDF5-post-1.10,
         AC_MSG_ERROR([Cannot set both --enable-HDF5-post-1.10 and --enable-HDF5-pre-1.10])
     fi
     BUILD_HDF5_MODULE=1
-    DARSHAN_HDF5_LD_OPTS="${darshan_share_path}/ld-opts/darshan-hdf5-ld-opts"
+    DARSHAN_HDF5_LD_OPTS="@${darshan_share_path}/ld-opts/darshan-hdf5-ld-opts"
 fi]
 ,)
 AC_ARG_ENABLE(HDF5-pre-1.10,
@@ -279,7 +279,7 @@ AC_ARG_ENABLE(HDF5-pre-1.10,
         AC_MSG_ERROR([Cannot set both --enable-HDF5-post-1.10 and --enable-HDF5-pre-1.10])
     fi
     BUILD_HDF5_MODULE=1
-    DARSHAN_HDF5_LD_OPTS="${darshan_share_path}/ld-opts/darshan-hdf5-ld-opts"
+    DARSHAN_HDF5_LD_OPTS="@${darshan_share_path}/ld-opts/darshan-hdf5-ld-opts"
 fi]
 ,)
 
diff --git a/darshan-runtime/share/ld-opts/darshan-base-ld-opts.in b/darshan-runtime/share/ld-opts/darshan-base-ld-opts.in
index ee6eb37..e94e87e 100644
--- a/darshan-runtime/share/ld-opts/darshan-base-ld-opts.in
+++ b/darshan-runtime/share/ld-opts/darshan-base-ld-opts.in
@@ -3,4 +3,4 @@
 @@darshan_share_path@/ld-opts/darshan-posix-ld-opts
 @@darshan_share_path@/ld-opts/darshan-pnetcdf-ld-opts
 @@darshan_share_path@/ld-opts/darshan-stdio-ld-opts
-@@DARSHAN_HDF5_LD_OPTS@
+@DARSHAN_HDF5_LD_OPTS@
-- 
2.26.2