[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 1ac8c9b: Port './configure CC=clang' to Fedora 25
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 1ac8c9b: Port './configure CC=clang' to Fedora 25 |
Date: |
Thu, 15 Jun 2017 14:25:55 -0400 (EDT) |
branch: master
commit 1ac8c9bb9b6ba44585ed68b03ebbce659a777041
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Port './configure CC=clang' to Fedora 25
* configure.ac (HAVE_IMAGEMAGICK): Disable if even a
standard function like MagickRelinquishMemory does not link.
---
configure.ac | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 164454d..459e314 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2501,19 +2501,31 @@ if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" =
"yes" || test "${HAVE_W32}"
## 6.8.2 makes Emacs crash; see Bug#13867.
IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2"
EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE])
- AC_SUBST(IMAGEMAGICK_CFLAGS)
- AC_SUBST(IMAGEMAGICK_LIBS)
if test $HAVE_IMAGEMAGICK = yes; then
- AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Define to 1 if using imagemagick.])
OLD_CFLAGS=$CFLAGS
OLD_LIBS=$LIBS
CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS"
LIBS="$IMAGEMAGICK_LIBS $LIBS"
- AC_CHECK_FUNCS(MagickExportImagePixels MagickMergeImageLayers
MagickAutoOrientImage)
+ AC_CHECK_FUNCS([MagickRelinquishMemory MagickExportImagePixels \
+ MagickMergeImageLayers MagickAutoOrientImage])
CFLAGS=$OLD_CFLAGS
LIBS=$OLD_LIBS
+ # Check that ImageMagick links. It does not link on Fedora 25
+ # with './configure CC=clang', as pkg-config outputs flags like
+ # -lomp that work for GCC but not Clang.
+ if test "$ac_cv_func_MagickRelinquishMemory" != yes; then
+ HAVE_IMAGEMAGICK=no
+ fi
+ fi
+ if test $HAVE_IMAGEMAGICK = yes; then
+ AC_DEFINE([HAVE_IMAGEMAGICK], 1, [Define to 1 if using ImageMagick.])
+ else
+ IMAGEMAGICK_CFLAGS=
+ IMAGEMAGICK_LIBS=
fi
+ AC_SUBST([IMAGEMAGICK_CFLAGS])
+ AC_SUBST([IMAGEMAGICK_LIBS])
fi
fi
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 1ac8c9b: Port './configure CC=clang' to Fedora 25,
Paul Eggert <=