AC_PREREQ(2.64)
-m4_define([magick_major_version], [6])
-m4_define([magick_minor_version], [6])
-m4_define([magick_micro_version], [9])
+m4_define([magick_major_version], [7])
+m4_define([magick_minor_version], [0])
+m4_define([magick_micro_version], [0])
m4_define([magick_version],
[magick_major_version.magick_minor_version.magick_micro_version])
m4_define([magick_svn_revision], esyscmd([sh -c "svnversion | sed -r 's/([0-9]+).*/\1/'"]))
AC_INIT([ImageMagick],[magick_version],[http://www.imagemagick.org],[ImageMagick-magick_version])
-AC_CONFIG_SRCDIR([magick/MagickCore.h])
+AC_CONFIG_SRCDIR([MagickCore/MagickCore.h])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_LIBOBJ_DIR([ltdl])
AC_CONFIG_HEADERS([config/config.h])
-AX_PREFIX_CONFIG_H([magick/magick-config.h],[MagickCore])
+AX_PREFIX_CONFIG_H([MagickCore/magick-config.h],[MagickCore])
AC_CONFIG_FILES([\
config/configure.xml \
config/delegates.xml \
config/type.xml \
ImageMagick.spec \
Magick++/bin/Magick++-config \
- magick/ImageMagick.pc \
+ MagickCore/ImageMagick.pc \
Magick++/lib/ImageMagick++.pc \
Magick++/lib/Magick++.pc \
- magick/Magick-config \
- magick/MagickCore-config \
- magick/MagickCore.pc \
- magick/version.h \
+ MagickCore/MagickCore-config \
+ MagickCore/MagickCore.pc \
+ MagickCore/version.h \
Makefile \
magick.sh \
PerlMagick/Magick.pm \
utilities/mogrify.1 \
utilities/montage.1 \
utilities/stream.1 \
- wand/MagickWand-config \
- wand/MagickWand.pc \
- wand/Wand-config \
- wand/Wand.pc ])
+ MagickWand/MagickWand-config \
+ MagickWand/MagickWand.pc ])
#
# Save initial user-tunable values
AC_SUBST(PACKAGE_NAME)dnl
AC_SUBST(PACKAGE_VERSION)dnl
+AC_SUBST(PACKAGE_PERL_VERSION)dnl
AC_SUBST(PACKAGE_RELEASE)dnl
AC_SUBST(PACKAGE_CHANGE_DATE)dnl
AC_SUBST(PACKAGE_LIB_VERSION)dnl
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.
64 ) ;;
* ) AC_MSG_ERROR("Pixel quantum depth must have value of 8, 16, 32, or 64") ;;
esac
-if test "$enable_hdri" = 'yes'; then
- with_quantum_depth=16
-fi
QUANTUM_DEPTH="$with_quantum_depth"
AC_DEFINE_UNQUOTED(QUANTUM_DEPTH,$QUANTUM_DEPTH,[Number of bits in a pixel Quantum (8/16/32/64)])
AC_SUBST(QUANTUM_DEPTH)dnl
AC_HEADER_DIRENT
# Check additional headers
-AC_CHECK_HEADERS(arm/limits.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h OS.h process.h stdarg.h sys/ipc.h sys/resource.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h wchar.h)
+AC_CHECK_HEADERS(arm/limits.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h OS.h process.h stdarg.h sys/ipc.h sys/resource.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h wchar.h xlocale.h)
########
#
# Motorola and SPARC CPUs), define `WORDS_BIGENDIAN'.
AC_C_BIGENDIAN
-# Define mode_t to a suitable type, if standard headers do not define it.
+# Define to a suitable type, if standard headers do not define it.
+AC_TYPE_INT8_T
+AC_TYPE_INT16_T
+AC_TYPE_INT32_T
+AC_TYPE_INT64_T
+AC_TYPE_INTMAX_T
+AC_TYPE_INTPTR_T
+AC_TYPE_LONG_DOUBLE
+AC_TYPE_LONG_DOUBLE_WIDER
+AC_TYPE_LONG_LONG_INT
+AC_TYPE_MBSTATE_T
AC_TYPE_MODE_T
-
-# Define off_t to a suitable type, if standard headers do not define it.
AC_TYPE_OFF_T
-
-# Define pid_t to a suitable type, if standard headers do not define it.
AC_TYPE_PID_T
-
-# Define size_t to a suitable type, if standard headers do not define it.
AC_TYPE_SIZE_T
-
-# Define ssize_t to a suitable type, if standard headers do not define it.
AC_TYPE_SSIZE_T
-
-# If the C compiler supports a working long double type with more range
-# or precision than the double type, define HAVE_LONG_DOUBLE.
-AC_TYPE_LONG_DOUBLE_WIDER
+AC_TYPE_UID_T
+AC_TYPE_UINT8_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINT64_T
+AC_TYPE_UINTMAX_T
+AC_TYPE_UINTPTR_T
+AC_TYPE_UNSIGNED_LONG_LONG_INT
# If the C type char is unsigned, define __CHAR_UNSIGNED__, unless the
# C compiler predefines it.
LIBS="$MATH_LIBS $LIBS"
AC_SUBST(MATH_LIBS)
-AC_CHECK_FUNCS([atoll atexit cabs carg cimag creal clock ctime_r directio _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink readdir_r realpath select seekdir setlocale sqrt setvbuf stat strchr strerror_r strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr usleep utime vsprintf vsnprintf waitpid _wfopen _wstat])
+AC_CHECK_FUNCS([acosh asinh atanh atoll atexit cabs carg cimag creal clock ctime_r directio _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink readdir_r realpath select seekdir setlocale sqrt setvbuf stat strchr strerror_r strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat])
#
# Check for clock_gettime().
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'
libtool_objdir=$objdir
# Linker search path to library, followed by -lMagickCore
- MAGICKCORE_PATH="${builddir}/magick/${libtool_objdir}"
+ MAGICKCORE_PATH="${builddir}/MagickCore/${libtool_objdir}"
fi
AC_SUBST(MAGICKCORE_PATH)
# Set configured scripts to executable.
AC_CONFIG_COMMANDS([default],[],[])
-AC_CONFIG_COMMANDS([MagickCore-config.in],[chmod +x magick/MagickCore-config])
-AC_CONFIG_COMMANDS([Magick-config.in],[chmod +x magick/Magick-config])
-AC_CONFIG_COMMANDS([MagickWand-config.in],[chmod +x wand/MagickWand-config])
-AC_CONFIG_COMMANDS([Wand-config.in],[chmod +x wand/Wand-config])
+AC_CONFIG_COMMANDS([MagickCore-config.in],[chmod +x MagickCore/MagickCore-config])
+AC_CONFIG_COMMANDS([MagickWand-config.in],[chmod +x MagickWand/MagickWand-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