diff options
| author | Lars Ingebrigtsen | 2019-09-24 19:01:51 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-09-24 19:01:51 +0200 |
| commit | 9a82195cfcafd3003fc971b71ab401b37ecc0930 (patch) | |
| tree | 14eb0d70b65e10c507b11a713e03704e0ea89b9e | |
| parent | 873cd63ff2a2fc738664065e84a997fe7b4e7051 (diff) | |
| download | emacs-9a82195cfcafd3003fc971b71ab401b37ecc0930.tar.gz emacs-9a82195cfcafd3003fc971b71ab401b37ecc0930.zip | |
Make --with-imagemagick bug out if there's no support for it
* configure.ac (HAVE_IMAGEMAGICK): Stop configuration if the user
has said --with-imagemagick, but there's no support for it
(bug#24455).
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index e822b0b7b0f..7435f2e8da3 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -2638,6 +2638,9 @@ if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${HAVE_W32}" | |||
| 2638 | if test $HAVE_IMAGEMAGICK = yes; then | 2638 | if test $HAVE_IMAGEMAGICK = yes; then |
| 2639 | AC_DEFINE([HAVE_IMAGEMAGICK], 1, [Define to 1 if using ImageMagick.]) | 2639 | AC_DEFINE([HAVE_IMAGEMAGICK], 1, [Define to 1 if using ImageMagick.]) |
| 2640 | else | 2640 | else |
| 2641 | if test "${with_imagemagick}" != "no"; then | ||
| 2642 | AC_MSG_ERROR([ImageMagick wanted, but it does not compile. Maybe some library files are missing?]); | ||
| 2643 | fi | ||
| 2641 | IMAGEMAGICK_CFLAGS= | 2644 | IMAGEMAGICK_CFLAGS= |
| 2642 | IMAGEMAGICK_LIBS= | 2645 | IMAGEMAGICK_LIBS= |
| 2643 | fi | 2646 | fi |