Commit a4a77ada authored by Philip Carns's avatar Philip Carns

fix bug in ld option substitution

parent 7b72260d
...@@ -1343,7 +1343,7 @@ Optional Features: ...@@ -1343,7 +1343,7 @@ Optional Features:
--enable-HDF5-post-1.10 --enable-HDF5-post-1.10
Enable HDF5 module for HDF5 version 1.10 or later Enable HDF5 module for HDF5 version 1.10 or later
--enable-HDF5-pre-1.10 --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: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
...@@ -4217,7 +4217,7 @@ $as_echo "#define __DARSHAN_ENABLE_HDF5110 1" >>confdefs.h ...@@ -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 as_fn_error $? "Cannot set both --enable-HDF5-post-1.10 and --enable-HDF5-pre-1.10" "$LINENO" 5
fi fi
BUILD_HDF5_MODULE=1 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
fi fi
...@@ -4229,7 +4229,7 @@ if test "${enable_HDF5_pre_1_10+set}" = set; then : ...@@ -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 as_fn_error $? "Cannot set both --enable-HDF5-post-1.10 and --enable-HDF5-pre-1.10" "$LINENO" 5
fi fi
BUILD_HDF5_MODULE=1 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
fi fi
......
...@@ -268,7 +268,7 @@ AC_ARG_ENABLE(HDF5-post-1.10, ...@@ -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]) AC_MSG_ERROR([Cannot set both --enable-HDF5-post-1.10 and --enable-HDF5-pre-1.10])
fi fi
BUILD_HDF5_MODULE=1 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]
,) ,)
AC_ARG_ENABLE(HDF5-pre-1.10, AC_ARG_ENABLE(HDF5-pre-1.10,
...@@ -279,7 +279,7 @@ 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]) AC_MSG_ERROR([Cannot set both --enable-HDF5-post-1.10 and --enable-HDF5-pre-1.10])
fi fi
BUILD_HDF5_MODULE=1 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]
,) ,)
......
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
@@darshan_share_path@/ld-opts/darshan-posix-ld-opts @@darshan_share_path@/ld-opts/darshan-posix-ld-opts
@@darshan_share_path@/ld-opts/darshan-pnetcdf-ld-opts @@darshan_share_path@/ld-opts/darshan-pnetcdf-ld-opts
@@darshan_share_path@/ld-opts/darshan-stdio-ld-opts @@darshan_share_path@/ld-opts/darshan-stdio-ld-opts
@@DARSHAN_HDF5_LD_OPTS@ @DARSHAN_HDF5_LD_OPTS@
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment