Mercurial > emacs
comparison configure.in @ 110001:87dd0fd298be
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 22 Aug 2010 22:56:05 +0000 |
parents | fd080c6fcd86 |
children | 16358be4a799 |
comparison
equal
deleted
inserted
replaced
110000:757182d1d4cb | 110001:87dd0fd298be |
---|---|
1850 AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Define to 1 if using imagemagick.]) | 1850 AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Define to 1 if using imagemagick.]) |
1851 CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS" | 1851 CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS" |
1852 LIBS="$IMAGEMAGICK_LIBS $LIBS" | 1852 LIBS="$IMAGEMAGICK_LIBS $LIBS" |
1853 fi | 1853 fi |
1854 | 1854 |
1855 AC_DEFINE(HAVE_MAGICKEXPORTIMAGEPIXELS, 1, [Define to 1 if MagickExportImagePixels is defined.]) | 1855 AC_DEFINE(HAVE_MAGICKEXPORTIMAGEPIXELS, 0, [Define to 1 if MagickExportImagePixels is defined.]) |
1856 AC_CHECK_FUNCS_ONCE(MagickExportImagePixels) | 1856 AC_CHECK_FUNCS_ONCE(MagickExportImagePixels) |
1857 | 1857 |
1858 fi | 1858 fi |
1859 | 1859 |
1860 | 1860 |