diff options
| author | Romain Francoise <romain@orebokech.com> | 2010-09-29 20:52:34 +0200 |
|---|---|---|
| committer | Romain Francoise <romain@orebokech.com> | 2010-09-29 20:52:34 +0200 |
| commit | 6b0f7311f16646e0de2045b2410e20921901c616 (patch) | |
| tree | bfc6ccbd544896ac8855c45da98a82ce74accd3e /configure.in | |
| parent | a69edb8adff6683988ee0b19179dd85c1c35edf0 (diff) | |
| download | emacs-6b0f7311f16646e0de2045b2410e20921901c616.tar.gz | |
configure.in: Don't enable ImageMagick unless HAVE_X11.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/configure.in b/configure.in index 24c47b70431..771ce78459b 100644 --- a/configure.in +++ b/configure.in @@ -1840,17 +1840,19 @@ if test "${HAVE_X11}" = "yes" || test "${NS_IMPL_GNUSTEP}" = "yes"; then fi HAVE_IMAGEMAGICK=no -if test "${with_imagemagick}" != "no"; then - IMAGEMAGICK_MODULE="Wand" - PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, HAVE_IMAGEMAGICK=yes, :) - 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.]) - CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS" - LIBS="$IMAGEMAGICK_LIBS $LIBS" - AC_CHECK_FUNCS(MagickExportImagePixels) +if test "${HAVE_X11}" = "yes"; then + if test "${with_imagemagick}" != "no"; then + IMAGEMAGICK_MODULE="Wand" + PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, HAVE_IMAGEMAGICK=yes, :) + 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.]) + CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS" + LIBS="$IMAGEMAGICK_LIBS $LIBS" + AC_CHECK_FUNCS(MagickExportImagePixels) + fi fi fi |