-# Copyright 1999-2010 ImageMagick Studio LLC, a non-profit organization
+# Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
# dedicated to making software imaging solutions freely available.
#
# You may not use this file except in compliance with the License. You may
#
# Copyright (C) 2003 - 2008 GraphicsMagick Group
-AC_PREREQ(2.63)
-AC_INIT([ImageMagick],[6.6.1],[http://www.imagemagick.org],[ImageMagick])
+AC_PREREQ(2.64)
+AC_INIT([ImageMagick],[6.6.6],[http://www.imagemagick.org],[ImageMagick])
AC_CONFIG_SRCDIR([magick/MagickCore.h])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_HOST
AC_CANONICAL_TARGET([])
+MAGICK_TARGET_CPU=$target_cpu
+AC_SUBST(MAGICK_TARGET_CPU)
+
+MAGICK_TARGET_VENDOR=$target_vendor
+AC_SUBST(MAGICK_TARGET_VENDOR)
+
+MAGICK_TARGET_OS=$target_os
+AC_SUBST(MAGICK_TARGET_OS)
+
# Substitute library versioning
AC_SUBST(MAGICK_LIBRARY_CURRENT)dnl
AC_SUBST(MAGICK_LIBRARY_REVISION)dnl
MAGICK_PCFLAGS=$CPPFLAGS_USER
MAGICK_LDFLAGS=''
MAGICK_LIBS=''
+MAGICK_FEATURES=''
#
# Evaluate shell variable equivalents to Makefile directory variables
AC_SUBST(LD)
AC_PROG_CC_C99
AM_PROG_CC_C_O
-AC_COMPILE_WARNINGS
-AC_INCLUDES_DEFAULT
+AX_CFLAGS_WARN_ALL
AC_PROG_INSTALL
AC_PROG_MAKE_SET
AC_PROG_LN_S
AM_WITH_DMALLOC
+AX_C___ATTRIBUTE__
PKG_PROG_PKG_CONFIG
#
#
AC_EXEEXT
AC_OBJEXT
+AX_LANG_COMPILER_MS
GDI32_LIBS=''
native_win32_build='no'
dnl Platform-specific stuff
case "$host" in
*darwin* | *-macos10*)
- if test -d /opt/local ; then
- CPPFLAGS="$CPPFLAGS -I/opt/local/include"
- LDFLAGS="$LDFLAGS -L/opt/local/lib"
- elif test -d /sw ; then
- CPPFLAGS="$CPPFLAGS -I/sw/include"
- LDFLAGS="$LDFLAGS -L/sw/lib"
- fi
dnl OS X universal binary support, requires --disable-dependency-tracking
AC_ARG_ENABLE([osx-universal-binary],
AC_HELP_STRING([--enable-osx-universal-binary],
# Enable support for threads
AC_ARG_WITH([threads],
- [AC_HELP_STRING([--without-threads],
- [disable threads support])],
+ [AC_HELP_STRING([--without-threads], [disable threads support])],
[with_threads=$withval],
[with_threads='yes'])
have_threads=no
if test "$with_threads" != 'no'; then
- ACX_PTHREAD()
- if test "$acx_pthread_ok" = yes; then
+ AX_PTHREAD()
+ if test "$ax_pthread_ok" = yes; then
have_threads=yes
DEF_THREAD="$PTHREAD_CFLAGS"
CFLAGS="$CFLAGS $DEF_THREAD"
AC_MSG_WARN([Replacing compiler $CC with compiler $PTHREAD_CC to support pthreads.])
CC="$PTHREAD_CC"
fi
+ AC_DEFINE(THREAD_SUPPORT,1,[Define if you have POSIX threads libraries and header files.])
fi
fi
CFLAGS="$OPENMP_CFLAGS $CFLAGS"
MAGICK_PCFLAGS="$MAGICK_PCFLAGS $OPENMP_CFLAGS"
AC_SUBST(OPENMP_CFLAGS)
+if test "$enable_openmp" != no; then
+ if test "$ac_cv_prog_c_openmp" != 'unsupported'; then
+ MAGICK_FEATURES="OpenMP $MAGICK_FEATURES"
+ fi
+fi
# Enable support for OpenCL
AX_OPENCL([C])
CFLAGS="$CL_CFLAGS $CFLAGS"
LIBS="$CL_LIBS $LIBS"
AC_SUBST(CL_CFLAGS)
+if test "$enable_opencl" != no; then
+ if test "_OPENCL" = '1'; then
+ MAGICK_FEATURES="OpenCL $MAGICK_FEATURES"
+ fi
+fi
########
#
fi
# Enable build using delegate libraries built in subdirectories rather than installed
-# delegate libraries (bzlib fftw fpx gslib jp2 jbig jpeg lcms png tiff ttf wmf xml zlib)
+# delegate libraries (bzlib fftw fpx gslib jp2 jbig jpeg lcms lzma png tiff ttf wmf xml zlib)
AC_ARG_ENABLE([delegate-build],
[AC_HELP_STRING([--enable-delegate-build],
[look for delegate libraries in build directory])],
if test "$enable_hdri" = 'yes'; then
MAGICK_HDRI="HDRI"
AC_DEFINE(HDRI_SUPPORT,1,[accurately represent the wide range of intensity levels in real scenes])
+ MAGICK_FEATURES="HDRI $MAGICK_FEATURES"
fi
AC_SUBST(MAGICK_HDRI)dnl
16 ) ;;
32 ) ;;
64 ) ;;
- * ) AC_MSG_ERROR("Pixel quantum depth must have value of 8, 16, or 32") ;;
+ * ) 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_HELP_STRING([--with-perl],
[enable build/install of PerlMagick])],
[with_perl=$withval],
- [with_perl=$libtool_build_shared_libs])
+ [with_perl='no'])
# Options to pass when configuring PerlMagick
AC_ARG_WITH([perl-options],
AC_HEADER_STAT
AC_HEADER_TIME
AC_STRUCT_TM
+AC_STRUCT_TIMEZONE
AC_SYS_INTERPRETER
# If the C compiler supports the keyword inline, do nothing. Otherwise
# Obtain size of size_t and define as SIZEOF_SIZE_T
AC_CHECK_SIZEOF(size_t)
+# Obtain size of ssize_t and define as SIZEOF_SSIZE_T
+AC_CHECK_SIZEOF(ssize_t)
+
# Obtain size of an unsigned int pointer and define as SIZEOF_UNSIGNED_INTP
AC_CHECK_SIZEOF(unsigned int*)
LIBS="$MATH_LIBS $LIBS"
AC_SUBST(MATH_LIBS)
-AC_CHECK_FUNCS([_exit atexit cimag clock directio execvp fchmod floor fork ftime ftruncate getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r j0 j1 localtime_r lstat memmove memset mkstemp munmap _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign pow pread pwrite raise rand_r readlink readdir_r realpath select seekdir setlocale sqrt setvbuf stat strchr strerror_r strrchr strcspn strdup strpbrk strspn strstr strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times usleep utime vsprintf vsnprintf waitpid _wfopen _wstat])
+AC_CHECK_FUNCS([atoll atexit cimag 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 strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr usleep utime vsprintf vsnprintf waitpid _wfopen _wstat])
#
# Check for clock_gettime().
# functional iomanip iosfwd iostream iterator list string strstream utility
AC_LANG([C++])
AC_PROG_CXX
- AC_CXX_HAVE_BOOL
- AC_CXX_HAVE_NAMESPACES
- AC_CXX_HAVE_STD_NAMESPACE
+ AX_CXX_BOOL
+ AX_CXX_NAMESPACES
+ AX_CXX_NAMESPACE_STD
AC_CXX_HAVE_STD_LIBS
AC_CXX_HAVE_LSTRING
AC_OPENMP([C++])
AC_MSG_CHECKING([whether C++ compiler is sufficient for Magick++])
if \
- test $ac_cv_cxx_have_bool = 'yes' && \
+ test $ax_cv_cxx_bool = 'yes' && \
test $ac_cv_cxx_have_lstring = 'yes' && \
- test $ac_cv_cxx_have_namespaces = 'yes' && \
+ test $ax_cv_cxx_namespaces = 'yes' && \
test $ac_cv_cxx_have_std_libs = 'yes' && \
- test $ac_cv_cxx_have_std_namespace = 'yes'; then
+ test $ax_cv_cxx_have_std_namespace = 'yes'; then
have_magick_plus_plus='yes'
else
have_magick_plus_plus='no (failed tests)'
# Most delegates have includes in the same directory as the library, but not all...
#
# Includes
- for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include magick png tiff/libtiff ttf/include wand wmf/include xml/include zlib; do
+ for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include lzma magick png tiff/libtiff ttf/include wand wmf/include xml/include zlib; do
if test -d "$builddir/$dir"; then
CPPFLAGS="$CPPFLAGS -I$builddir/$dir"
else
done
# Libraries
- for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src magick png tiff/libtiff ttf/objs wand wmf/src xml zlib; do
+ for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick png tiff/libtiff ttf/objs wand wmf/src xml zlib; do
if test -d "$builddir/$dir/.libs"; then
LDFLAGS="$LDFLAGS -L$builddir/$dir/.libs"
else
#
# Check for LCMS delegate library.
#
+# Disable LCMS.
AC_ARG_WITH(lcms,
- [AC_HELP_STRING([--without-lcms],
- [disable LCMS support])],
- [with_lcms=$withval],
- [with_lcms='yes'])
-
-if test "$with_lcms" != 'yes'; then
+ [ --without-lcms disable lcms (v1.1X) support],
+ [with_lcms=$withval],
+ [with_lcms='yes'])
+if test "$with_lcms" != 'yes' ; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-lcms=$with_lcms "
fi
-have_lcms='no'
+# Disable LCMS2.
+AC_ARG_WITH(lcms2,
+ [ --without-lcms2 disable lcms (v2.X) support],
+ [with_lcms2=$withval],
+ [with_lcms2='yes'])
+if test "$with_lcms2" != 'yes' ; then
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-lcms2=$with_lcms2 "
+fi
+
+have_lcms2='no'
LCMS_LIBS=''
-if test "$with_lcms" != 'no'; then
+if test "$with_lcms2" != 'no'; then
AC_MSG_RESULT([-------------------------------------------------------------])
- AC_MSG_CHECKING([for LCMS])
- AC_MSG_RESULT([])
+ AC_MSG_CHECKING([for LCMS v2])
+ AC_MSG_RESULT()
failed=0
passed=0
have_lcms_header='no'
+
+ # Check for <lcms2.h>
AC_CHECK_HEADER(lcms2.h,have_lcms_header='yes',,)
if test "$have_lcms_header" = 'yes'; then
+ AC_DEFINE(HAVE_LCMS2_H,1,Define if you have the <lcms2.h> header file.)
+ passed=`expr $passed + 1`
+ fi
+
+ # Check for <lcms2/lcms2.h)
+ if test "$have_lcms_header" != 'yes'; then
+ AC_CHECK_HEADER(lcms2/lcms2.h,have_lcms_header='yes',,)
+ if test "$have_lcms_header" = 'yes'; then
passed=`expr $passed + 1`
- AC_DEFINE(HAVE_LCMS2_H,1,Define if you have the <lcms2.h> header file.)
- else
- AC_CHECK_HEADER(lcms/lcms2.h,have_lcms_header='yes',,)
- if test "$have_lcms_header" = 'yes'; then
- passed=`expr $passed + 1`
- AC_DEFINE(HAVE_LCMS_LCMS2_H,1,Define if you have the <lcms/lcms2.h> header file.)
- else
- failed=`expr $failed + 1`
- fi
+ AC_DEFINE(HAVE_LCMS2_LCMS2_H,1,Define if you have the <lcms2/lcms2.h> header file.)
+ fi
fi
- AC_CHECK_LIB(lcms2,cmsOpenProfileFromMem,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
- AC_MSG_CHECKING([if LCMS2 package is complete])
+
+ # Failed to find lcms header?
+ if test "$have_lcms_header" != 'yes'; then
+ failed=`expr $failed + 1`
+ fi
+
+ AC_CHECK_LIB(lcms2,cmsSetLogErrorHandler,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+ AC_MSG_CHECKING(if LCMS v2 package is complete)
if test $passed -gt 0; then
- if test $failed -gt 0; then
- AC_MSG_RESULT([no -- some components failed test])
- have_lcms='no (failed tests)'
- else
- LCMS_LIBS='-llcms2'
- LIBS="$LCMS_LIBS $LIBS"
- AC_DEFINE(LCMS_DELEGATE,1,Define if you have LCMS library)
- AC_MSG_RESULT([yes])
- have_lcms='yes'
- fi
+ if test $failed -gt 0; then
+ AC_MSG_RESULT(no -- some components failed test)
+ have_lcms2='no (failed tests)'
+ else
+ LCMS_LIBS='-llcms2'
+ LIBS="$LCMS_LIBS $LIBS"
+ AC_MSG_RESULT(yes)
+ have_lcms2='yes'
+ fi
else
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT(no)
fi
fi
+#
+# Check for LCMS v1 (1.11 or later)
+#
+if test $have_lcms2 = 'yes'; then
+ with_lcms='no'
+fi
+
+have_lcms='no'
if test "$with_lcms" != 'no'; then
-if test "$have_lcms" == 'no'; then
AC_MSG_RESULT([-------------------------------------------------------------])
- AC_MSG_CHECKING([for LCMS])
- AC_MSG_RESULT([])
+ AC_MSG_CHECKING([for LCMS v1.1X])
+ AC_MSG_RESULT()
failed=0
passed=0
have_lcms_header='no'
- AC_CHECK_HEADER(lcms.h,have_lcms_header='yes',,)
- if test "$have_lcms_header" = 'yes'; then
+
+ # Check for <lcms.h>
+ if test "$have_lcms_header" != 'yes'; then
+ AC_CHECK_HEADER(lcms.h,have_lcms_header='yes',,)
+ if test "$have_lcms_header" = 'yes'; then
passed=`expr $passed + 1`
AC_DEFINE(HAVE_LCMS_H,1,Define if you have the <lcms.h> header file.)
- else
- AC_CHECK_HEADER(lcms/lcms.h,have_lcms_header='yes',,)
- if test "$have_lcms_header" = 'yes'; then
- passed=`expr $passed + 1`
- AC_DEFINE(HAVE_LCMS_LCMS_H,1,Define if you have the <lcms/lcms.h> header file.)
- else
- failed=`expr $failed + 1`
- fi
+ fi
fi
- AC_CHECK_LIB(lcms,cmsOpenProfileFromMem,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
- AC_MSG_CHECKING([if LCMS package is complete])
+
+ # Check for <lcms/lcms.h>
+ if test "$have_lcms_header" != 'yes'; then
+ AC_CHECK_HEADER(lcms/lcms.h,have_lcms_header='yes',,)
+ if test "$have_lcms_header" = 'yes'; then
+ passed=`expr $passed + 1`
+ AC_DEFINE(HAVE_LCMS_LCMS_H,1,Define if you have the <lcms/lcms.h> header file.)
+ fi
+ fi
+
+ # Failed to find lcms header?
+ if test "$have_lcms_header" != 'yes'; then
+ failed=`expr $failed + 1`
+ fi
+
+ AC_CHECK_LIB(lcms,cmsSetErrorHandler,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+ AC_MSG_CHECKING(if LCMS package is complete)
if test $passed -gt 0; then
- if test $failed -gt 0; then
- AC_MSG_RESULT([no -- some components failed test])
- have_lcms='no (failed tests)'
- else
- LCMS_LIBS='-llcms'
- LIBS="$LCMS_LIBS $LIBS"
- AC_DEFINE(LCMS_DELEGATE,1,Define if you have LCMS library)
- AC_MSG_RESULT([yes])
- have_lcms='yes'
- fi
+ if test $failed -gt 0; then
+ AC_MSG_RESULT(no -- some components failed test)
+ have_lcms='no (failed tests)'
+ else
+ LCMS_LIBS='-llcms'
+ LIBS="$LCMS_LIBS $LIBS"
+ AC_MSG_RESULT(yes)
+ have_lcms='yes'
+ fi
else
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT(no)
fi
fi
+
+AM_CONDITIONAL(LCMS_DELEGATE, test "$have_lcms2" = 'yes' -o "$have_lcms" = 'yes')
+if test "$have_lcms2" = 'yes' -o "$have_lcms" = 'yes'; then
+ AC_DEFINE(LCMS_DELEGATE,1,[Define if you have LCMS (v1.11 or later) library])
fi
-AM_CONDITIONAL(LCMS_DELEGATE, test "$have_lcms" = 'yes')
AC_SUBST(LCMS_LIBS)
+
dnl ===========================================================================
#
dnl ===========================================================================
+# Disable LZMA (lzma library)
+AC_ARG_WITH(lzma,
+ [ --without-lzma disable LZMA support],
+ [with_lzma=$withval],
+ [with_lzma='yes'])
+if test "$with_lzma" != 'yes' ; then
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-lzma=$with_lzma "
+fi
+
+#
+# Check for LZMA
+#
+have_lzma='no'
+LZMA_LIBS=''
+if test "$with_lzma" != 'no' || test "$with_tiff" != 'no'; then
+ AC_MSG_RESULT([-------------------------------------------------------------])
+ AC_MSG_CHECKING(for LZMA)
+ AC_MSG_RESULT()
+ failed=0
+ passed=0
+ AC_CHECK_HEADER(lzma.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
+ AC_CHECK_LIB(lzma,lzma_code,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+ AC_MSG_CHECKING(if LZMA package is complete)
+ if test $passed -gt 0; then
+ if test $failed -gt 0; then
+ AC_MSG_RESULT(no -- some components failed test)
+ have_lzma='no (failed tests)'
+ else
+ LZMA_LIBS='-llzma'
+ LIBS="$LZMA_LIBS $LIBS"
+ AC_DEFINE(LZMA_DELEGATE,1,Define if you have lzma compression library)
+ AC_MSG_RESULT(yes)
+ have_lzma='yes'
+ fi
+ else
+ AC_MSG_RESULT(no)
+ fi
+fi
+AM_CONDITIONAL(LZMA_DELEGATE, test "$have_lzma" = 'yes')
+AC_SUBST(LZMA_LIBS)
+
+dnl ===========================================================================
+
#
# Check for the OpenEXR delegate library.
#
AC_CHECK_HEADER(tiffio.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
AC_CHECK_LIB(tiff,TIFFOpen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
AC_CHECK_LIB(tiff,TIFFClientOpen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+ AC_CHECK_LIB(tiff,TIFFIsBigEndian,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
AC_CHECK_LIB(tiff,TIFFIsByteSwapped,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
AC_CHECK_LIB(tiff,TIFFReadRGBATile,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
AC_CHECK_LIB(tiff,TIFFReadRGBAStrip,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
AC_MSG_CHECKING([for ImageMagick delegate programs])
AC_MSG_RESULT([])
AutotraceDecodeDelegateDefault='autotrace'
-AVIDecodeDelegateDefault='mplayer'
BlenderDecodeDelegateDefault='blender'
BZIPDelegateDefault='bzip2'
BrowseDelegateDefault='xdg-open'
MANDelegateDefault='groff'
MPEGDecodeDelegateDefault='ffmpeg'
MPEGEncodeDelegateDefault='ffmpeg'
+MrSIDDecodeDelegateDefault='mrsidgeodecode'
MVDelegateDefault='mv'
PCLDelegateDefault='pcl6'
PGPDecodeDelegateDefault='pgpv'
RSVGDecodeDelegateDefault='rsvg'
SCANDecodeDelegateDefault='scanimage'
TXTDelegateDefault='enscript'
+UniconvertorDelegateDefault='uniconvertor'
+WEBPDelegateDefault='webpconv'
WMFDecodeDelegateDefault='wmf2eps'
WWWDecodeDelegateDefault='curl'
XPSDelegateDefault='gxps'
# Search for delegates
AC_PATH_PROG(AutotraceDecodeDelegate, "$AutotraceDecodeDelegateDefault", "$AutotraceDecodeDelegateDefault")
-AC_PATH_PROG(AVIDecodeDelegate, "$AVIDecodeDelegateDefault", "$AVIDecodeDelegateDefault")
AC_PATH_PROG(BlenderDecodeDelegate, "$BlenderDecodeDelegateDefault", "$BlenderDecodeDelegateDefault")
AC_PATH_PROG(BZIPDelegate, "$BZIPDelegateDefault", "$BZIPDelegateDefault")
AC_PATH_PROG(BrowseDelegate, "$BrowseDelegateDefault" mozilla firefox netscape, "$BrowseDelegateDefault")
AC_PATH_PROG(MANDelegate, "$MANDelegateDefault", "$MANDelegateDefault")
AC_PATH_PROG(MPEGDecodeDelegate, "$MPEGDecodeDelegateDefault", "$MPEGDecodeDelegateDefault")
AC_PATH_PROG(MPEGEncodeDelegate, "$MPEGEncodeDelegateDefault", "$MPEGEncodeDelegateDefault")
+AC_PATH_PROG(MrSIDDecodeDelegate, "$MrSIDDecodeDelegateDefault", "$MrSIDDecodeDelegateDefault")
AC_PATH_PROG(MVDelegate, "$MVDelegateDefault", "$MVDelegateDefault")
AC_PATH_PROG(PCLDelegate, "$PCLDelegateDefault", "$PCLDelegateDefault")
AC_PATH_PROG(PGPDecodeDelegate, "$PGPDecodeDelegateDefault", "$PGPDecodeDelegateDefault")
AC_PATH_PROG(RSVGDecodeDelegate, "$RSVGDecodeDelegateDefault", "$RSVGDecodeDelegateDefault")
AC_PATH_PROG(SCANDecodeDelegate, "$SCANDecodeDelegateDefault", "$SCANDecodeDelegateDefault")
AC_PATH_PROG(TXTDelegate, "$TXTDelegateDefault", "$TXTDelegateDefault")
+AC_PATH_PROG(UniconvertorDelegate, "$UniconvertorDelegateDefault", "$UniconvertorDelegateDefault")
+AC_PATH_PROG(WEBPDelegate, "$WEBPDelegateDefault", "$WEBPDelegateDefault")
AC_PATH_PROG(WMFDecodeDelegate, "$WMFDecodeDelegateDefault", "$WMFDecodeDelegateDefault")
AC_PATH_PROG(WWWDecodeDelegate, "$WWWDecodeDelegateDefault", "$WWWDecodeDelegateDefault")
AC_PATH_PROG(XPSDelegate, "$XPSDelegateDefault", "$XPSDelegateDefault")
have_gs='no' ; if test "$PSDelegate" != "$PSDelegateDefault"; then have_gs='yes'; fi
have_hp2xx='no' ; if test "$HPGLDecodeDelegate" != "$HPGLDecodeDelegateDefault" ; then have_hp2xx='yes'; fi
have_ilbmtoppm='no' ; if test "$ILBMDecodeDelegate" != "$ILBMDecodeDelegateDefault" ; then have_ilbmtoppm='yes'; fi
-have_mplayer='no'; if test "$AVIDecodeDelegate" != "$AVIDecodeDelegateDefault" ; then have_mplayer='yes'; fi
+have_mrsid='no'; if test "$MrSIDDecodeDelegate" != "$MrSIDDecodeDelegateDefault" ; then have_mrsid='yes'; fi
have_pcl='no' ; if test "$PCLDelegate" != "$PCLDelegateDefault"; then have_pcl='yes'; fi
have_ppmtoilbm='no' ; if test "$ILBMEncodeDelegate" != "$ILBMEncodeDelegateDefault" ; then have_ppmtoilbm='yes'; fi
have_ra_pfm='no' ; if test "$HDRDecodeDelegate" != "$HDRDecodeDelegateDefault" ; then have_ra_pfm='yes'; fi
if test "$with_frozenpaths" != 'yes'; then
# Re-set delegate definitions to default (no paths)
AutotraceDecodeDelegate="$AutotraceDecodeDelegateDefault"
- AVIDecodeDelegate="$AVIDecodeDelegateDefault"
BlenderDecodeDelegate="$BlenderDecodeDelegateDefault"
BZIPDelegate="$BZIPDelegateDefault"
BrowseDelegate="$BrowseDelegateDefault"
MANDelegate="$MANDelegateDefault"
MPEGDecodeDelegate="$MPEGDecodeDelegateDefault"
MPEGEncodeDelegate="$MPEGEncodeDelegateDefault"
- MVDelegate="$MVDelegateDefault"
MogrifyDelegate="$MogrifyDelegateDefault"
+ MrSIDDecodeDelegate="$MrSIDDecodeDelegateDefault"
+ MVDelegate="$MVDelegateDefault"
PCLDelegate="$PCLDelegateDefault"
PGPDecodeDelegate="$PGPDecodeDelegateDefault"
POVDelegate="$POVDelegateDefault"
SCANDecodeDelegate="$SCANDecodeDelegateDefault"
ShowImageDelegate="$ShowImageDelegateDefault"
TXTDelegate="$TXTDelegateDefault"
+ UniconvertorDelegate="$UniconvertorDelegateDefault"
+ WEBPDelegate="$WEBPDelegateDefault"
WMFDecodeDelegate="$WMFDecodeDelegateDefault"
WWWDecodeDelegate="$WWWDecodeDelegateDefault"
XPSDelegate="$XPSDelegateDefault"
# Delegate substitutions
AC_SUBST(AutotraceDecodeDelegate)
-AC_SUBST(AVIDecodeDelegate)
AC_SUBST(BlenderDecodeDelegate)
AC_SUBST(BZIPDelegate)
AC_SUBST(BrowseDelegate)
AC_SUBST(MANDelegate)
AC_SUBST(MPEGDecodeDelegate)
AC_SUBST(MPEGEncodeDelegate)
-AC_SUBST(MVDelegate)
AC_SUBST(MogrifyDelegate)
+AC_SUBST(MrSIDDecodeDelegate)
+AC_SUBST(MVDelegate)
AC_SUBST(PCLDelegate)
AC_SUBST(PGPDecodeDelegate)
AC_SUBST(POVDelegate)
AC_SUBST(SCANDecodeDelegate)
AC_SUBST(ShowImageDelegate)
AC_SUBST(TXTDelegate)
+AC_SUBST(UniconvertorDelegate)
+AC_SUBST(WEBPDelegate)
AC_SUBST(WMFDecodeDelegate)
AC_SUBST(WWWDecodeDelegate)
AC_SUBST(XPSDelegate)
with_perl_dynamic='yes'
fi
# Is PERL's MakeMaker new enough to support DESTDIR?
- AC_PROG_PERL_VERSION(5.8.1,[PERL_SUPPORTS_DESTDIR='yes'],[PERL_SUPPORTS_DESTDIR='no'])
+ AX_PROG_PERL_VERSION(5.8.1,[PERL_SUPPORTS_DESTDIR='yes'],[PERL_SUPPORTS_DESTDIR='no'])
fi
AM_CONDITIONAL(WITH_PERL, test "$have_perl" != 'no')
AM_CONDITIONAL(WITH_PERL_STATIC, test $with_perl_static = 'yes')
if test "$have_png" = 'yes'; then DELEGATES="$DELEGATES jng"; fi
fi
if test "$have_jp2" = 'yes'; then DELEGATES="$DELEGATES jp2"; fi
+if test "$have_lcms2" = 'yes'; then DELEGATES="$DELEGATES lcms2"; fi
if test "$have_lcms" = 'yes'; then DELEGATES="$DELEGATES lcms"; fi
if test "$have_lqr" = 'yes'; then DELEGATES="$DELEGATES lqr"; fi
+if test "$have_lzma" = 'yes'; then DELEGATES="$DELEGATES lzma"; fi
if test "$have_ffmpeg" = 'yes'; then DELEGATES="$DELEGATES mpeg"; fi
if test "$have_openexr" = 'yes'; then DELEGATES="$DELEGATES openexr"; fi
if test "$have_png" = 'yes'; then DELEGATES="$DELEGATES png"; fi
AC_SUBST(MAGICK_LTDLDEPS)
if test "$with_modules" != 'no'; then
- MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
+ MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
else
- MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
+ MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
fi
AC_SUBST(MAGICK_DEP_LIBS)
AC_SUBST(MAGICK_PCFLAGS)
AC_SUBST(MAGICK_LDFLAGS)
AC_SUBST(MAGICK_LIBS)
+AC_SUBST(MAGICK_FEATURES)
# Set configured scripts to executable.
AC_CONFIG_COMMANDS([default],[],[])
JBIG --with-jbig=$with_jbig $have_jbig
JPEG v1 --with-jpeg=$with_jpeg $have_jpeg
JPEG-2000 --with-jp2=$with_jp2 $have_jp2
-LCMS --with-lcms=$with_lcms $have_lcms
+LCMS v1 --with-lcms=$with_lcms $have_lcms
+LCMS v2 --with-lcms2=$with_lcms2 $have_lcms2
LQR --with-lqr=$with_lqr $have_lqr
+LZMA --with-lzma=$with_lzma $have_lzma
Magick++ --with-magick-plus-plus=$with_magick_plus_plus $have_magick_plus_plus
OpenEXR --with-openexr=$with_openexr $have_openexr
PERL --with-perl=$with_perl $have_perl
LIBS = $MAGICK_LIBS
CXX = $CXX
CXXFLAGS = $CXXFLAGS
+ FEATURES = $MAGICK_FEATURES
])
projects / imagemagick / blobdiff