Commit 8a0b50ed authored by Andreas Schwab's avatar Andreas Schwab
Browse files

Fix configure checks

	* configure.in: Fix check for librsvg, imagemagick and
	MagickExportImagePixels.
parent 692f3ddc
2010-08-23 Andreas Schwab <schwab@linux-m68k.org>
* configure.in: Fix check for librsvg, imagemagick and
MagickExportImagePixels.
2010-08-18 Joakim Verona <joakim@verona.se>
* Makefile.in, configure.in: Checks for ImageMagick.
......
......@@ -2442,7 +2442,6 @@ fi
as_fn_append ac_header_list " stdlib.h"
as_fn_append ac_header_list " unistd.h"
as_fn_append ac_header_list " sys/param.h"
as_fn_append ac_func_list " MagickExportImagePixels"
as_fn_append ac_header_list " sys/time.h"
as_fn_append ac_func_list " alarm"
# Check that the precious variables saved in the cache have kept the same
......@@ -8597,7 +8596,7 @@ $as_echo "no" >&6; }
fi
if test $succeeded = yes; then
:
HAVE_RSVG=yes
else
:
fi
......@@ -8605,8 +8604,7 @@ $as_echo "no" >&6; }
if test ".${RSVG_CFLAGS}" != "."; then
HAVE_RSVG=yes
if test $HAVE_RSVG = yes; then
$as_echo "#define HAVE_RSVG 1" >>confdefs.h
......@@ -8708,7 +8706,7 @@ $as_echo "no" >&6; }
fi
if test $succeeded = yes; then
:
HAVE_IMAGEMAGICK=yes
else
:
fi
......@@ -8716,38 +8714,24 @@ $as_echo "no" >&6; }
if test ".${IMAGEMAGICK_CFLAGS}" != "."; then
HAVE_IMAGEMAGICK=yes
if test $HAVE_IMAGEMAGICK = yes; then
$as_echo "#define HAVE_IMAGEMAGICK 1" >>confdefs.h
CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS"
LIBS="$IMAGEMAGICK_LIBS $LIBS"
fi
$as_echo "#define HAVE_MAGICKEXPORTIMAGEPIXELS 0" >>confdefs.h
for ac_func in $ac_func_list
for ac_func in MagickExportImagePixels
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
eval as_val=\$$as_ac_var
if test "x$as_val" = x""yes; then :
ac_fn_c_check_func "$LINENO" "MagickExportImagePixels" "ac_cv_func_MagickExportImagePixels"
if test "x$ac_cv_func_MagickExportImagePixels" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
#define HAVE_MAGICKEXPORTIMAGEPIXELS 1
_ACEOF
fi
done
fi
fi
......@@ -11624,6 +11608,22 @@ done
for ac_func in $ac_func_list
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
eval as_val=\$$as_ac_var
if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5
$as_echo_n "checking for working mktime... " >&6; }
......
......@@ -1825,12 +1825,11 @@ if test "${HAVE_X11}" = "yes" || test "${NS_IMPL_GNUSTEP}" = "yes"; then
RSVG_REQUIRED=2.11.0
RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED"
PKG_CHECK_MODULES(RSVG, $RSVG_MODULE, :, :)
PKG_CHECK_MODULES(RSVG, $RSVG_MODULE, HAVE_RSVG=yes, :)
AC_SUBST(RSVG_CFLAGS)
AC_SUBST(RSVG_LIBS)
if test ".${RSVG_CFLAGS}" != "."; then
HAVE_RSVG=yes
if test $HAVE_RSVG = yes; then
AC_DEFINE(HAVE_RSVG, 1, [Define to 1 if using librsvg.])
CFLAGS="$CFLAGS $RSVG_CFLAGS"
LIBS="$RSVG_LIBS $LIBS"
......@@ -1841,20 +1840,16 @@ fi
HAVE_IMAGEMAGICK=no
if test "${with_imagemagick}" != "no"; then
IMAGEMAGICK_MODULE="Wand"
PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, :, :)
PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, HAVE_IMAGEMAGICK=yes, :)
AC_SUBST(IMAGEMAGICK_CFLAGS)
AC_SUBST(IMAGEMAGICK_LIBS)
if test ".${IMAGEMAGICK_CFLAGS}" != "."; then
HAVE_IMAGEMAGICK=yes
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
AC_DEFINE(HAVE_MAGICKEXPORTIMAGEPIXELS, 0, [Define to 1 if MagickExportImagePixels is defined.])
AC_CHECK_FUNCS_ONCE(MagickExportImagePixels)
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