[Emacs-diffs] /srv/bzr/emacs/trunk r101682: configure.in: Don't enable ImageMagick unless HAVE_X11.

[Romain Francoise]

------------------------------------------------------------
revno: 101682
committer: Romain Francoise <address@hidden>
branch nick: trunk
timestamp: Wed 2010-09-29 20:52:34 +0200
message:
  configure.in: Don't enable ImageMagick unless HAVE_X11.
modified:
  ChangeLog
  configure
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-09-28 02:22:37 +0000
+++ b/ChangeLog 2010-09-29 18:52:34 +0000
@@ -1,3 +1,7 @@
+2010-09-29  Romain Francoise  <address@hidden>
+
+       * configure.in: Don't enable ImageMagick unless HAVE_X11.
+
 2010-09-28  Glenn Morris  <address@hidden>
 
        * configure.in (HAVE_GNUTLS): Add a description to make autoheader

=== modified file 'configure'
--- a/configure 2010-09-27 20:53:35 +0000
+++ b/configure 2010-09-29 18:52:34 +0000
@@ -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
 

=== modified file 'configure.in'
--- a/configure.in      2010-09-28 02:22:37 +0000
+++ b/configure.in      2010-09-29 18:52:34 +0000
@@ -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