diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5680b14eac5d298a29fd97729b9596aee144a75..3c8371ac10c9b956365714616c373c6052d77eb6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -545,9 +545,6 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
   endif(HAVE_OCC)
 endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
 
-set(HAVE_NO_DLL TRUE)
-list(APPEND CONFIG_OPTIONS "NoDll")
-
 include(CheckFunctionExists)
 check_function_exists(vsnprintf HAVE_VSNPRINTF)
 if(NOT HAVE_VSNPRINTF)
diff --git a/Common/GmshConfig.h.in b/Common/GmshConfig.h.in
index 14df86efd54cf33e54f270625df0f4458f24036d..065909fc38c3e14e4e9a3320c63ae4384b5caf93 100644
--- a/Common/GmshConfig.h.in
+++ b/Common/GmshConfig.h.in
@@ -27,7 +27,6 @@
 #cmakedefine HAVE_MPI
 #cmakedefine HAVE_NATIVE_FILE_CHOOSER
 #cmakedefine HAVE_NETGEN
-#cmakedefine HAVE_NO_DLL
 #cmakedefine HAVE_NO_PARSER
 #cmakedefine HAVE_NO_POST
 #cmakedefine HAVE_NO_SOCKLEN_T
diff --git a/Plugin/PluginManager.cpp b/Plugin/PluginManager.cpp
index 5ba35b715571f44ed93d8a4736407a078a2b8357..04be048ba2579cfc7e5ebc0abc730494e49d2678 100644
--- a/Plugin/PluginManager.cpp
+++ b/Plugin/PluginManager.cpp
@@ -46,7 +46,10 @@
 #include "FiniteElement.h"
 #include "HomologyComputation.h"
 
-#if !defined(HAVE_NO_DLL)
+// for testing purposes only :-)
+#undef HAVE_DLOPEN
+
+#if defined(HAVE_DLOPEN)
 #include <dlfcn.h>
 #endif
 
@@ -241,7 +244,7 @@ void PluginManager::registerDefaultPlugins()
 
 void PluginManager::addPlugin(std::string fileName)
 {
-#if defined(HAVE_NO_DLL) || !defined(HAVE_FLTK)
+#if !defined(HAVE_DLOPEN) || !defined(HAVE_FLTK)
   Msg::Warning("No dynamic plugin loading on this platform");
 #else
   Msg::Info("Opening Plugin '%s'", fileName.c_str());