Skip to content

Commit 4aaf312

Browse files
authored
Merge pull request #2973 from edwardhartnett/ejh_fix_configure
fixed --with-plugin-dir option to match cmake behavior
2 parents 0244e3c + 3bb9aaf commit 4aaf312

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

configure.ac

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2092,11 +2092,20 @@ fi
20922092

20932093
AC_SUBST(STD_FILTERS,[$std_filters])
20942094

2095-
# If user wants, then install selected standard filters
2095+
# The --with-plugin-dir gives the user control of the plugin
2096+
# directory. If set to 'yes' (the default), then first directory in
2097+
# the HDF5_PLUGIN_PATH, or /usr/local/hdf5/lib/plugin (the default
2098+
# HDF5 plugin dir) will be used. If another directory is provided, it
2099+
# will be used. If 'no', then plugins will not be installed.
20962100
AC_MSG_CHECKING([whether and where we should install plugins])
2097-
AC_ARG_WITH([plugin-dir], [AS_HELP_STRING([--with-plugin-dir=<absolute directory>|no|--without-plugin-dir],
2101+
AC_ARG_WITH([plugin-dir], [AS_HELP_STRING([--with-plugin-dir=<absolute directory>|yes|no|--without-plugin-dir],
20982102
[Install selected standard filters in specified or default directory])],
20992103
[],[with_plugin_dir=no])
2104+
if test "x$have_zstd" = xyes; then
2105+
if test "x$with_plugin_dir" = xno; then
2106+
with_plugin_dir=yes
2107+
fi
2108+
fi
21002109
AC_MSG_RESULT([$with_plugin_dir])
21012110
if test "x$with_plugin_dir" = xno ; then # option missing|disabled
21022111
with_plugin_dir=no

0 commit comments

Comments
 (0)