[Darshan-commits] [Git][darshan/darshan][master] fix bug in ld option substitution

[Philip Carns]

Philip Carns pushed to branch master at darshan / darshan


Commits:
a4a77ada by Phil Carns at 2017-01-30T06:52:10-06:00
fix bug in ld option substitution

- - - - -


3 changed files:

- darshan-runtime/configure
- darshan-runtime/configure.in
- darshan-runtime/share/ld-opts/darshan-base-ld-opts.in


Changes:

=====================================
darshan-runtime/configure
=====================================
--- 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


=====================================
darshan-runtime/configure.in
=====================================
--- 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]
 ,)
 


=====================================
darshan-runtime/share/ld-opts/darshan-base-ld-opts.in
=====================================
--- 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@
+ at DARSHAN_HDF5_LD_OPTS@



View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/commit/a4a77adadb6d17924962c260576791d759261175
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/darshan-commits/attachments/20170130/6292bbb5/attachment-0001.html>