X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=configure.ac;h=15c7fd43473d1d74c9da018747621bf9bbd051f9;hb=e855cb3f8acc0e1857a1ce2167835d3e63f80dc0;hp=74e69589b5d85ece8ebd0e60c1be46f86dc20b04;hpb=16af1cbdffcc02e7239d432e5fb51734fcf9f9ff;p=imagemagick diff --git a/configure.ac b/configure.ac index 74e69589b..15c7fd434 100755 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# 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 @@ -14,8 +14,8 @@ # # Copyright (C) 2003 - 2008 GraphicsMagick Group -AC_PREREQ(2.63) -AC_INIT([ImageMagick],[6.5.8],[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]) @@ -28,6 +28,7 @@ AC_CONFIG_FILES([\ config/ImageMagick.rdf \ config/MagickCore.dox \ config/MagickWand.dox \ + config/type-dejavu.xml \ config/type-ghostscript.xml \ config/type-windows.xml \ config/type.xml \ @@ -81,15 +82,29 @@ AC_SUBST(CONFIGURE_ARGS) # Source file containing package/library versioning information. . ${srcdir}/version.sh -echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}${PACKAGE_LIB_SUBVERSION}" +echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}${PACKAGE_VERSION_ADDENDUM}" +AC_CANONICAL_SYSTEM AC_CANONICAL_BUILD 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 AC_SUBST(MAGICK_LIBRARY_AGE)dnl +AC_SUBST([MAGICK_LIBRARY_CURRENT_MIN], + [`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`]) +AC_SUBST([MAGICK_LIBRARY_VERSION_INFO], + [$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE]) AC_SUBST(PACKAGE_NAME)dnl AC_SUBST(PACKAGE_VERSION)dnl @@ -98,12 +113,12 @@ AC_SUBST(PACKAGE_CHANGE_DATE)dnl AC_SUBST(PACKAGE_LIB_VERSION)dnl AC_SUBST(PACKAGE_LIB_VERSION_NUMBER)dnl AC_SUBST(PACKAGE_RELEASE_DATE)dnl -AC_SUBST(PACKAGE_LIB_SUBVERSION)dnl +AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl # Ensure that make can run correctly AM_SANITY_CHECK -AM_INIT_AUTOMAKE($PACKAGE_NAME,"${PACKAGE_VERSION}${PACKAGE_LIB_SUBVERSION}", ' ') +AM_INIT_AUTOMAKE($PACKAGE_NAME,"${PACKAGE_VERSION}${PACKAGE_VERSION_ADDENDUM}", ' ') # Enable support for silent build rules AM_SILENT_RULES([yes]) @@ -141,12 +156,7 @@ MAGICK_CPPFLAGS=$CPPFLAGS_USER MAGICK_PCFLAGS=$CPPFLAGS_USER MAGICK_LDFLAGS='' MAGICK_LIBS='' - -# -# Standards compliance definitions -# -AC_DEFINE(_GNU_SOURCE,1,[Enable all API extensions (for GNU Linux libc)]) -AC_DEFINE(_NETBSD_SOURCE,1,[Enable all API extensions (for NetBSD)]) +MAGICK_FEATURES='' # # Evaluate shell variable equivalents to Makefile directory variables @@ -221,27 +231,29 @@ AC_SUBST(MAGICK_CONFIGURE_BUILD_PATH) AC_SUBST(MAGICK_FILTER_MODULE_PATH) AC_SUBST(DIRSEP) + +# +# Enable OS features. +# +AC_USE_SYSTEM_EXTENSIONS + # Check for programs AC_PROG_CC AC_PROG_CXX AC_PROG_CC_STDC AC_PROG_CPP AC_PROG_LD -AC_PROG_RANLIB AC_SUBST(LD) +AC_PROG_CC_C99 AM_PROG_CC_C_O +AX_CFLAGS_WARN_ALL AC_PROG_INSTALL AC_PROG_MAKE_SET -AC_COMPILE_WARNINGS AC_PROG_LN_S AM_WITH_DMALLOC +AX_C___ATTRIBUTE__ PKG_PROG_PKG_CONFIG -# -# Enable OS features. -# -AC_GNU_SOURCE - # # Enable run-time checking. # @@ -261,19 +273,17 @@ fi # AC_EXEEXT AC_OBJEXT +AX_LANG_COMPILER_MS GDI32_LIBS='' -StaticCplusPlusLibraries='no' native_win32_build='no' cygwin_build='no' case "${host_os}" in cygwin* ) - StaticCplusPlusLibraries='yes' cygwin_build='yes' GDI32_LIBS='-lgdi32' ;; mingw* ) - StaticCplusPlusLibraries='yes' native_win32_build='yes' GDI32_LIBS='-lgdi32' ;; @@ -337,15 +347,8 @@ fi 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_ARG_ENABLE([osx-universal-binary], AC_HELP_STRING([--enable-osx-universal-binary], [build universal binary on OS X [[default=no]]]), [build_osxuniversal="${enableval}"], [build_osxuniversal=no]) @@ -366,15 +369,14 @@ esac # 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" @@ -383,6 +385,7 @@ if test "$with_threads" != 'no'; then 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 @@ -394,12 +397,22 @@ AC_OPENMP([C]) 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_CHECK_CL +AX_OPENCL([C]) CFLAGS="$CL_CFLAGS $CFLAGS" LIBS="$CL_LIBS $LIBS" -AC_SUBST(CL_LIBS) +AC_SUBST(CL_CFLAGS) +if test "$enable_opencl" != no; then + if test "_OPENCL" = '1'; then + MAGICK_FEATURES="OpenCL $MAGICK_FEATURES" + fi +fi ######## # @@ -456,12 +469,7 @@ if test "$enable_static" = 'yes'; then libtool_build_static_libs='yes' fi -# MinGW and Cygwin can't build C++ DLLs which support exceptions. -if test "${StaticCplusPlusLibraries}" = 'yes'; then - LTCXXLIBOPTS='--static' - AC_SUBST(LTCXXLIBOPTS) -fi - +AM_CONDITIONAL(WITH_SHARED_LIBS, test "${libtool_build_shared_libs}" = 'yes') # # Enable support for building loadable modules # @@ -469,7 +477,7 @@ AC_ARG_WITH([modules], [AC_HELP_STRING([--with-modules], [enable building dynamically loadable modules])], [with_modules=$withval], - [with_modules=$libtool_build_shared_libs]) + [with_modules='no']) # Only allow building loadable modules if we are building shared libraries if test "$with_modules" != 'no' ; then @@ -502,7 +510,7 @@ if test "$with_ltdl" != 'no'; then fi # Enable build using delegate libraries built in subdirectories rather than installed -# delegate libraries (bzlib fftw fpx 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])], @@ -554,7 +562,7 @@ AC_ARG_ENABLE([embeddable], [enable_embeddable='no']) if test "$enable_embeddable" = 'yes'; then - AC_DEFINE(EMBEDDABLE_SUPPORT,1,[Build self-contained, embeddable, zero-configuration ImageMagick (experimental)]) + AC_DEFINE(EMBEDDABLE_SUPPORT,1,[Build self-contained, embeddable, zero-configuration ImageMagick]) fi # Build a high dynamic range version of ImageMagick. @@ -567,7 +575,8 @@ AC_ARG_ENABLE([hdri], MAGICK_HDRI="" 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]) + 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 @@ -658,8 +667,11 @@ case "${with_quantum_depth}" in 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 @@ -695,17 +707,15 @@ AC_ARG_WITH([perl], [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_HELP_STRING([--with-perl-options=OPTIONS], - [options to pass on command-line when generating PerlMagick's build file])]) - -PERL_MAKE_OPTIONS=$with_perl_options + [options to pass on command-line when generating PerlMagick's build file])], +PERL_MAKE_OPTIONS=$withval) AC_SUBST(PERL_MAKE_OPTIONS) - # Enable umem, object-caching memory allocation library. AC_ARG_WITH(umem, [ --with-umem enable umem memory allocation library support], @@ -777,10 +787,11 @@ if ! test x"$ac_cv_header_stdc" = x"yes"; then header files. Compilation cannot proceed. Please install the ANSI C headers and rerun this script.]); fi +AC_HEADER_ASSERT AC_HEADER_DIRENT # Check additional headers -AC_CHECK_HEADERS(arm/limits.h complex.h errno.h fcntl.h inttypes.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h OS.h stdarg.h stddef.h string.h strings.h sys/ipc.h sys/resource.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/types.h sys/wait.h unistd.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) ######## # @@ -794,12 +805,9 @@ AC_C_STRINGIZE AC_HEADER_STAT AC_HEADER_TIME AC_STRUCT_TM +AC_STRUCT_TIMEZONE AC_SYS_INTERPRETER -# If the C compiler does not fully support the ANSI C qualifier const, -# define const to be empty. -AC_C_CONST - # If the C compiler supports the keyword inline, do nothing. Otherwise # define inline to __inline__ or __inline if it accepts one of those, # otherwise define inline to be empty. @@ -870,6 +878,9 @@ AC_CHECK_SIZEOF(off_t) # 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*) @@ -988,7 +999,15 @@ AC_TYPE_SIGNAL AC_FUNC_STRTOD AC_FUNC_VPRINTF -AC_CHECK_FUNCS([_exit atexit clock directio execvp floor fork ftime ftruncate getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r 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 symlink sysconf sigemptyset sigaction strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times usleep vsprintf vsnprintf waitpid _wfopen _wstat]) +# +# Find math library +# +MATH_LIBS='' +AC_CHECK_LIB(m,sqrt,MATH_LIBS="-lm",,) +LIBS="$MATH_LIBS $LIBS" +AC_SUBST(MATH_LIBS) + +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(). @@ -1046,9 +1065,9 @@ if test "$with_magick_plus_plus" = 'yes'; then # 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++]) @@ -1056,11 +1075,11 @@ if test "$with_magick_plus_plus" = 'yes'; then 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)' @@ -1082,7 +1101,7 @@ if test "$enable_delegate_build" != 'no'; then # Most delegates have includes in the same directory as the library, but not all... # # Includes - for dir in bzlib fftw fpx 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 @@ -1093,7 +1112,7 @@ if test "$enable_delegate_build" != 'no'; then done # Libraries - for dir in bzlib fftw fpx 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 @@ -1274,14 +1293,6 @@ if test "$enable_efence" = 'yes'; then LIBS="$EFENCE_LIBS $LIBS" fi -# -# Find math library -# -MATH_LIBS='' -AC_CHECK_LIB(m,sqrt,MATH_LIBS="-lm",,) -LIBS="$MATH_LIBS $LIBS" -AC_SUBST(MATH_LIBS) - dnl =========================================================================== # @@ -1601,6 +1612,21 @@ AC_SUBST(DJVU_LIBS) dnl =========================================================================== +# +# Set DejaVu font directory. +# +AC_ARG_WITH([dejavu-font-dir], + [AC_HELP_STRING([--with-dejavu-font-dir=DIR], + [DejaVu font directory])], + [with_dejavu_font_dir=$withval], + [with_dejavu_font_dir='default']) + +if test "$with_dejavu_font_dir" != 'default'; then + DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-dejavu-font-dir=$with_dejavu_font_dir " +fi + +dnl =========================================================================== + # # Check for FFTW delegate library. # @@ -1715,10 +1741,10 @@ if test "x$with_fontconfig" = "xyes"; then fi if test "$have_fontconfig" = 'yes'; then - AC_DEFINE(FONTCONFIG_DELEGATE,1,Define if you have FONTCONFIG library) - if test "$with_modules" = 'no'; then + AC_DEFINE(FONTCONFIG_DELEGATE,1,Define if you have FONTCONFIG library) + if test "$with_modules" = 'no'; then CPPFLAGS="$FONTCONFIG_CFLAGS $CPPFLAGS" - fi + fi fi AM_CONDITIONAL(FONTCONFIG_DELEGATE,test "$have_fontconfig" = 'yes') @@ -2085,58 +2111,135 @@ dnl =========================================================================== # # 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' - AC_CHECK_HEADER(lcms.h,have_lcms_header='yes',,) + + # Check for + 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 header file.) + passed=`expr $passed + 1` + fi + + # Check for header file.) + AC_DEFINE(HAVE_LCMS2_LCMS2_H,1,Define if you have the header file.) + fi + fi + + # 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_lcms2='no (failed tests)' + else + LCMS_LIBS='-llcms2' + LIBS="$LCMS_LIBS $LIBS" + AC_MSG_RESULT(yes) + have_lcms2='yes' + fi 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 header file.) - else - failed=`expr $failed + 1` - fi + AC_MSG_RESULT(no) fi - AC_CHECK_LIB(lcms,cmsOpenProfileFromMem,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) - AC_MSG_CHECKING([if LCMS package is complete]) +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 + AC_MSG_RESULT([-------------------------------------------------------------]) + AC_MSG_CHECKING([for LCMS v1.1X]) + AC_MSG_RESULT() + failed=0 + passed=0 + have_lcms_header='no' + + # Check for + 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 header file.) + fi + fi + + # Check for + 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 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_lcms" = 'yes') + +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 AC_SUBST(LCMS_LIBS) + dnl =========================================================================== # @@ -2144,7 +2247,7 @@ dnl =========================================================================== # AC_ARG_WITH([lqr], [AC_HELP_STRING([--without-lqr], - [disable Liquid Rescale support (experimental)])], + [disable Liquid Rescale support])], [with_lqr=$withval], [with_lqr='yes']) @@ -2173,6 +2276,49 @@ AC_SUBST(LQR_LIBS) 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. # @@ -2325,6 +2471,7 @@ if test "$with_tiff" != 'no'; then 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`,) @@ -2374,7 +2521,7 @@ AC_ARG_WITH([wmf], [AC_HELP_STRING([--without-wmf], [disable WMF support])], [with_wmf=$withval], - [with_wmf=$with_modules]) + [with_wmf='yes']) if test "$with_wmf" != 'yes'; then DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-wmf=$with_wmf " @@ -2382,56 +2529,35 @@ fi have_wmf='no' WMF_LIBS='' -WMF_LIBS_DEPS='' -OLIBS="$LIBS" if test "$with_wmf" != 'no'; then AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for WMF]) AC_MSG_RESULT([]) - have_libwmf='no' - have_libwmflite='no' - have_libwmf_ipa_h='no' - - AC_CHECK_HEADER([libwmf/ipa.h],[have_libwmf_ipa_h='yes'],,[$FT2BUILD_H]) - if test "$have_libwmf_ipa_h" = 'yes'; then - AC_CHECK_LIB(wmflite,wmf_lite_create,have_libwmflite='yes',,) - if test "$have_libwmflite" = 'yes'; then - AC_DEFINE(WMFLITE_DELEGATE,1,Define if you have wmflite library) - WMF_LIBS='-lwmflite' + failed=0 + passed=0 + AC_CHECK_HEADER(libwmf/eps.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) + AC_CHECK_LIB(wmf,wmf_eps_function,passed=`expr $passed + 1`,failed=`expr $failed + 1`,"-lwmflite") + AC_MSG_CHECKING([if WMF package is complete]) + if test $passed -gt 0; then + if test $failed -gt 0; then + AC_MSG_RESULT([no -- some components failed test]) + have_wmf='no (failed tests)' + else + WMF_LIBS='-lwmf -lwmflite' LIBS="$WMF_LIBS $LIBS" + AC_DEFINE(WMF_DELEGATE,1,Define if you have WMF library) + AC_MSG_RESULT([yes]) have_wmf='yes' - else - WMF_LIBS_DEPS='' - WMF_CONFIG_LIBS=`libwmf-config --libs` - for lib in xml2 expat freetype jpeg png z; do - testlib="-l${lib}" - echo "$WMF_CONFIG_LIBS" | grep -- "$testlib" > /dev/null && WMF_LIBS_DEPS="$WMF_LIBS_DEPS $testlib" - done - AC_CHECK_LIB(wmf,wmf_api_create,have_libwmf='yes',,$WMF_LIBS_DEPS) - if test "$have_libwmf" = 'yes'; then - AC_DEFINE(WMF_DELEGATE,1,Define if you have wmf library) - WMF_LIBS='-lwmf' - LIBS="$WMF_LIBS $LIBS" - have_wmf='yes' - else - AC_MSG_RESULT([no -- some components failed test]) - have_wmf='no (failed tests)' - have_wmflite='no (failed tests)' - LIBS="$OLIBS" - WMF_LIBS='' - fi fi - fi - AC_MSG_CHECKING([if WMF package is complete]) - if test "$have_wmf" = 'yes'; then - AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) fi fi -AM_CONDITIONAL(WMF_DELEGATE, test "$have_wmf" = 'yes') +AM_CONDITIONAL(WMF_DELEGATE,test "$have_wmf" = 'yes') AC_SUBST(WMF_LIBS) -AC_SUBST(WMF_LIBS_DEPS) + +dnl =========================================================================== + dnl =========================================================================== @@ -2621,7 +2747,6 @@ AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for ImageMagick delegate programs]) AC_MSG_RESULT([]) AutotraceDecodeDelegateDefault='autotrace' -AVIDecodeDelegateDefault='mplayer' BlenderDecodeDelegateDefault='blender' BZIPDelegateDefault='bzip2' BrowseDelegateDefault='xdg-open' @@ -2650,6 +2775,7 @@ LaunchDelegateDefault='gimp' MANDelegateDefault='groff' MPEGDecodeDelegateDefault='ffmpeg' MPEGEncodeDelegateDefault='ffmpeg' +MrSIDDecodeDelegateDefault='mrsidgeodecode' MVDelegateDefault='mv' PCLDelegateDefault='pcl6' PGPDecodeDelegateDefault='pgpv' @@ -2663,8 +2789,11 @@ else fi RLEEncodeDelegateDefault='rawtorle' RMDelegateDefault='rm' +RSVGDecodeDelegateDefault='rsvg' SCANDecodeDelegateDefault='scanimage' TXTDelegateDefault='enscript' +UniconvertorDelegateDefault='uniconvertor' +WEBPDelegateDefault='webpconv' WMFDecodeDelegateDefault='wmf2eps' WWWDecodeDelegateDefault='curl' XPSDelegateDefault='gxps' @@ -2672,7 +2801,6 @@ ZipDelegateDefault='gzip' # 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") @@ -2701,6 +2829,7 @@ AC_PATH_PROG(LaunchDelegate, "$LaunchDelegateDefault", "$LaunchDelegateDefault") 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") @@ -2708,8 +2837,11 @@ AC_PATH_PROG(POVDelegate, "$POVDelegateDefault", "$POVDelegateDefault") AC_PATH_PROGS(PSDelegate, gsx gsc "$PSDelegateDefault", "$PSDelegateDefault") AC_PATH_PROG(RLEEncodeDelegate, "$RLEEncodeDelegateDefault", "$RLEEncodeDelegateDefault") AC_PATH_PROG(RMDelegate, "$RMDelegateDefault", "$RMDelegateDefault") +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") @@ -2734,7 +2866,7 @@ have_fig2dev='no' ; if test "$FIGDecodeDelegate" != "$FIGDecodeDelegateDefaul 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 @@ -2746,12 +2878,33 @@ have_xps='no' ; if test "$XPSDelegate" != "$XPSDelegateDefault"; then hav # type_include_files='' +# Dejavu fonts. +AC_MSG_CHECKING(for Dejavu fonts directory) +dejavu_font_dir='' +if test "${with_dejavu_font_dir}" != 'default'; then + dejavu_font_dir="${with_dejavu_font_dir}/" +else + for font_dir in "${prefix}/share/dejavu/fonts/" '/usr/share/fonts/dejavu/'; do + if test -f "${font_dir}DejaVuSerif.ttf"; then + dejavu_font_dir="${font_dir}" + break 1 + fi + done +fi +if test "${dejavu_font_dir}x" != 'x'; then + type_include_files="${type_include_files} "'' + AC_MSG_RESULT([$dejavu_font_dir]) +else + AC_MSG_RESULT([not found!]); +fi +AC_SUBST(dejavu_font_dir) + # Windows windows_font_dir='' if test "$with_windows_font_dir" != "no" && test -n "$with_windows_font_dir"; then windows_font_dir="${with_windows_font_dir}/" fi -if test -n "$windows_font_dir"; then +if test "${windows_font_dir}x" != 'x'; then if test -f '/usr/X11R6/lib/X11/fonts/truetype/arial.ttf'; then windows_font_dir='/usr/X11R6/lib/X11/fonts/truetype/' fi @@ -2762,7 +2915,7 @@ if test -n "$windows_font_dir"; then windows_font_dir='/usr/share/fonts/msttcore/truetype/' fi fi -if test -n "$windows_font_dir"; then +if test "${windows_font_dir}x" != 'x'; then type_include_files="$type_include_files "'' fi AC_SUBST(windows_font_dir) @@ -2820,7 +2973,6 @@ AC_SUBST(type_include_files) if test "$with_frozenpaths" != 'yes'; then # Re-set delegate definitions to default (no paths) AutotraceDecodeDelegate="$AutotraceDecodeDelegateDefault" - AVIDecodeDelegate="$AVIDecodeDelegateDefault" BlenderDecodeDelegate="$BlenderDecodeDelegateDefault" BZIPDelegate="$BZIPDelegateDefault" BrowseDelegate="$BrowseDelegateDefault" @@ -2844,8 +2996,9 @@ if test "$with_frozenpaths" != 'yes'; then MANDelegate="$MANDelegateDefault" MPEGDecodeDelegate="$MPEGDecodeDelegateDefault" MPEGEncodeDelegate="$MPEGEncodeDelegateDefault" - MVDelegate="$MVDelegateDefault" MogrifyDelegate="$MogrifyDelegateDefault" + MrSIDDecodeDelegate="$MrSIDDecodeDelegateDefault" + MVDelegate="$MVDelegateDefault" PCLDelegate="$PCLDelegateDefault" PGPDecodeDelegate="$PGPDecodeDelegateDefault" POVDelegate="$POVDelegateDefault" @@ -2853,9 +3006,12 @@ if test "$with_frozenpaths" != 'yes'; then HDRDecodeDelegate="$HDRDecodeDelegateDefault" RLEEncodeDelegate="$RLEEncodeDelegateDefault" RMDelegate="$RMDelegateDefault" + RSVGDecodeDelegate="$RSVGDecodeDelegateDefault" SCANDecodeDelegate="$SCANDecodeDelegateDefault" ShowImageDelegate="$ShowImageDelegateDefault" TXTDelegate="$TXTDelegateDefault" + UniconvertorDelegate="$UniconvertorDelegateDefault" + WEBPDelegate="$WEBPDelegateDefault" WMFDecodeDelegate="$WMFDecodeDelegateDefault" WWWDecodeDelegate="$WWWDecodeDelegateDefault" XPSDelegate="$XPSDelegateDefault" @@ -2864,7 +3020,6 @@ fi # Delegate substitutions AC_SUBST(AutotraceDecodeDelegate) -AC_SUBST(AVIDecodeDelegate) AC_SUBST(BlenderDecodeDelegate) AC_SUBST(BZIPDelegate) AC_SUBST(BrowseDelegate) @@ -2889,8 +3044,9 @@ AC_SUBST(LaunchDelegate) 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) @@ -2900,6 +3056,8 @@ AC_SUBST(RMDelegate) AC_SUBST(SCANDecodeDelegate) AC_SUBST(ShowImageDelegate) AC_SUBST(TXTDelegate) +AC_SUBST(UniconvertorDelegate) +AC_SUBST(WEBPDelegate) AC_SUBST(WMFDecodeDelegate) AC_SUBST(WWWDecodeDelegate) AC_SUBST(XPSDelegate) @@ -3151,6 +3309,12 @@ if test "$with_perl" != 'no'; then fi fi +if test "$with_perl" != 'yes' ; then + DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-perl=$with_perl " +fi + +PERL_SUPPORTS_DESTDIR='no' + with_perl_static='no' with_perl_dynamic='no' if test "$have_perl" != 'no'; then @@ -3161,7 +3325,7 @@ if test "$have_perl" != 'no'; then 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') @@ -3197,8 +3361,10 @@ if test "$have_jpeg" = 'yes'; then 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 @@ -3267,9 +3433,9 @@ AC_SUBST(MAGICK_LIBLTDL) 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) @@ -3315,6 +3481,7 @@ AC_SUBST(MAGICK_CPPFLAGS) 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],[],[]) @@ -3331,6 +3498,11 @@ AC_OUTPUT rm -f magick-version +result_dejavu_font_dir='none' +if test "${dejavu_font_dir}x" != 'x'; then + result_dejavu_font_dir=$dejavu_font_dir +fi + result_ghostscript_font_dir='none' if test "${ghostscript_font_dir}x" != 'x'; then result_ghostscript_font_dir=$ghostscript_font_dir @@ -3361,6 +3533,7 @@ High Dynamic Range Imagery Delegate Configuration: BZLIB --with-bzlib=$with_bzlib $have_bzlib Autotrace --with-autotrace=$with_autotrace $have_autotrace +Dejavu fonts --with-dejavu-font-dir=$with_dejavu_font_dir $result_dejavu_font_dir DJVU --with-djvu=$with_djvu $have_djvu DPS --with-dps=$with_dps $have_dps FFTW --with-fftw=$with_fftw $have_fftw @@ -3376,8 +3549,10 @@ Graphviz --with-gvc=$with_gvc $have_gvc 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 @@ -3410,4 +3585,5 @@ Options used to compile and link: LIBS = $MAGICK_LIBS CXX = $CXX CXXFLAGS = $CXXFLAGS + FEATURES = $MAGICK_FEATURES ])