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 | |
| parent | a69edb8adff6683988ee0b19179dd85c1c35edf0 (diff) | |
| download | emacs-6b0f7311f16646e0de2045b2410e20921901c616.tar.gz | |
configure.in: Don't enable ImageMagick unless HAVE_X11.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | configure | 14 | ||||
| -rw-r--r-- | configure.in | 24 |
3 files changed, 25 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog index f1176340f62..0778d0a7b09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/configure b/configure index 8c77569c485..2ee3423df4c 100755 --- a/configure +++ b/configure @@ -8639,8 +8639,9 @@ $as_echo "#define HAVE_RSVG 1" >>confdefs.h 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 @@ $as_echo "no" >&6; } - 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 @@ _ACEOF fi done + fi fi fi 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 |