LIBS="$CL_LIBS $LIBS"
AC_SUBST(CL_CFLAGS)
if test "$enable_opencl" != no; then
- if test "_OPENCL" = '1'; then
+ if test "X$ax_cv_check_cl_libcl" != Xno; then :
MAGICK_FEATURES="OpenCL $MAGICK_FEATURES"
fi
fi
AC_FUNC_FSEEKO
LFS_CPPFLAGS=''
if test "$enable_largefile" != no; then
- if test "$ac_cv_sys_file_offset_bits" != 'no'; then
- LFS_CPPFLAGS="$LFS_CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
- else
+ case $ac_cv_sys_file_offset_bits in
+ no)
+ # nothing to do here as the host supports LFS fine
+ ;;
+ unknown)
AC_MSG_CHECKING([for native large file support])
AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <unistd.h>
main () {
[ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])])
- fi
+ ;;
+ *)
+ LFS_CPPFLAGS="$LFS_CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
+ ;;
+ esac
if test "$ac_cv_sys_large_files" != 'no'; then
LFS_CPPFLAGS="$LFS_CPPFLAGS -D_LARGE_FILES=1"
fi
AC_DEFINE(CIPHER_SUPPORT,1,[permit enciphering and deciphering image pixels])
fi
-# Build an embeddable version of ImageMagick.
-AC_ARG_ENABLE([embeddable],
- [AC_HELP_STRING([--enable-embeddable],
+# Build a zero-configuration version of ImageMagick.
+AC_ARG_ENABLE([zero-configuration],
+ [AC_HELP_STRING([--enable-zero-configuration],
[enable self-contained, embeddable, zero-configuration ImageMagick])],
- [enable_embeddable=$enableval],
- [enable_embeddable='no'])
+ [enable_zero_configuration=$enableval],
+ [enable_zero_configuration='no'])
-if test "$enable_embeddable" = 'yes'; then
- AC_DEFINE(EMBEDDABLE_SUPPORT,1,[Build self-contained, embeddable, zero-configuration ImageMagick])
+if test "$enable_zero_configuration" = 'yes'; then
+ AC_DEFINE(ZERO_CONFIGURATION_SUPPORT,1,[Build self-contained, embeddable, zero-configuration ImageMagick])
+ MAGICK_FEATURES="Zero-Configuration $MAGICK_FEATURES"
fi
# Build a high dynamic range version of ImageMagick.
have_png='no'
PNG_LIBS=''
-if test "$with_png" != 'no'; then
- AC_MSG_RESULT([-------------------------------------------------------------])
- AC_MSG_CHECKING([for PNG])
- AC_MSG_RESULT([])
- failed=0
- passed=0
- AC_CHECK_HEADER(png.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
- AC_CHECK_LIB(png,png_get_io_ptr,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
- AC_MSG_CHECKING([if PNG package is complete])
- if test $passed -gt 0; then
- if test $failed -gt 0; then
- AC_MSG_RESULT([no -- some components failed test])
- have_png='no (failed tests)'
+
+if test "$with_png" != 'no' -a "$have_zlib" != 'no' ; then
+ AC_MSG_RESULT([-------------------------------------------------------------])
+ AC_MSG_CHECKING(for PNG support )
+ AC_MSG_RESULT()
+ failed=0
+ passed=0
+ AC_CHECK_HEADER(png.h,passed=`expr $passed + 1`,
+ failed=`expr $failed + 1`,)
+
+ if test $passed -gt 0; then
+ for var in 5 4 2 '' ; do
+ if test "$have_png" == 'no' ; then
+ if test "x${var}" == 'x' ; then
+ pnglib='png'
else
- PNG_LIBS='-lpng'
- LIBS="$PNG_LIBS $LIBS"
- AC_DEFINE(PNG_DELEGATE,1,Define if you have PNG library)
- AC_MSG_RESULT([yes])
- have_png='yes'
+ pnglib="png1${var}"
fi
- else
- AC_MSG_RESULT([no])
- fi
+
+# Test for compatible LIBPNG library
+ failed=0
+ passed=0
+ if test "$with_png" == 'yes' -o "$with_png" == "libpng1${var}" ; then
+ if test "${pnglib}" != 'png' ; then
+ AC_MSG_CHECKING(for LIBPNG1${var} support )
+ AC_TRY_COMPILE(
+#include <stdio.h>
+#include <stdlib.h>
+#include <png.h>
+,
+changequote(<<, >>)dnl
+<<
+#if PNG_LIBPNG_VER_MINOR != ${var}
+#error LIBPNG library must be version 1${var}!
+Kaboom, Kaboom
+#endif
+return 0;
+>>,
+ changequote([, ])dnl
+ ac_cv_libpng_ok='yes',
+ ac_cv_libpng_ok='no')
+ if test "$ac_cv_libpng_ok" = 'yes' ; then
+ passed=`expr $passed + 1`
+ AC_MSG_RESULT(yes)
+ else
+ failed=`expr $failed + 1`
+ AC_MSG_RESULT(no)
+ fi
+ else
+ passed=`expr $passed + 1`
+ AC_MSG_RESULT(yes)
+ fi
+ fi
+
+ if test $passed -gt 0 -a $failed -le 0; then
+ if test "1${var}" = '15' ; then
+ AC_CHECK_LIB(png15,png_get_io_ptr,passed=`expr $passed + 1`,
+ failed=`expr $failed + 1`,)
+ AC_CHECK_LIB(png15,png_longjmp,passed=`expr $passed + 1`,
+ failed=`expr $failed + 1`,)
+ fi
+ if test "1${var}" = '14' ; then
+ AC_CHECK_LIB(png14,png_get_io_ptr,passed=`expr $passed + 1`,
+ failed=`expr $failed + 1`,)
+ AC_CHECK_LIB(png14,png_get_io_state,passed=`expr $passed + 1`,
+ failed=`expr $failed + 1`,)
+ fi
+ if test "1${var}" = '12' ; then
+ AC_CHECK_LIB(png12,png_get_io_ptr,passed=`expr $passed + 1`,
+ failed=`expr $failed + 1`,)
+ fi
+ if test "1${var}" = '1' ; then
+ AC_CHECK_LIB(png,png_get_io_ptr,passed=`expr $passed + 1`,
+ failed=`expr $failed + 1`,)
+ fi
+ if test $passed -gt 0 -a $failed -le 0 ; then
+ AC_MSG_CHECKING(if ${pnglib} package is complete)
+ if test $passed -gt 0 ; then
+ if test $failed -gt 0 ; then
+ AC_MSG_RESULT(no -- some components failed test)
+ have_png='no (failed tests)'
+ else
+ PNG_LIBS="-l${pnglib}"
+ LIBS="$PNG_LIBS $LIBS"
+ AC_DEFINE(PNG_DELEGATE,1,Define if you have PNG library)
+ AC_MSG_RESULT(yes)
+ have_png='yes'
+ fi
+ fi
+ fi
+ fi
+ fi
+ done
+ fi
fi
+
AM_CONDITIONAL(PNG_DELEGATE,test "$have_png" = 'yes')
AC_SUBST(PNG_LIBS)
+
dnl ===========================================================================
#
PERSIST_LDFLAGS=$LDFLAGS
PERSIST_CPPFLAGS=$CPPFLAGS
xml2_config=''
- AC_CHECK_PROGS(xml2_config,xml2-config,)dnl
+ AC_PATH_PROG(xml2_config,xml2-config,)dnl
if test -n "$xml2_config"; then
# Debian installs libxml headers under /usr/include/libxml2/libxml with
# the shared library installed under /usr/lib, whereas the package
failed=0
passed=0
AC_CHECK_HEADER(libxml/parser.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
- AC_CHECK_LIB(xml2,xmlParseExternalEntity,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+ AC_CHECK_LIB(xml2,xmlSAXVersion,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+ AC_CHECK_LIB(xml2,xmlParseChunk,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+ AC_CHECK_LIB(xml2,xmlCreatePushParserCtxt,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
AC_MSG_CHECKING([if XML package is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
# GhostPCL related configuration.
#
PCLColorDevice=ppmraw
-PCLCMYKDevice=bmpsep8
+PCLCMYKDevice=pamcmyk32
PCLMonoDevice=pbmraw
if test -z "$PCLVersion"; then
PCLVersion='unknown'
# Set configured scripts to executable.
AC_CONFIG_COMMANDS([default],[],[])
AC_CONFIG_COMMANDS([MagickCore-config.in],[chmod +x MagickCore/MagickCore-config])
-AC_CONFIG_COMMANDS([Magick-config.in],[chmod +x MagickCore/Magick-config])
AC_CONFIG_COMMANDS([MagickWand-config.in],[chmod +x MagickWand/MagickWand-config])
-AC_CONFIG_COMMANDS([Wand-config.in],[chmod +x MagickWand/Wand-config])
AC_CONFIG_COMMANDS([Magick++-config.in],[chmod +x Magick++/bin/Magick++-config])
AC_CONFIG_COMMANDS([PerlMagick/check.sh.in],[chmod +x PerlMagick/check.sh])
projects / imagemagick / blobdiff