Mercurial > emacs

comparison configure.in @ 110654:d631a67d1138

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 6c91e3062488
children 55c8c3ca3d48
comparison
equal deleted inserted replaced
110653:face715f995c 110654:d631a67d1138
1838 fi 1838 fi
1839 fi 1839 fi
1840 fi 1840 fi
1841 1841
1842 HAVE_IMAGEMAGICK=no 1842 HAVE_IMAGEMAGICK=no
1843 if test "${with_imagemagick}" != "no"; then 1843 if test "${HAVE_X11}" = "yes"; then
1844 IMAGEMAGICK_MODULE="Wand" 1844 if test "${with_imagemagick}" != "no"; then
1845 PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, HAVE_IMAGEMAGICK=yes, :) 1845 IMAGEMAGICK_MODULE="Wand"
1846 AC_SUBST(IMAGEMAGICK_CFLAGS) 1846 PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, HAVE_IMAGEMAGICK=yes, :)
1847 AC_SUBST(IMAGEMAGICK_LIBS) 1847 AC_SUBST(IMAGEMAGICK_CFLAGS)
1848 1848 AC_SUBST(IMAGEMAGICK_LIBS)
1849 if test $HAVE_IMAGEMAGICK = yes; then 1849
1850 AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Define to 1 if using imagemagick.]) 1850 if test $HAVE_IMAGEMAGICK = yes; then
1851 CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS" 1851 AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Define to 1 if using imagemagick.])
1852 LIBS="$IMAGEMAGICK_LIBS $LIBS" 1852 CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS"
1853 AC_CHECK_FUNCS(MagickExportImagePixels) 1853 LIBS="$IMAGEMAGICK_LIBS $LIBS"
1854 AC_CHECK_FUNCS(MagickExportImagePixels)
1855 fi
1854 fi 1856 fi
1855 fi 1857 fi
1856 1858
1857 1859
1858 HAVE_GTK=no 1860 HAVE_GTK=no