...

diff --git a/MagickCore/token.c b/MagickCore/token.c
index cb554498533dcf70010e93cde89d66ebd0ad98fb..48ee8f61ce7d058ced776787ca33d8357739fd3b 100644 (file)
--- a/MagickCore/token.c
+++ b/MagickCore/token.c
@@ -501,38 +501,37 @@ MagickExport MagickBooleanType GlobExpression(const char *expression,
               done=MagickTrue;
               break;
             }
-          else
-            if (match != MagickFalse)
+          if (match != MagickFalse)
+            {
+              expression=p;
+              while ((GetUTFCode(pattern) != '}') &&
+                     (GetUTFCode(pattern) != 0))
               {
-                expression=p;
-                while ((GetUTFCode(pattern) != '}') &&
-                       (GetUTFCode(pattern) != 0))
-                {
-                  pattern+=GetUTFOctets(pattern);
-                  if (GetUTFCode(pattern) == '\\')
-                    {
+                pattern+=GetUTFOctets(pattern);
+                if (GetUTFCode(pattern) == '\\')
+                  {
+                    pattern+=GetUTFOctets(pattern);
+                    if (GetUTFCode(pattern) == '}')
                       pattern+=GetUTFOctets(pattern);
-                      if (GetUTFCode(pattern) == '}')
-                        pattern+=GetUTFOctets(pattern);
-                    }
-                }
+                  }
               }
-            else
+            }
+          else
+            {
+              while ((GetUTFCode(pattern) != '}') &&
+                     (GetUTFCode(pattern) != ',') &&
+                     (GetUTFCode(pattern) != 0))
               {
-                while ((GetUTFCode(pattern) != '}') &&
-                       (GetUTFCode(pattern) != ',') &&
-                       (GetUTFCode(pattern) != 0))
-                {
-                  pattern+=GetUTFOctets(pattern);
-                  if (GetUTFCode(pattern) == '\\')
-                    {
+                pattern+=GetUTFOctets(pattern);
+                if (GetUTFCode(pattern) == '\\')
+                  {
+                    pattern+=GetUTFOctets(pattern);
+                    if ((GetUTFCode(pattern) == '}') ||
+                        (GetUTFCode(pattern) == ','))
                       pattern+=GetUTFOctets(pattern);
-                      if ((GetUTFCode(pattern) == '}') ||
-                          (GetUTFCode(pattern) == ','))
-                        pattern+=GetUTFOctets(pattern);
-                    }
-                }
+                  }
               }
+            }
             if (GetUTFCode(pattern) != 0)
               pattern+=GetUTFOctets(pattern);
           }

diff --git a/configure b/configure
index e3cefc3256453f8a79592a2c2021384483e3ad2f..b9327da4edeca79a4ec6ceace1950e6758ffc034 100755 (executable)
--- a/configure
+++ b/configure
@@ -4517,7 +4517,7 @@ MAGICK_PATCHLEVEL_VERSION=8
 
 MAGICK_VERSION=7.0.2-8
 
-MAGICK_GIT_REVISION=18674:d67c907:20160806
+MAGICK_GIT_REVISION=18675:c1c7fb4:20160807
 
 
 # Substitute library versioning
@@ -28894,6 +28894,51 @@ fi
 
       fi
     fi
+    # Clang (passes for GCC but uses different OpenMP implementation)
+    if test "x$LIB_OMP" = x ; then
+      if $CC --version 2>&1 | grep clang > /dev/null ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOMP_parallel_start in -lomp" >&5
+$as_echo_n "checking for GOMP_parallel_start in -lomp... " >&6; }
+if ${ac_cv_lib_omp_GOMP_parallel_start+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lomp  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char GOMP_parallel_start ();
+int
+main ()
+{
+return GOMP_parallel_start ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_omp_GOMP_parallel_start=yes
+else
+  ac_cv_lib_omp_GOMP_parallel_start=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_omp_GOMP_parallel_start" >&5
+$as_echo "$ac_cv_lib_omp_GOMP_parallel_start" >&6; }
+if test "x$ac_cv_lib_omp_GOMP_parallel_start" = xyes; then :
+  LIB_OMP="-lomp"
+fi
+
+      fi
+    fi
     # GCC
     if test "x$GOMP_LIBS" = x ; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOMP_parallel_start in -lgomp" >&5

diff --git a/configure.ac b/configure.ac
index 3c3a2288c488d099b5d1c80c8236e01de6ad2b4d..3fb79c88c0c7c2db978594c3b33df617c4dc062a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1409,6 +1409,12 @@ if test "$enable_openmp" != 'no'; then
         AC_CHECK_LIB(openmp,omp_get_num_procs,GOMP_LIBS="-lopenmp",,)
       fi
     fi
+    # Clang (passes for GCC but uses different OpenMP implementation)
+    if test "x$LIB_OMP" = x ; then
+      if $CC --version 2>&1 | grep clang > /dev/null ; then
+        AC_CHECK_LIB(omp,GOMP_parallel_start,LIB_OMP="-lomp",,)
+      fi
+    fi
     # GCC
     if test "x$GOMP_LIBS" = x ; then
       AC_CHECK_LIB(gomp,GOMP_parallel_start,GOMP_LIBS="-lgomp",,)