Merge branch 'v4.9.0-wellspring.wif' into v4.9.0-release.wif

Unidata · Jun 10, 2022 · 0e28b37 · 0e28b37
2 parents dad8007 + 23e207a
commit 0e28b37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1119,8 +1119,8 @@ ELSE()
 ENDIF()
 
 # If user wants, then install selected plugins (default on)
-SET(PLUGIN_INSTALL_DIR "YES" CACHE STRING "Whether and where we should install plugins; defaults to yes")
-SET(ENABLE_PLUGIN_INSTALL YES)
+SET(PLUGIN_INSTALL_DIR "NO" CACHE STRING "Whether and where we should install plugins; defaults to yes")
+SET(ENABLE_PLUGIN_INSTALL NO)
 IF(DEFINED PLUGIN_INSTALL_DIR) #OR DEFINED CACHE{PLUGIN_INSTALL_DIR}
  STRING(TOLOWER "${PLUGIN_INSTALL_DIR}" LCPID)
  IF(LCPID STREQUAL "no")

diff --git a/configure.ac b/configure.ac
@@ -1896,7 +1896,7 @@ AC_SUBST(STD_FILTERS,[$std_filters])
 AC_MSG_CHECKING([whether and where we should install plugins])
 AC_ARG_WITH([plugin-dir], [AS_HELP_STRING([--with-plugin-dir=<absolute directory>|no|--without-plugin-dir],
  [Install selected standard filters in specified or default directory])],
- [],[with_plugin_dir=yes])
+ [],[with_plugin_dir=no])
 AC_MSG_RESULT([$with_plugin_dir])
 if test "x$with_plugin_dir" = xno ; then # option missing|disabled
  with_plugin_dir=no