Mercurial > emacs
changeset 110654:d631a67d1138
configure.in: Don't enable ImageMagick unless HAVE_X11.
| author | Romain Francoise <romain@orebokech.com> |
|---|---|
| date | Wed, 29 Sep 2010 20:52:34 +0200 |
| parents | face715f995c |
| children | 63c8e1ad7b0f |
| files | ChangeLog configure configure.in |
| diffstat | 3 files changed, 25 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Sep 29 17:07:34 2010 +0200 +++ b/ChangeLog Wed Sep 29 20:52:34 2010 +0200 @@ -1,3 +1,7 @@ +2010-09-29 Romain Francoise <romain@orebokech.com> + + * configure.in: Don't enable ImageMagick unless HAVE_X11. + 2010-09-28 Glenn Morris <rgm@gnu.org> * configure.in (HAVE_GNUTLS): Add a description to make autoheader
--- a/configure Wed Sep 29 17:07:34 2010 +0200 +++ b/configure Wed Sep 29 20:52:34 2010 +0200 @@ -8639,8 +8639,9 @@ fi HAVE_IMAGEMAGICK=no -if test "${with_imagemagick}" != "no"; then - IMAGEMAGICK_MODULE="Wand" +if test "${HAVE_X11}" = "yes"; then + if test "${with_imagemagick}" != "no"; then + IMAGEMAGICK_MODULE="Wand" succeeded=no @@ -8738,13 +8739,13 @@ - if test $HAVE_IMAGEMAGICK = yes; then + if test $HAVE_IMAGEMAGICK = yes; then $as_echo "#define HAVE_IMAGEMAGICK 1" >>confdefs.h - CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS" - LIBS="$IMAGEMAGICK_LIBS $LIBS" - for ac_func in MagickExportImagePixels + CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS" + LIBS="$IMAGEMAGICK_LIBS $LIBS" + for ac_func in MagickExportImagePixels do : ac_fn_c_check_func "$LINENO" "MagickExportImagePixels" "ac_cv_func_MagickExportImagePixels" if test "x$ac_cv_func_MagickExportImagePixels" = x""yes; then : @@ -8755,6 +8756,7 @@ fi done + fi fi fi
--- a/configure.in Wed Sep 29 17:07:34 2010 +0200 +++ b/configure.in Wed Sep 29 20:52:34 2010 +0200 @@ -1840,17 +1840,19 @@ 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