Commit 6b0f7311 authored by Romain Francoise's avatar Romain Francoise

configure.in: Don't enable ImageMagick unless HAVE_X11.

parent a69edb8a
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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment