diff --git a/configure b/configure
index 05484ca..d7e93aa 100755
--- a/configure
+++ b/configure
@@ -8505,12 +8505,11 @@
CFLAGS="$OPENMP_CFLAGS $CFLAGS"
MAGICK_PCFLAGS="$MAGICK_PCFLAGS $OPENMP_CFLAGS"
-case $ac_cv_prog_c_openmp in #(
- "none needed" | unsupported)
- ;; #(
- *)
- MAGICK_FEATURES="OpenMP $MAGICK_FEATURES"
-esac
+if test "$enable_openmp" != no; then
+ if test "$ac_cv_prog_c_openmp" != 'unsupported'; then
+ MAGICK_FEATURES="OpenMP $MAGICK_FEATURES"
+ fi
+fi
# Enable support for OpenCL
@@ -9113,8 +9112,10 @@
CFLAGS="$CL_CFLAGS $CFLAGS"
LIBS="$CL_LIBS $LIBS"
-if test "_OPENCL" = '1'; then
- MAGICK_FEATURES="OpenCL $MAGICK_FEATURES"
+if test "$enable_opencl" != no; then
+ if test "_OPENCL" = '1'; then
+ MAGICK_FEATURES="OpenCL $MAGICK_FEATURES"
+ fi
fi
########