https://github.com/ImageMagick/ImageMagick/pull/88
diff --git a/configure.ac b/configure.ac
old mode 100755
new mode 100644
index 5f9eb82..78da978
--- a/configure.ac
+++ b/configure.ac
@@ -1386,12 +1386,6 @@
GOMP_LIBS=''
if test "$enable_openmp" != 'no'; then
if test "${GCC}" = "yes"; then
- # Clang 3.8 and later defaults to the LLVM OpenMP implementation
- if test "x$GOMP_LIBS" = x ; then
- if $CC --version 2>&1 | grep clang > /dev/null ; then
- AC_CHECK_LIB(omp,omp_get_num_procs,GOMP_LIBS="-lomp",,)
- fi
- fi
# Open64 (passes for GCC but uses different OpenMP implementation)
if test "x$GOMP_LIBS" = x ; then
if $CC --version 2>&1 | grep Open64 > /dev/null ; then
@@ -2027,6 +2021,40 @@
dnl ===========================================================================
#
+# Check for the raqm delegate library.
+#
+AC_ARG_WITH([raqm],
+ [AC_HELP_STRING([--without-raqm],
+ [disable Raqm support])],
+ [with_raqm=$withval],
+ [with_raqm='yes'])
+
+if test "$with_raqm" != 'yes'; then
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-raqm=$with_raqm "
+fi
+
+have_raqm='no'
+RAQM_CFLAGS=""
+RAQM_LIBS=""
+RAQM_PKG=""
+if test "x$with_raqm" = "xyes"; then
+ AC_MSG_RESULT([-------------------------------------------------------------])
+ PKG_CHECK_MODULES(RAQM,[raqm], have_raqm=yes, have_raqm=no)
+ AC_MSG_RESULT([])
+fi
+
+if test "$have_raqm" = 'yes'; then
+ AC_DEFINE(RAQM_DELEGATE,1,Define if you have RAQM library)
+ CFLAGS="$RAQM_CFLAGS $CFLAGS"
+fi
+
+AM_CONDITIONAL(RAQM_DELEGATE, test "$have_raqm" = 'yes')
+AC_SUBST(RAQM_CFLAGS)
+AC_SUBST(RAQM_LIBS)
+
+dnl ===========================================================================
+
+#
# Check for Ghostscript library or framework.
#
# Test for iapi.h & test for gsapi_new_instance in -lgs
@@ -3594,6 +3622,9 @@
if test "$have_freetype" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES freetype"
fi
+if test "$have_raqm" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES raqm"
+fi
if test "$have_gslib" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES gslib"
fi
@@ -3712,9 +3743,9 @@
#
if test "$build_modules" != 'no'; then
- MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
+ MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
else
- MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
+ MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
fi
AC_SUBST(MAGICK_DEP_LIBS)
@@ -3851,6 +3882,7 @@
FlashPIX --with-fpx=$with_fpx $have_fpx
FontConfig --with-fontconfig=$with_fontconfig $have_fontconfig
FreeType --with-freetype=$with_freetype $have_freetype
+ Raqm --with-raqm=$with_raqm $have_raqm
Ghostscript lib --with-gslib=$with_gslib $have_gslib
Graphviz --with-gvc=$with_gvc $have_gvc
JBIG --with-jbig=$with_jbig $have_jbig