]> granicus.if.org Git - imagemagick/blobdiff - configure.ac
(no commit message)
[imagemagick] / configure.ac
index f211efc1acb83d07053704c9f770b7ba48df936e..bd73a1e02228f3ff804191030dbfcb53395c1d60 100755 (executable)
@@ -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
 #
 #  Copyright (C) 2003 - 2008 GraphicsMagick Group
 
-AC_PREREQ(2.63)
-AC_INIT([ImageMagick],[6.6.1],[http://www.imagemagick.org],[ImageMagick])
-AC_CONFIG_SRCDIR([magick/MagickCore.h])
+AC_PREREQ(2.67)
+
+m4_define([magick_major_version], [7])
+m4_define([magick_minor_version], [0])
+m4_define([magick_micro_version], [0])
+m4_define([magick_patchlevel_version], [0])
+m4_define([magick_version],
+          [magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_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])
+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 \
@@ -34,13 +43,12 @@ AC_CONFIG_FILES([\
     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 \
@@ -58,10 +66,8 @@ AC_CONFIG_FILES([\
     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
@@ -86,7 +92,15 @@ echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}${PACKAGE_VERSION_ADDENDUM}"
 AC_CANONICAL_SYSTEM
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
-AC_CANONICAL_TARGET([])
+
+MAGICK_TARGET_CPU=$host_cpu
+AC_SUBST(MAGICK_TARGET_CPU)
+
+MAGICK_TARGET_VENDOR=$host_vendor
+AC_SUBST(MAGICK_TARGET_VENDOR)
+
+MAGICK_TARGET_OS=$host_os
+AC_SUBST(MAGICK_TARGET_OS)
 
 # Substitute library versioning
 AC_SUBST(MAGICK_LIBRARY_CURRENT)dnl
@@ -96,9 +110,11 @@ 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([MAGICK_SVN_REVISION],[magick_svn_revision])
 
 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
@@ -109,10 +125,10 @@ AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl
 # Ensure that make can run correctly
 AM_SANITY_CHECK
 
-AM_INIT_AUTOMAKE($PACKAGE_NAME,"${PACKAGE_VERSION}${PACKAGE_VERSION_ADDENDUM}", ' ')
+AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-zip dist-bzip2 dist-xz])
 
 # Enable support for silent build rules
-AM_SILENT_RULES([yes])
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 MAGICK_LIB_VERSION="0x"
 if test ${MAGICK_LIBRARY_CURRENT} -lt 10 ; then
@@ -147,6 +163,7 @@ MAGICK_CPPFLAGS=$CPPFLAGS_USER
 MAGICK_PCFLAGS=$CPPFLAGS_USER
 MAGICK_LDFLAGS=''
 MAGICK_LIBS=''
+MAGICK_FEATURES=''
 
 #
 # Evaluate shell variable equivalents to Makefile directory variables
@@ -172,6 +189,8 @@ eval "eval LIBEXEC_DIR=$libexecdir"
 AC_SUBST(LIBEXEC_DIR)
 eval "eval DATA_DIR=$datadir"
 AC_SUBST(DATA_DIR)
+eval "eval DOC_DIR=$docdir"
+AC_SUBST(DOC_DIR)
 eval "eval SYSCONF_DIR=$sysconfdir"
 AC_SUBST(SYSCONF_DIR)
 eval "eval SHAREDSTATE_DIR=$sharedstatedir"
@@ -236,12 +255,12 @@ AC_PROG_LD
 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
 
 #
@@ -263,6 +282,7 @@ fi
 #
 AC_EXEEXT
 AC_OBJEXT
+AX_LANG_COMPILER_MS
 
 GDI32_LIBS=''
 native_win32_build='no'
@@ -336,13 +356,6 @@ 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_HELP_STRING([--enable-osx-universal-binary],
@@ -365,15 +378,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"
@@ -382,6 +394,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
 
@@ -393,12 +406,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_OPENCL([C])
 CFLAGS="$CL_CFLAGS $CFLAGS"
 LIBS="$CL_LIBS $LIBS"
 AC_SUBST(CL_CFLAGS)
+if test "$enable_opencl" != no; then
+  if test "X$ax_cv_check_cl_libcl" != Xno; then :
+    MAGICK_FEATURES="OpenCL $MAGICK_FEATURES"
+  fi
+fi
 
 ########
 #
@@ -409,18 +432,24 @@ AC_SYS_LARGEFILE
 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([#include <unistd.h>
+        AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <unistd.h>
           main () {
           exit(!(sizeof(off_t) == 8));
-        }],
+        }])],
         [ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
-         AC_MSG_RESULT([yes])],
-        [AC_MSG_RESULT([no])])
-    fi
+         AC_MSG_NOTICE([yes])],
+        [AC_MSG_NOTICE([no])])
+        ;;
+    *)
+        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
@@ -430,8 +459,6 @@ if test "$enable_largefile" != no; then
 fi
 AC_SUBST(LFS_CPPFLAGS)
 
-#
-# Configure libtool & libltdl
 #
 # Configure libtool
 AC_LIBTOOL_DLOPEN
@@ -496,7 +523,7 @@ if test "$with_ltdl" != 'no'; then
 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])],
@@ -540,15 +567,16 @@ if test "$enable_cipher" = 'yes'; then
     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.
@@ -562,6 +590,7 @@ 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])
+    MAGICK_FEATURES="HDRI $MAGICK_FEATURES"
 fi
 AC_SUBST(MAGICK_HDRI)dnl
 
@@ -576,12 +605,9 @@ if test "$enable_assert" = 'no'; then
     AC_DEFINE(NDEBUG,1,[Turn off assert statements])
 fi
 
-# Add configure option --enable-maintainer-mode which enables dependency
-# checking and generation useful to package maintainers.  This is made an
-# option to avoid confusing end users.
+# Don't emit "rebuild rules" for configure, Makefile.ins, etc.
 AM_MAINTAINER_MODE
 
-
 # Enable ccmalloc memory debugging support
 AC_ARG_ENABLE([ccmalloc],
     [AC_HELP_STRING([--enable-ccmalloc],
@@ -652,7 +678,7 @@ 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
 QUANTUM_DEPTH="$with_quantum_depth"
 AC_DEFINE_UNQUOTED(QUANTUM_DEPTH,$QUANTUM_DEPTH,[Number of bits in a pixel Quantum (8/16/32/64)])
@@ -689,7 +715,7 @@ 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],
@@ -773,7 +799,7 @@ AC_HEADER_ASSERT
 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)
 
 ########
 #
@@ -787,6 +813,7 @@ AC_C_STRINGIZE
 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
@@ -803,24 +830,30 @@ AC_C_RESTRICT
 # 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.
@@ -859,6 +892,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*)
 
@@ -868,96 +904,130 @@ AC_CHECK_SIZEOF(unsigned int*)
 
 AC_MSG_CHECKING(for signed 8-bit type)
 INT8_T='signed char'
-AC_MSG_RESULT($INT8_T)
+AC_MSG_NOTICE($INT8_T)
 AC_SUBST(INT8_T)
 
 AC_MSG_CHECKING(for unsigned 8-bit type)
 UINT8_T='unsigned char'
-AC_MSG_RESULT($UINT8_T)
+AC_MSG_NOTICE($UINT8_T)
 AC_SUBST(UINT8_T)
 
 AC_MSG_CHECKING(for signed 16-bit type)
 INT16_T='signed short'
-AC_MSG_RESULT($INT16_T)
+AC_MSG_NOTICE($INT16_T)
 AC_SUBST(INT16_T)
 
 AC_MSG_CHECKING(for unsigned 16-bit type)
 UINT16_T='unsigned short'
-AC_MSG_RESULT($UINT16_T)
+AC_MSG_NOTICE($UINT16_T)
 AC_SUBST(UINT16_T)
 
 AC_MSG_CHECKING(for signed 32-bit type)
 INT32_T='none'
+INT32_F='none'
 if test $ac_cv_sizeof_signed_int -eq 4; then
   INT32_T='signed int'
+  INT32_F='""'
 elif test $ac_cv_sizeof_signed_long -eq 4; then
   INT32_T='signed long'
+  INT32_F='"l"'
 fi
-AC_MSG_RESULT($INT32_T)
+AC_MSG_NOTICE($INT32_T)
 AC_SUBST(INT32_T)
+AC_SUBST(INT32_F)
 
 AC_MSG_CHECKING(for unsigned 32-bit type)
 UINT32_T='none'
+UINT32_F='none'
 if test $ac_cv_sizeof_unsigned_int -eq 4; then
   UINT32_T='unsigned int'
+  UINT32_F='""'
 elif test $ac_cv_sizeof_unsigned_long -eq 4; then
   UINT32_T='unsigned long'
+  UINT32_F='"l"'
 fi
-AC_MSG_RESULT($UINT32_T)
+AC_MSG_NOTICE($UINT32_T)
 AC_SUBST(UINT32_T)
+AC_SUBST(UINT32_F)
 
 AC_MSG_CHECKING(for signed 64-bit type)
 INT64_T='none'
+INT64_F='none'
 if test $ac_cv_sizeof_signed_long -eq 8; then
   INT64_T='signed long'
+  INT64_F='"l"'
 elif test $ac_cv_sizeof_signed_long_long -eq 8; then
   INT64_T='signed long long'
+  INT64_F='"ll"'
 fi
-AC_MSG_RESULT($INT64_T)
+case "${build_os}" in
+  mingw* )
+    INT64_F='"I64"'
+    ;;
+esac
+AC_MSG_NOTICE($INT64_T)
 AC_SUBST(INT64_T)
+AC_SUBST(INT64_F)
 
 AC_MSG_CHECKING(for unsigned 64-bit type)
 UINT64_T='none'
+UINT64_F='none'
 if test $ac_cv_sizeof_unsigned_long -eq 8; then
   UINT64_T='unsigned long'
+  UINT64_F='"l"'
 elif test $ac_cv_sizeof_unsigned_long_long -eq 8; then
   UINT64_T='unsigned long long'
+  UINT64_F='"ll"'
 fi
-AC_MSG_RESULT($UINT64_T)
+case "${build_os}" in
+  mingw* )
+    UINT64_F='"I64"'
+    ;;
+esac
+AC_MSG_NOTICE($UINT64_T)
 AC_SUBST(UINT64_T)
+AC_SUBST(UINT64_F)
 
 AC_MSG_CHECKING(for unsigned maximum type)
 UINTMAX_T='none'
+UINTMAX_F='none'
 if test "$UINT64_T" != 'none'; then
   UINTMAX_T=$UINT64_T
+  UINTMAX_F=$UINT64_F
 elif test "$UINT32_T" != 'none'; then
   UINTMAX_T=$UINT32_T
+  UINTMAX_F=$UINT32_F
 fi
-AC_MSG_RESULT($UINTMAX_T)
+AC_MSG_NOTICE($UINTMAX_T)
 AC_SUBST(UINTMAX_T)
+AC_SUBST(UINTMAX_F)
 
 AC_MSG_CHECKING(for pointer difference type)
 UINTPTR_T='none'
+UINTPTR_F='none'
 if test $ac_cv_sizeof_unsigned_long -eq $ac_cv_sizeof_unsigned_intp; then
   UINTPTR_T='unsigned long'
+  UINTPTR_F='"l"'
 elif test $ac_cv_sizeof_unsigned_long_long -eq $ac_cv_sizeof_unsigned_intp; then
   UINTPTR_T='unsigned long long'
+  UINTPTR_F='"ll"'
 fi
-AC_MSG_RESULT($UINTPTR_T)
+AC_MSG_NOTICE($UINTPTR_T)
 AC_SUBST(UINTPTR_T)
+AC_SUBST(UINTPTR_F)
 
 AC_MSG_CHECKING([whether our compiler supports __func__])
 AC_TRY_COMPILE([],
  [{ const char *func = __func__; return(func != 0 ? 0 : 1); }],
- AC_MSG_RESULT([yes]),
- AC_MSG_RESULT([no])
+ AC_MSG_NOTICE([yes]),
+ AC_MSG_NOTICE([no])
  AC_MSG_CHECKING([whether our compiler supports __FUNCTION__])
  AC_TRY_COMPILE([],
    [{ const char *func = __FUNCTION__; return(func != 0 ? 0 : 1); }],
-   AC_MSG_RESULT([yes])
+   AC_MSG_NOTICE([yes])
    AC_DEFINE(__func__, __FUNCTION__,
      [Define to appropriate substitue if compiler does not have __func__]),
-   AC_MSG_RESULT([no])
+   AC_MSG_NOTICE([no])
    AC_DEFINE(__func__, __FILE__,
      [Define to appropriate substitue if compiler does not have __func__])))
 
@@ -975,6 +1045,7 @@ AC_FUNC_SELECT_ARGTYPES
 AC_FUNC_SETVBUF_REVERSED
 AC_TYPE_SIGNAL
 AC_FUNC_STRTOD
+AC_FUNC_STRERROR_R
 AC_FUNC_VPRINTF
 
 #
@@ -985,7 +1056,7 @@ AC_CHECK_LIB(m,sqrt,MATH_LIBS="-lm",,)
 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([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 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().
@@ -994,16 +1065,16 @@ AC_SEARCH_LIBS(clock_gettime, rt,
 [
   AC_DEFINE([HAVE_CLOCK_GETTIME],[1],[Define to 1 if you have clock_gettime.])
   AC_MSG_CHECKING([whether clock_gettime supports CLOCK_REALTIME])
-  AC_COMPILE_IFELSE(
+  AC_COMPILE_IFELSE([
     AC_LANG_PROGRAM(
       [[#include <time.h>]],
-       [[clockid_t clockType = CLOCK_REALTIME;]]),
+       [[clockid_t clockType = CLOCK_REALTIME;]])],
       [
-        AC_MSG_RESULT(yes)
+        AC_MSG_NOTICE(yes)
        AC_DEFINE([HAVE_CLOCK_REALTIME],[1],
           [Define to 1 if clock_gettime supports CLOCK_REALTIME.])
       ],
-      AC_MSG_RESULT(no)
+      AC_MSG_NOTICE(no)
     )
   ],
   [
@@ -1043,26 +1114,24 @@ 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++])
     AC_LANG_POP
 
     AC_MSG_CHECKING([whether C++ compiler is sufficient for Magick++])
     if \
-        test $ac_cv_cxx_have_bool = 'yes' && \
-        test $ac_cv_cxx_have_lstring = 'yes' && \
-        test $ac_cv_cxx_have_namespaces = 'yes' && \
+        test $ax_cv_cxx_bool = '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)'
     fi
-    AC_MSG_RESULT([$have_magick_plus_plus])
+    AC_MSG_NOTICE([$have_magick_plus_plus])
     LIBS="$OLIBS"
 fi
 AM_CONDITIONAL(WITH_MAGICK_PLUS_PLUS, test "$have_magick_plus_plus" = 'yes')
@@ -1079,7 +1148,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 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
@@ -1090,7 +1159,7 @@ if test "$enable_delegate_build" != 'no'; then
     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
@@ -1215,7 +1284,7 @@ have_umem='no'
 UMEM_LIBS=''
 if test "$with_umem" != 'no'; then
   AC_MSG_CHECKING(for UMEM support )
-  AC_MSG_RESULT()
+  AC_MSG_NOTICE()
   failed=0
   passed=0
   AC_CHECK_HEADER(umem.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
@@ -1224,17 +1293,17 @@ if test "$with_umem" != 'no'; then
   AC_MSG_CHECKING(if umem memory allocation library is complete)
   if test $passed -gt 0; then
     if test $failed -gt 0; then
-      AC_MSG_RESULT(no -- some components failed test)
+      AC_MSG_NOTICE(no -- some components failed test)
       have_umem='no (failed tests)'
     else
       UMEM_LIBS='-lumem'
       LIBS="$UMEM_LIBS $LIBS"
       AC_DEFINE(HasUMEM,1,Define if you have umem memory allocation library)
-      AC_MSG_RESULT(yes)
+      AC_MSG_NOTICE(yes)
       have_umem='yes'
     fi
   else
-    AC_MSG_RESULT(no)
+    AC_MSG_NOTICE(no)
   fi
 fi
 AM_CONDITIONAL(HasUMEM, test "$have_umem" = 'yes')
@@ -1290,9 +1359,9 @@ fi
 have_bzlib='no'
 if test "$with_bzlib" != 'no'; then
     BZLIB_LIBS=''
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     AC_MSG_CHECKING([for BZLIB])
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
     failed=0
     passed=0
     found_libbz=0
@@ -1309,17 +1378,17 @@ if test "$with_bzlib" != 'no'; then
     AC_MSG_CHECKING(if BZLIB package is complete)
     if test $passed -gt 0; then
       if test $failed -gt 0; then
-        AC_MSG_RESULT(no -- some components failed test)
+        AC_MSG_NOTICE(no -- some components failed test)
         have_bzlib='no (failed tests)'
       else
         BZLIB_LIBS='-lbz2'
         LIBS="$BZLIB_LIBS $LIBS"
         AC_DEFINE(BZLIB_DELEGATE,1,Define if you have the bzip2 library)
-        AC_MSG_RESULT(yes)
+        AC_MSG_NOTICE(yes)
         have_bzlib='yes'
       fi
     else
-      AC_MSG_RESULT(no)
+      AC_MSG_NOTICE(no)
     fi
 fi
 AM_CONDITIONAL(BZLIB_DELEGATE, test "$have_bzlib" = 'yes')
@@ -1334,9 +1403,9 @@ XEXT_LIBS=''
 XT_LIBS=''
 AC_PATH_XTRA
 if test "$no_x" != 'yes'; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     AC_MSG_CHECKING([for X11])
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
     LDFLAGS="$LDFLAGS $X_LIBS"
     X11_LIBS="$X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
     LIBS="$X11_LIBS $LIBS"
@@ -1395,9 +1464,9 @@ have_zlib='no'
 ZLIB_LIBS=''
 dnl PNG requires zlib so enable zlib check if PNG is requested
 if test "$with_zlib" != 'no' || test "$with_png" != 'no'; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     AC_MSG_CHECKING([for ZLIB])
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
     ZLIB_LIBS=''
     failed=0
     passed=0
@@ -1412,17 +1481,17 @@ if test "$with_zlib" != 'no' || test "$with_png" != 'no'; then
     AC_MSG_CHECKING([if ZLIB package is complete])
     if test $passed -gt 0; then
         if test $failed -gt 0; then
-            AC_MSG_RESULT([no -- some components failed test])
+            AC_MSG_NOTICE([no -- some components failed test])
             have_zlib='no (failed tests)'
         else
             ZLIB_LIBS='-lz'
             LIBS="$ZLIB_LIBS $LIBS"
             AC_DEFINE(ZLIB_DELEGATE,1,Define if you have zlib compression library)
-            AC_MSG_RESULT([yes])
+            AC_MSG_NOTICE([yes])
             have_zlib='yes'
         fi
     else
-        AC_MSG_RESULT([no])
+        AC_MSG_NOTICE([no])
     fi
 fi
 AM_CONDITIONAL(ZLIB_DELEGATE, test "$have_zlib" = 'yes')
@@ -1458,9 +1527,9 @@ AUTOTRACE_CFLAGS=""
 AUTOTRACE_LIBS=""
 AUTOTRACE_PKG=""
 if test "x$with_autotrace" = "xyes"; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     PKG_CHECK_MODULES(AUTOTRACE,[autotrace >= 0.31.1], have_autotrace=yes, have_autotrace=no)
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
 fi
 
 if test "$have_autotrace" = 'yes'; then
@@ -1493,9 +1562,9 @@ fi
 have_dps='no'
 DPS_LIBS=''
 if test "$with_dps" != 'no' && test "$with_x" != 'no'; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     AC_MSG_CHECKING([for DPS])
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
     failed=0
     passed=0
     PERSIST_CPPFLAGS="$CPPFLAGS"
@@ -1526,18 +1595,18 @@ if test "$with_dps" != 'no' && test "$with_x" != 'no'; then
     AC_MSG_CHECKING([if DPS package is complete])
     if test $passed -gt 0; then
         if test $failed -gt 0; then
-            AC_MSG_RESULT([no -- some components failed test])
+            AC_MSG_NOTICE([no -- some components failed test])
             have_dps='no (failed tests)'
             CPPFLAGS="$PERSIST_CPPFLAGS"
         else
             DPS_LIBS="-ldpstk -ldps ${LIBDPS_XT}"
             LIBS="$DPS_LIBS $LIBS"
             AC_DEFINE(DPS_DELEGATE,1,Define if you have Display Postscript)
-            AC_MSG_RESULT([yes])
+            AC_MSG_NOTICE([yes])
             have_dps='yes'
         fi
     else
-        AC_MSG_RESULT([no])
+        AC_MSG_NOTICE([no])
         CPPFLAGS=$PERSIST_CPPFLAGS
     fi
 fi
@@ -1562,9 +1631,9 @@ fi
 have_djvu='no'
 DJVU_LIBS=''
 if test "$with_djvu" != 'no'; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     AC_MSG_CHECKING([for DJVU])
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
     failed=0
     passed=0
     AC_CHECK_HEADER(libdjvu/ddjvuapi.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
@@ -1572,17 +1641,17 @@ if test "$with_djvu" != 'no'; then
     AC_MSG_CHECKING([if DJVU package is complete])
     if test $passed -gt 0; then
         if test $failed -gt 0; then
-            AC_MSG_RESULT([no -- some components failed test])
+            AC_MSG_NOTICE([no -- some components failed test])
             have_djvu='no (failed tests)'
         else
             DJVU_LIBS='-ldjvulibre'
             LIBS="$DJVU_LIBS $LIBS"
             AC_DEFINE(DJVU_DELEGATE,1,Define if you have DJVU library)
-            AC_MSG_RESULT([yes])
+            AC_MSG_NOTICE([yes])
             have_djvu='yes'
         fi
     else
-        AC_MSG_RESULT([no])
+        AC_MSG_NOTICE([no])
     fi
 fi
 AM_CONDITIONAL(DJVU_DELEGATE, test "$have_djvu" = 'yes')
@@ -1621,9 +1690,9 @@ fi
 have_fftw='no'
 FFTW_LIBS=''
 if test "$with_fftw" != 'no'; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     AC_MSG_CHECKING([for FFTW])
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
     failed=0
     passed=0
     AC_CHECK_HEADER(fftw3.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
@@ -1631,17 +1700,17 @@ if test "$with_fftw" != 'no'; then
     AC_MSG_CHECKING([if FFTW package is complete])
     if test $passed -gt 0; then
         if test $failed -gt 0; then
-            AC_MSG_RESULT([no -- some components failed test])
+            AC_MSG_NOTICE([no -- some components failed test])
             have_fftw='no (failed tests)'
         else
             FFTW_LIBS='-lfftw3'
             LIBS="$FFTW_LIBS $LIBS"
             AC_DEFINE(FFTW_DELEGATE,1,Define if you have FFTW library)
-            AC_MSG_RESULT([yes])
+            AC_MSG_NOTICE([yes])
             have_fftw='yes'
         fi
     else
-        AC_MSG_RESULT([no])
+        AC_MSG_NOTICE([no])
     fi
 fi
 AM_CONDITIONAL(FFTW_DELEGATE, test "$have_fftw" = 'yes')
@@ -1665,9 +1734,9 @@ fi
 have_fpx='no'
 FPX_LIBS=''
 if test "$with_fpx" != 'no'; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     AC_MSG_CHECKING([for FlashPIX])
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
     failed=0
     passed=0
     AC_LANG_PUSH(C++)
@@ -1677,17 +1746,17 @@ if test "$with_fpx" != 'no'; then
     AC_MSG_CHECKING([if FlashPIX package is complete])
     if test $passed -gt 0; then
         if test $failed -gt 0; then
-            AC_MSG_RESULT([no -- some components failed test])
+            AC_MSG_NOTICE([no -- some components failed test])
             have_fpx='no (failed tests)'
         else
             FPX_LIBS='-lfpx'
             AC_DEFINE(FPX_DELEGATE,1,Define if you have FlashPIX library)
-            AC_MSG_RESULT([yes])
+            AC_MSG_NOTICE([yes])
             have_fpx='yes'
             PERLMAINCC="$CXX"
         fi
     else
-        AC_MSG_RESULT([no])
+        AC_MSG_NOTICE([no])
     fi
 fi
 AM_CONDITIONAL(FPX_DELEGATE, test "$have_fpx" = 'yes')
@@ -1713,9 +1782,9 @@ FONTCONFIG_CFLAGS=""
 FONTCONFIG_LIBS=""
 FONTCONFIG_PKG=""
 if test "x$with_fontconfig" = "xyes"; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     PKG_CHECK_MODULES(FONTCONFIG,[fontconfig >= 2.1.0], have_fontconfig=yes, have_fontconfig=no)
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
 fi
 
 if test "$have_fontconfig" = 'yes'; then
@@ -1748,73 +1817,77 @@ fi
 have_freetype='no'
 FREETYPE_LIBS=''
 if test "$with_freetype" != 'no'; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
-    AC_MSG_CHECKING([for FreeType 2.0])
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
+    AC_MSG_CHECKING(for FreeType 2.0 )
+    AC_MSG_NOTICE()
     failed=0
     passed=0
-    PERSIST_LIBS="$LIBS"
+    PERSIST_LDFLAGS="$LDFLAGS"
     PERSIST_CPPFLAGS="$CPPFLAGS"
-    if test "$enable_delegate_build" != 'no' && test -d "$builddir/freetype/include"; then
-        :
-    else
-        freetype_config=''
-        AC_CHECK_PROGS(freetype_config,freetype-config,)dnl
-        if test -n "$freetype_config"; then
-            freetype_cflags=`$freetype_config --cflags`
-            freetype_libs=`$freetype_config --libs`
-            LIBS="$LIBS $freetype_libs"
-            CPPFLAGS="$freetype_cflags $CPPFLAGS"
-        fi
+    freetype_config=''
+    # Allow the user to specify the location of freetype.
+    if test "$with_freetype" != 'yes'; then
+      if test -x "${with_freetype}/bin/freetype-config"; then
+        freetype_config="${with_freetype}/bin/freetype-config"
+      elif test -x "${with_freetype}"; then
+        freetype_config=${with_freetype}
+      fi
+    fi
+    if test -z "$freetype_config"; then
+      AC_PATH_PROG(freetype_config,freetype-config,)dnl
+    fi
+    if test -n "$freetype_config"; then
+      freetype_prefix=`${freetype_config} --prefix`
+      freetype_exec_prefix=`${freetype_config} --exec-prefix`
+      LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib"
+      CPPFLAGS="$CPPFLAGS -I${freetype_prefix}/include/freetype2"
     fi
 
 dnl First see if there is a library
     if test "$FREETYPE_LIBS" = ''; then
-        AC_CHECK_LIB(freetype,FT_Init_FreeType,FREETYPE_LIBS='-lfreetype',,)
-        if test "$FREETYPE_LIBS" != ''; then
-            passed=`expr $passed + 1`
-        else
-            failed=`expr $failed + 1`
-            LIBS="$PERSIST_LIBS"
-        fi
+      AC_CHECK_LIB(freetype,FT_Init_FreeType,FREETYPE_LIBS='-lfreetype',,)
+      if test "$FREETYPE_LIBS" != ''; then
+        passed=`expr $passed + 1`
+      else
+        failed=`expr $failed + 1`
+        LDFLAGS="$PERSIST_LDFLAGS"
+      fi
     fi
 
 dnl Now test for the headers
     AC_CHECK_HEADER([ft2build.h],[FT2BUILD_H='#include <ft2build.h>'],[ft2build=''],[])
     AC_CHECK_HEADER(freetype/freetype.h,[have_freetype_h='yes'],[have_freetype_h='no'],[$FT2BUILD_H])
-    if test "$ac_cv_header_ft2build_h" = 'yes' || test "$have_freetype_h" = 'yes'; then
-        passed=`expr $passed + 1`
+    if test "$have_freetype_h" = 'yes'; then
+      passed=`expr $passed + 1`
     else
-        failed=`expr $failed + 1`
-        CPPFLAGS="$PERSIST_CPPFLAGS"
+      failed=`expr $failed + 1`
+      CPPFLAGS="$PERSIST_CPPFLAGS"
     fi
 
-    AC_MSG_CHECKING([if FreeType package is complete])
+    AC_MSG_CHECKING(if FreeType package is complete)
     if test $passed -gt 0; then
-        if test $failed -gt 0; then
-            FREETYPE_LIBS=''
-            AC_MSG_RESULT([no -- some components failed test])
-            have_freetype='no (failed tests)'
-        else
-            LIBS="$FREETYPE_LIBS $LIBS"
-            AC_DEFINE(FREETYPE_DELEGATE,1,Define if you have FreeType (TrueType font) library)
-            if test "$ac_cv_header_ft2build_h" = 'yes'; then
-                AC_DEFINE([HAVE_FT2BUILD_H],[1],[Define to 1 if you have the <ft2build.h> header file.])
-            fi
-            AC_MSG_RESULT([yes])
-            have_freetype='yes'
+      if test $failed -gt 0; then
+        FREETYPE_LIBS=''
+        AC_MSG_NOTICE(no -- some components failed test)
+        have_freetype='no (failed tests)'
+      else
+        LIBS="$FREETYPE_LIBS $LIBS"
+        AC_DEFINE(FREETYPE_DELEGATE,1,Define if you have FreeType (TrueType font) library)
+        if test "$ac_cv_header_ft2build_h" = 'yes'; then
+          AC_DEFINE([HAVE_FT2BUILD_H],[1],[Define to 1 if you have the <ft2build.h> header file.])
         fi
+        AC_MSG_NOTICE(yes)
+        have_freetype='yes'
+      fi
     else
-        AC_MSG_RESULT([no])
+      AC_MSG_NOTICE(no)
     fi
 fi
-AM_CONDITIONAL(FREETYPE_DELEGATE,test "$have_freetype" = 'yes')
+AM_CONDITIONAL(FREETYPE_DELEGATE, test "$have_freetype" = 'yes')
 AC_SUBST(FREETYPE_LIBS)
 
 dnl ===========================================================================
 
-dnl ===========================================================================
-
 #
 # Check for Ghostscript library or framework.
 #
@@ -1835,9 +1908,9 @@ fi
 have_gslib='no'
 GS_LIBS=''
 if test "$with_gslib" != 'no'; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     AC_MSG_CHECKING([for Ghostscript])
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
     framework=0
     failed=0
     passed=0
@@ -1850,15 +1923,15 @@ if test "$with_gslib" != 'no'; then
     AC_MSG_CHECKING([if Ghostscript package is complete])
     if test $passed -gt 0; then
         if test $failed -gt 0; then
-            AC_MSG_RESULT([no -- some components failed test])
+            AC_MSG_NOTICE([no -- some components failed test])
             have_gslib='no (failed tests)'
         else
             if test $framework -gt 0; then
                 GS_LIBS='-framework Ghostscript'
                 gslib_framework='yes'
-                AC_MSG_RESULT([yes, using framework.])
+                AC_MSG_NOTICE([yes, using framework.])
             else
-                AC_MSG_RESULT([yes, using library.])
+                AC_MSG_NOTICE([yes, using library.])
                 GS_LIBS='-lgs'
             fi
             LIBS="$GS_LIBS $LIBS"
@@ -1866,7 +1939,7 @@ if test "$with_gslib" != 'no'; then
             have_gslib='yes'
         fi
     else
-        AC_MSG_RESULT([no])
+        AC_MSG_NOTICE([no])
     fi
 fi
 AM_CONDITIONAL(GS_DELEGATE, test "$have_gslib" = 'yes')
@@ -1916,9 +1989,9 @@ fi
 
 GVC_PKG=""
 if test "x$with_gvc" = "xyes"; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     PKG_CHECK_MODULES(GVC,[libgvc >= 2.9.0], have_gvc=yes, have_gvc=no)
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
 fi
 
 if test "$have_gvc" = 'yes'; then
@@ -1947,9 +2020,9 @@ AC_ARG_WITH([jbig],
 have_jbig='no'
 JBIG_LIBS=''
 if test "$with_jbig" != 'no'; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     AC_MSG_CHECKING([for JBIG])
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
     failed=0
     passed=0
     AC_CHECK_HEADER(jbig.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
@@ -1957,17 +2030,17 @@ if test "$with_jbig" != 'no'; then
     AC_MSG_CHECKING([if JBIG package is complete])
     if test $passed -gt 0; then
         if test $failed -gt 0; then
-            AC_MSG_RESULT([no -- some components failed test])
+            AC_MSG_NOTICE([no -- some components failed test])
             have_jbig='no (failed tests)'
         else
             JBIG_LIBS='-ljbig'
             LIBS="$JBIG_LIBS $LIBS"
             AC_DEFINE(JBIG_DELEGATE,1,Define if you have JBIG library)
-            AC_MSG_RESULT([yes])
+            AC_MSG_NOTICE([yes])
             have_jbig='yes'
         fi
     else
-        AC_MSG_RESULT([no])
+        AC_MSG_NOTICE([no])
     fi
 fi
 AM_CONDITIONAL(JBIG_DELEGATE, test "$have_jbig" = 'yes')
@@ -1991,9 +2064,9 @@ fi
 have_jpeg='no'
 JPEG_LIBS=''
 if test "$with_jpeg" != 'no'; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     AC_MSG_CHECKING([for JPEG])
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
     failed=0
     passed=0
     AC_CHECK_HEADER(jconfig.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
@@ -2024,17 +2097,17 @@ fi
     AC_MSG_CHECKING([if JPEG package is complete])
     if test $passed -gt 0; then
         if test $failed -gt 0; then
-            AC_MSG_RESULT([no -- some components failed test])
+            AC_MSG_NOTICE([no -- some components failed test])
             have_jpeg='no (failed tests)'
         else
             JPEG_LIBS='-ljpeg'
             LIBS="$JPEG_LIBS $LIBS"
             AC_DEFINE(JPEG_DELEGATE,1,Define if you have JPEG library)
-            AC_MSG_RESULT([yes])
+            AC_MSG_NOTICE([yes])
             have_jpeg='yes'
         fi
     else
-        AC_MSG_RESULT([no])
+        AC_MSG_NOTICE([no])
     fi
 fi
 AM_CONDITIONAL(JPEG_DELEGATE, test "$have_jpeg" = 'yes')
@@ -2058,9 +2131,9 @@ fi
 have_jp2='no'
 JP2_LIBS=''
 if test "$with_jp2" != 'no'; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     AC_MSG_CHECKING([for JPEG Version 2])
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
     failed=0
     passed=0
     AC_CHECK_HEADER(jasper/jasper.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
@@ -2068,17 +2141,17 @@ if test "$with_jp2" != 'no'; then
     AC_MSG_CHECKING([if JPEG version 2 support package is complete])
     if test $passed -gt 0; then
         if test $failed -gt 0; then
-            AC_MSG_RESULT([no -- some components failed test])
+            AC_MSG_NOTICE([no -- some components failed test])
             have_jp2='no (failed tests)'
         else
             JP2_LIBS='-ljasper'
             LIBS="$JP2_LIBS $LIBS"
             AC_DEFINE(JP2_DELEGATE,1,Define if you have JPEG version 2 "Jasper" library)
-            AC_MSG_RESULT([yes])
+            AC_MSG_NOTICE([yes])
             have_jp2='yes'
         fi
     else
-        AC_MSG_RESULT([no])
+        AC_MSG_NOTICE([no])
     fi
 fi
 AM_CONDITIONAL(JP2_DELEGATE, test "$have_jp2" = 'yes')
@@ -2089,98 +2162,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
-    AC_MSG_RESULT([-------------------------------------------------------------])
-    AC_MSG_CHECKING([for LCMS])
-    AC_MSG_RESULT([])
+if test "$with_lcms2" != 'no'; then
+    AC_MSG_NOTICE([-------------------------------------------------------------])
+    AC_MSG_CHECKING([for LCMS v2])
+    AC_MSG_NOTICE()
     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_NOTICE(no -- some components failed test)
+        have_lcms2='no (failed tests)'
+      else
+        LCMS_LIBS='-llcms2'
+        LIBS="$LCMS_LIBS $LIBS"
+        AC_MSG_NOTICE(yes)
+        have_lcms2='yes'
+      fi
     else
-        AC_MSG_RESULT([no])
+      AC_MSG_NOTICE(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_NOTICE([-------------------------------------------------------------])
+    AC_MSG_CHECKING([for LCMS v1.1X])
+    AC_MSG_NOTICE()
     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
+
+    # 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
-    AC_CHECK_LIB(lcms,cmsOpenProfileFromMem,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
-    AC_MSG_CHECKING([if LCMS package is complete])
+
+    # 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_NOTICE(no -- some components failed test)
+        have_lcms='no (failed tests)'
+      else
+        LCMS_LIBS='-llcms'
+        LIBS="$LCMS_LIBS $LIBS"
+        AC_MSG_NOTICE(yes)
+        have_lcms='yes'
+      fi
     else
-        AC_MSG_RESULT([no])
+      AC_MSG_NOTICE(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 ===========================================================================
 
 #
@@ -2201,9 +2311,9 @@ LQR_CFLAGS=""
 LQR_LIBS=""
 LQR_PKG=""
 if test "x$with_lqr" = "xyes"; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     PKG_CHECK_MODULES(LQR,[lqr-1 >= 0.1.0], have_lqr=yes, have_lqr=no)
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
 fi
 
 if test "$have_lqr" = 'yes'; then
@@ -2217,6 +2327,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_NOTICE([-------------------------------------------------------------])
+  AC_MSG_CHECKING(for LZMA)
+  AC_MSG_NOTICE()
+  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_NOTICE(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_NOTICE(yes)
+      have_lzma='yes'
+    fi
+  else
+    AC_MSG_NOTICE(no)
+  fi
+fi
+AM_CONDITIONAL(LZMA_DELEGATE, test "$have_lzma" = 'yes')
+AC_SUBST(LZMA_LIBS)
+
+dnl ===========================================================================
+
 #
 # Check for the OpenEXR delegate library.
 #
@@ -2235,9 +2388,9 @@ OPENEXR_CFLAGS=""
 OPENEXR_LIBS=""
 OPENEXR_PKG=""
 if test "x$with_openexr" = "xyes"; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     PKG_CHECK_MODULES(OPENEXR,[OpenEXR >= 1.0.6], have_openexr=yes, have_openexr=no)
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
 fi
 
 if test "$have_openexr" = 'yes'; then
@@ -2253,6 +2406,53 @@ AC_SUBST(OPENEXR_LIBS)
 
 dnl ===========================================================================
 
+#
+# Check for PANGO delegate library.
+#
+AC_ARG_WITH([pango],
+    [AC_HELP_STRING([--without-pango],
+                    [disable PANGO support])],
+    [with_pango=$withval],
+    [with_pango=$have_x])
+
+if test "$with_pango" != 'yes'; then
+    DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-pango=$with_pango "
+fi
+
+have_pango='no'
+have_pangoft2='no'
+PANGO_CFLAGS=""
+PANGO_LIBS=""
+PANGO_PKG=""
+if test "x$with_pango" = "xyes"; then
+    AC_MSG_RESULT([-------------------------------------------------------------])
+    PKG_CHECK_MODULES(PANGO, pangoft2, have_pangoft2=yes, have_pangoft2=no)
+    AC_MSG_RESULT([])
+    PKG_CHECK_MODULES(PANGO, pango, have_pango=yes, have_pango=no)
+    AC_MSG_RESULT([])
+fi
+
+if test "$have_pango" = 'yes'; then
+    AC_DEFINE(PANGO_DELEGATE,1,Define if you have PANGO library)
+    if test "$with_modules" = 'no'; then
+        CPPFLAGS="$PANGO_CFLAGS $CPPFLAGS"
+    fi
+fi
+
+if test "$have_pangoft2" = 'yes'; then
+    AC_DEFINE(PANGOFT2_DELEGATE,1,Define if you have PANGOFT2 library)
+    if test "$with_modules" = 'no'; then
+        CPPFLAGS="$PANGOFT2_CFLAGS $CPPFLAGS"
+    fi
+fi
+
+AM_CONDITIONAL(PANGO_DELEGATE, test "$have_pango" = 'yes')
+AM_CONDITIONAL(PANGOFT2_DELEGATE, test "$have_pangoft2" = 'yes')
+AC_SUBST(PANGO_CFLAGS)
+AC_SUBST(PANGO_LIBS)
+
+dnl ===========================================================================
+
 #
 # Check for PNG delegate library.
 #
 
 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_NOTICE([-------------------------------------------------------------])
+  AC_MSG_CHECKING(for PNG support )
+  AC_MSG_NOTICE()
+  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_NOTICE(yes)
+            else
+              failed=`expr $failed + 1`
+              AC_MSG_NOTICE(no)
+            fi
+          else
+            passed=`expr $passed + 1`
+            AC_MSG_NOTICE(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_NOTICE(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_NOTICE(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 ===========================================================================
 
 #
@@ -2316,11 +2589,11 @@ RSVG_CFLAGS=""
 RSVG_LIBS=""
 RSVG_PKG=""
 if test "x$with_rsvg" = "xyes"; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     PKG_CHECK_MODULES(RSVG,[librsvg-2.0 >= 2.9.0], have_rsvg=yes, have_rsvg=no)
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
     PKG_CHECK_MODULES(CAIRO_SVG, cairo-svg, have_cairo=yes, have_cairo=no)
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
 fi
 
 if test "$have_rsvg" = 'yes'; then
@@ -2360,28 +2633,29 @@ fi
 have_tiff='no'
 TIFF_LIBS=''
 if test "$with_tiff" != 'no'; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     AC_MSG_CHECKING([for TIFF])
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
     failed=0
     passed=0
     AC_CHECK_HEADER(tiff.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
     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([if TIFF package is complete])
     if test $passed -gt 0; then
         if test $failed -gt 0; then
-            AC_MSG_RESULT([no -- some components failed test])
+            AC_MSG_NOTICE([no -- some components failed test])
             have_tiff='no (failed tests)'
         else
             TIFF_LIBS='-ltiff'
             LIBS="$TIFF_LIBS $LIBS"
             AC_DEFINE(TIFF_DELEGATE,1,Define if you have TIFF library)
-            AC_MSG_RESULT([yes])
+            AC_MSG_NOTICE([yes])
             have_tiff='yes'
             AC_CHECK_HEADERS(tiffconf.h)
             AC_CHECK_FUNCS([TIFFIsCODECConfigured TIFFMergeFieldInfo \
@@ -2389,7 +2663,7 @@ if test "$with_tiff" != 'no'; then
               TIFFSetWarningHandlerExt TIFFSwabArrayOfTriples])
         fi
     else
-        AC_MSG_RESULT([no])
+        AC_MSG_NOTICE([no])
     fi
 fi
 AM_CONDITIONAL(TIFF_DELEGATE, test "$have_tiff" = 'yes')
@@ -2397,10 +2671,54 @@ AC_SUBST(TIFF_LIBS)
 
 dnl ===========================================================================
 
+#
+# Check for WEBP delegate library.
+#
+AC_ARG_WITH(webp,
+    [AC_HELP_STRING([--without-webp],
+                    [disable WEBP support])],
+    [with_webp=$withval],
+    [with_webp='yes'])
+
+if test "$with_webp" != 'yes'; then
+    DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-webp=$with_webp "
+fi
+
+have_webp='no'
+WEBP_LIBS=''
+if test "$with_webp" != 'no'; then
+    AC_MSG_NOTICE([-------------------------------------------------------------])
+    AC_MSG_CHECKING([for WEBP])
+    AC_MSG_NOTICE([])
+    failed=0
+    passed=0
+    AC_CHECK_HEADER(webp/decode.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+    AC_CHECK_LIB(webp,WebPDecodeRGB,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+    AC_MSG_CHECKING([if WEBP package is complete])
+    if test $passed -gt 0; then
+        if test $failed -gt 0; then
+            AC_MSG_NOTICE([no -- some components failed test])
+            have_webp='no (failed tests)'
+        else
+            WEBP_LIBS='-lwebp'
+            LIBS="$WEBP_LIBS $LIBS"
+            AC_DEFINE(WEBP_DELEGATE,1,Define if you have WEBP library)
+            AC_MSG_NOTICE([yes])
+            have_webp='yes'
+        fi
+    else
+        AC_MSG_NOTICE([no])
+    fi
+fi
+AM_CONDITIONAL(WEBP_DELEGATE,test "$have_webp" = 'yes')
+AC_SUBST(WEBP_LIBS)
+
+dnl ===========================================================================
+
 #
 # Set Windows font directory.
 #
-AC_ARG_WITH(windows-font-dir,
+AC_ARG_WITH([windows-font-dir],
     [AC_HELP_STRING([--with-windows-font-dir=DIR],
                     [directory containing MS-Windows fonts])],
                     [with_windows_font_dir=$withval],
@@ -2427,27 +2745,27 @@ fi
 have_wmf='no'
 WMF_LIBS=''
 if test "$with_wmf" != 'no'; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     AC_MSG_CHECKING([for WMF])
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
     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`,)
+    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])
+            AC_MSG_NOTICE([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])
+            AC_MSG_NOTICE([yes])
             have_wmf='yes'
         fi
     else
-        AC_MSG_RESULT([no])
+        AC_MSG_NOTICE([no])
     fi
 fi
 AM_CONDITIONAL(WMF_DELEGATE,test "$have_wmf" = 'yes')
@@ -2474,13 +2792,13 @@ fi
 have_xml='no'
 XML_LIBS=''
 if test "$with_xml" != 'no'; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     AC_MSG_CHECKING([for XML])
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
     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
@@ -2496,11 +2814,13 @@ if test "$with_xml" != 'no'; then
     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
-            AC_MSG_RESULT([no -- some components failed test])
+            AC_MSG_NOTICE([no -- some components failed test])
             have_xml='no (failed tests)'
             LDFLAGS="$PERSIST_LDFLAGS"
             CPPFLAGS="$PERSIST_CPPFLAGS"
@@ -2508,11 +2828,11 @@ if test "$with_xml" != 'no'; then
             XML_LIBS='-lxml2'
             LIBS="$XML_LIBS $LIBS"
             AC_DEFINE(XML_DELEGATE,1,Define if you have XML library)
-            AC_MSG_RESULT([yes])
+            AC_MSG_NOTICE([yes])
             have_xml='yes'
         fi
     else
-        AC_MSG_RESULT([no])
+        AC_MSG_NOTICE([no])
     fi
 fi
 AM_CONDITIONAL(XML_DELEGATE,test "$have_xml" = 'yes')
@@ -2554,19 +2874,6 @@ esac
 AC_DEFINE_UNQUOTED(LIBRARY_PATH,"$DEFINE_LIBRARY_PATH",Directory where architecture-dependent files live.)
 AC_SUBST(LIBRARY_PATH)
 
-# Subdirectory under lib to place ImageMagick configuration files
-CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/config"
-AC_DEFINE_UNQUOTED(CONFIGURE_RELATIVE_PATH,"$CONFIGURE_RELATIVE_PATH",Subdirectory of lib where architecture-dependent configuration files live.)
-CONFIGURE_PATH="${LIB_DIR}/${CONFIGURE_RELATIVE_PATH}/"
-DEFINE_CONFIGURE_PATH="${LIB_DIR}/${CONFIGURE_RELATIVE_PATH}/"
-case "${build_os}" in
-  mingw* )
-    DEFINE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_CONFIGURE_PATH" 1`
-    ;;
-esac
-AC_DEFINE_UNQUOTED(CONFIGURE_PATH,"$DEFINE_CONFIGURE_PATH",Directory where architecture-dependent configuration files live.)
-AC_SUBST(CONFIGURE_PATH)
-
 #
 # Subdirectory under lib to place ImageMagick coder module files
 CODER_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/modules-Q${QUANTUM_DEPTH}/coders"
@@ -2597,9 +2904,9 @@ AC_SUBST(FILTER_PATH)
 
 #
 # Path to ImageMagick documentation files
-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
-DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}"
-DEFINE_DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}/"
+DOCUMENTATION_RELATIVE_PATH=""
+DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
+DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
 case "${build_os}" in
   mingw* )
     DEFINE_DOCUMENTATION_PATH=`$WinPathScript "$DEFINE_DOCUMENTATION_PATH" 1`
@@ -2608,31 +2915,31 @@ esac
 AC_DEFINE_UNQUOTED(DOCUMENTATION_PATH,"$DEFINE_DOCUMENTATION_PATH",Directory where ImageMagick documents live.)
 AC_SUBST(DOCUMENTATION_PATH)
 
-#
-# Path to ImageMagick share files
-SHARE_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
-SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}"
-DEFINE_SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}/"
+# Subdirectory to place ImageMagick configuration files
+CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}"
+AC_DEFINE_UNQUOTED(CONFIGURE_RELATIVE_PATH,"$CONFIGURE_RELATIVE_PATH",Subdirectory of lib where architecture-dependent configuration files live.)
+CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
+DEFINE_CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
 case "${build_os}" in
   mingw* )
-    DEFINE_SHARE_PATH=`$WinPathScript "$DEFINE_SHARE_PATH" 1`
+    DEFINE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_CONFIGURE_PATH" 1`
     ;;
 esac
-AC_DEFINE_UNQUOTED(SHARE_PATH,"$DEFINE_SHARE_PATH",Directory where architecture-independent files live.)
-AC_SUBST(SHARE_PATH)
+AC_DEFINE_UNQUOTED(CONFIGURE_PATH,"$DEFINE_CONFIGURE_PATH",Directory where architecture-dependent configuration files live.)
+AC_SUBST(CONFIGURE_PATH)
 
-# Subdirectory under share to place ImageMagick configuration files
-SHARE_CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/config"
-AC_DEFINE_UNQUOTED(SHARE_CONFIGURE_RELATIVE_PATH,"$SHARE_CONFIGURE_RELATIVE_PATH",Subdirectory of lib where architecture-independent configuration files live.)
-SHARE_CONFIGURE_PATH="${DATA_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}"
-DEFINE_SHARE_CONFIGURE_PATH="${DATA_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}/"
+# Subdirectory to place ImageMagick configuration files
+SHARE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}"
+AC_DEFINE_UNQUOTED(SHARE_RELATIVE_PATH,"$SHARE_RELATIVE_PATH",Subdirectory of lib where architecture-independent configuration files live.)
+SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}"
+DEFINE_SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}/"
 case "${build_os}" in
   mingw* )
-    DEFINE_SHARE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_SHARE_CONFIGURE_PATH" 1`
+    DEFINE_SHARE_PATH=`$WinPathScript "$DEFINE_SHARE_PATH" 1`
     ;;
 esac
-AC_DEFINE_UNQUOTED(SHARE_CONFIGURE_PATH,"$DEFINE_SHARE_CONFIGURE_PATH",Directory where architecture-independent configuration files live.)
-AC_SUBST(SHARE_CONFIGURE_PATH)
+AC_DEFINE_UNQUOTED(SHARE_PATH,"$DEFINE_SHARE_PATH",Directory where architecture-independent configuration files live.)
+AC_SUBST(SHARE_PATH)
 
 #
 # program_transform_name is formed for use in a Makefile, so create a
@@ -2640,11 +2947,10 @@ AC_SUBST(SHARE_CONFIGURE_PATH)
 configure_transform_name=`echo ${program_transform_name} | sed 's,\\$\\$,$,'`
 
 # Default delegate definitions
-AC_MSG_RESULT([-------------------------------------------------------------])
+AC_MSG_NOTICE([-------------------------------------------------------------])
 AC_MSG_CHECKING([for ImageMagick delegate programs])
-AC_MSG_RESULT([])
+AC_MSG_NOTICE([])
 AutotraceDecodeDelegateDefault='autotrace'
-AVIDecodeDelegateDefault='mplayer'
 BlenderDecodeDelegateDefault='blender'
 BZIPDelegateDefault='bzip2'
 BrowseDelegateDefault='xdg-open'
@@ -2660,7 +2966,6 @@ ConvertDelegateDefault=`echo convert | sed ${configure_transform_name}`
 DisplayDelegateDefault=`echo display | sed ${configure_transform_name}`
 MogrifyDelegateDefault=`echo mogrify | sed ${configure_transform_name}`
 GnuplotDecodeDelegateDefault='gnuplot'
-HDRDecodeDelegateDefault='ra_pfm'
 HPGLDecodeDelegateDefault='hp2xx'
 HTMLDecodeDelegateDefault='html2ps'
 ILBMDecodeDelegateDefault='ilbmtoppm'
@@ -2673,6 +2978,7 @@ LaunchDelegateDefault='gimp'
 MANDelegateDefault='groff'
 MPEGDecodeDelegateDefault='ffmpeg'
 MPEGEncodeDelegateDefault='ffmpeg'
+MrSIDDecodeDelegateDefault='mrsidgeodecode'
 MVDelegateDefault='mv'
 PCLDelegateDefault='pcl6'
 PGPDecodeDelegateDefault='pgpv'
@@ -2689,6 +2995,7 @@ RMDelegateDefault='rm'
 RSVGDecodeDelegateDefault='rsvg'
 SCANDecodeDelegateDefault='scanimage'
 TXTDelegateDefault='enscript'
+UniconvertorDelegateDefault='uniconvertor'
 WMFDecodeDelegateDefault='wmf2eps'
 WWWDecodeDelegateDefault='curl'
 XPSDelegateDefault='gxps'
@@ -2696,7 +3003,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")
@@ -2712,7 +3018,6 @@ AC_PATH_PROG(ConvertDelegate, "$ConvertDelegateDefault", "$ConvertDelegateDefaul
 AC_PATH_PROG(DisplayDelegate, "$DisplayDelegateDefault", "$DisplayDelegateDefault")
 AC_PATH_PROG(MogrifyDelegate, "$MogrifyDelegateDefault", "$MogrifyDelegateDefault")
 AC_PATH_PROG(GnuplotDecodeDelegate, "$GnuplotDecodeDelegateDefault", "$GnuplotDecodeDelegateDefault")
-AC_PATH_PROG(HDRDecodeDelegate, "$HDRDecodeDelegateDefault", "$HDRDecodeDelegateDefault")
 AC_PATH_PROG(HPGLDecodeDelegate, "$HPGLDecodeDelegateDefault", "$HPGLDecodeDelegateDefault")
 AC_PATH_PROG(HTMLDecodeDelegate, "$HTMLDecodeDelegateDefault", "$HTMLDecodeDelegateDefault")
 AC_PATH_PROG(ILBMDecodeDelegate, "$ILBMDecodeDelegateDefault", "$ILBMDecodeDelegateDefault")
@@ -2725,6 +3030,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")
@@ -2735,6 +3041,7 @@ 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(WMFDecodeDelegate, "$WMFDecodeDelegateDefault", "$WMFDecodeDelegateDefault")
 AC_PATH_PROG(WWWDecodeDelegate, "$WWWDecodeDelegateDefault", "$WWWDecodeDelegateDefault")
 AC_PATH_PROG(XPSDelegate, "$XPSDelegateDefault", "$XPSDelegateDefault")
@@ -2759,10 +3066,9 @@ 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
 have_ralcgm='no'     ; if test "$CGMDecodeDelegate" != "$CGMDecodeDelegateDefault" ; then have_ralcgm='yes'; fi
 have_xps='no'        ; if test "$XPSDelegate" != "$XPSDelegateDefault"; then have_xps='yes'; fi
 
@@ -2786,9 +3092,9 @@ else
 fi
 if test "${dejavu_font_dir}x" != 'x'; then
   type_include_files="${type_include_files} "'<include file="type-dejavu.xml" />'
-  AC_MSG_RESULT([$dejavu_font_dir])
+  AC_MSG_NOTICE([$dejavu_font_dir])
 else
-  AC_MSG_RESULT([not found!]);
+  AC_MSG_NOTICE([not found!]);
 fi
 AC_SUBST(dejavu_font_dir)
 
@@ -2847,9 +3153,9 @@ else
 fi
 if test "${ghostscript_font_dir}x" != 'x'; then
   type_include_files="${type_include_files} "'<include file="type-ghostscript.xml" />'
-  AC_MSG_RESULT([$ghostscript_font_dir])
+  AC_MSG_NOTICE([$ghostscript_font_dir])
 else
-  AC_MSG_RESULT([not found!]);
+  AC_MSG_NOTICE([not found!]);
 fi
 AC_SUBST(ghostscript_font_dir)
 case "${build_os}" in
@@ -2866,7 +3172,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"
@@ -2890,19 +3195,20 @@ 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"
   PSDelegate="$PSDelegateDefault"
-  HDRDecodeDelegate="$HDRDecodeDelegateDefault"
   RLEEncodeDelegate="$RLEEncodeDelegateDefault"
   RMDelegate="$RMDelegateDefault"
   RSVGDecodeDelegate="$RSVGDecodeDelegateDefault"
   SCANDecodeDelegate="$SCANDecodeDelegateDefault"
   ShowImageDelegate="$ShowImageDelegateDefault"
   TXTDelegate="$TXTDelegateDefault"
+  UniconvertorDelegate="$UniconvertorDelegateDefault"
   WMFDecodeDelegate="$WMFDecodeDelegateDefault"
   WWWDecodeDelegate="$WWWDecodeDelegateDefault"
   XPSDelegate="$XPSDelegateDefault"
@@ -2911,7 +3217,6 @@ fi
 
 # Delegate substitutions
 AC_SUBST(AutotraceDecodeDelegate)
-AC_SUBST(AVIDecodeDelegate)
 AC_SUBST(BlenderDecodeDelegate)
 AC_SUBST(BZIPDelegate)
 AC_SUBST(BrowseDelegate)
@@ -2924,7 +3229,6 @@ AC_SUBST(EchoDelegate)
 AC_SUBST(EditorDelegate)
 AC_SUBST(FIGDecodeDelegate)
 AC_SUBST(GnuplotDecodeDelegate)
-AC_SUBST(HDRDecodeDelegate)
 AC_SUBST(HPGLDecodeDelegate)
 AC_SUBST(HTMLDecodeDelegate)
 AC_SUBST(ILBMDecodeDelegate)
@@ -2936,8 +3240,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)
@@ -2947,6 +3252,7 @@ AC_SUBST(RMDelegate)
 AC_SUBST(SCANDecodeDelegate)
 AC_SUBST(ShowImageDelegate)
 AC_SUBST(TXTDelegate)
+AC_SUBST(UniconvertorDelegate)
 AC_SUBST(WMFDecodeDelegate)
 AC_SUBST(WWWDecodeDelegate)
 AC_SUBST(XPSDelegate)
@@ -2986,15 +3292,15 @@ AM_CONDITIONAL(ZIP_DELEGATE, test "x$ZIP" != "x" )
 # GhostPCL related configuration.
 #
 PCLColorDevice=ppmraw
-PCLCMYKDevice=bmpsep8
+PCLCMYKDevice=pamcmyk32
 PCLMonoDevice=pbmraw
 if test -z "$PCLVersion"; then
     PCLVersion='unknown'
 fi
 if test $have_pcl = 'yes'; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     AC_MSG_CHECKING([for PCL])
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
     # PCLColorDevice
     AC_MSG_CHECKING([for pcl color device])
     if $PCLDelegate -dBATCH -sDEVICE=$PCLColorDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
@@ -3002,7 +3308,7 @@ if test $have_pcl = 'yes'; then
     else
         PCLColorDevice=ppmraw
     fi
-    AC_MSG_RESULT([$PCLColorDevice])
+    AC_MSG_NOTICE([$PCLColorDevice])
 
     # PCLCMYKDevice
     AC_MSG_CHECKING([for pcl CMYK device])
@@ -3011,7 +3317,7 @@ if test $have_pcl = 'yes'; then
     else
         PCLCMYKDevice=$PCLColorDevice
     fi
-    AC_MSG_RESULT([$PCLCMYKDevice])
+    AC_MSG_NOTICE([$PCLCMYKDevice])
 
     # PCLMonoDevice
     AC_MSG_CHECKING([for pcl mono device])
@@ -3020,7 +3326,7 @@ if test $have_pcl = 'yes'; then
     else
         PCLMonoDevice=$PCLColorDevice
     fi
-    AC_MSG_RESULT([$PCLMonoDevice])
+    AC_MSG_NOTICE([$PCLMonoDevice])
 fi
 
 AC_SUBST(PCLMonoDevice)
@@ -3038,9 +3344,9 @@ if test -z "$XPSVersion"; then
     XPSVersion='unknown'
 fi
 if test $have_xps = 'yes'; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     AC_MSG_CHECKING([for XPS])
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
     # XPSColorDevice
     AC_MSG_CHECKING([for xps color device])
     if $XPSDelegate -dBATCH -sDEVICE=$XPSColorDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
@@ -3048,7 +3354,7 @@ if test $have_xps = 'yes'; then
     else
         XPSColorDevice=ppmraw
     fi
-    AC_MSG_RESULT([$XPSColorDevice])
+    AC_MSG_NOTICE([$XPSColorDevice])
 
     # XPSCMYKDevice
     AC_MSG_CHECKING([for xps CMYK device])
@@ -3057,7 +3363,7 @@ if test $have_xps = 'yes'; then
     else
         XPSCMYKDevice=$XPSColorDevice
     fi
-    AC_MSG_RESULT([$XPSCMYKDevice])
+    AC_MSG_NOTICE([$XPSCMYKDevice])
 
     # XPSMonoDevice
     AC_MSG_CHECKING([for xps mono device])
@@ -3066,7 +3372,7 @@ if test $have_xps = 'yes'; then
     else
         XPSMonoDevice=$XPSColorDevice
     fi
-    AC_MSG_RESULT([$XPSMonoDevice])
+    AC_MSG_NOTICE([$XPSMonoDevice])
 fi
 
 AC_SUBST(XPSMonoDevice)
@@ -3077,11 +3383,7 @@ AC_SUBST(XPSVersion)
 #
 # Ghostscript related configuration.
 #
-if test "$have_png" = 'yes'; then
-    GSAlphaDevice=pngalpha
-else
-    GSAlphaDevice=pnmraw
-fi
+GSAlphaDevice=pngalpha
 GSColorDevice=pnmraw
 GSCMYKDevice=pam
 GSMonoDevice=pbmraw
@@ -3090,16 +3392,16 @@ GSPSDevice=pswrite
 GSEPSDevice=epswrite
 GSVersion='unknown'
 if test $have_gs = 'yes'; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     AC_MSG_CHECKING([for Ghostscript])
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
     AC_MSG_CHECKING([for Ghostscript version])
     if GSVersion=`$PSDelegate --version`; then
         :
     else
         GSVersion=`$PSDelegate --help | sed -e '1q' | awk '{ print $3 }'`
     fi
-    AC_MSG_RESULT([$GSVersion])
+    AC_MSG_NOTICE([$GSVersion])
 
     # GSAlphaDevice
     AC_MSG_CHECKING([for gs alpha device])
@@ -3108,7 +3410,7 @@ if test $have_gs = 'yes'; then
     else
         GSAlphaDevice=pnmraw
     fi
-    AC_MSG_RESULT([$GSAlphaDevice])
+    AC_MSG_NOTICE([$GSAlphaDevice])
 
     # GSColorDevice
     AC_MSG_CHECKING([for gs color device])
@@ -3117,7 +3419,7 @@ if test $have_gs = 'yes'; then
     else
         GSColorDevice=pnmraw
     fi
-    AC_MSG_RESULT([$GSColorDevice])
+    AC_MSG_NOTICE([$GSColorDevice])
 
     # GSCMYKDevice
     AC_MSG_CHECKING([for gs CMYK device])
@@ -3126,7 +3428,7 @@ if test $have_gs = 'yes'; then
     else
         GSCMYKDevice=bmpsep8
     fi
-    AC_MSG_RESULT([$GSCMYKDevice])
+    AC_MSG_NOTICE([$GSCMYKDevice])
 
     # GSMonoDevice
     AC_MSG_CHECKING([for gs mono device])
@@ -3135,7 +3437,7 @@ if test $have_gs = 'yes'; then
     else
         GSMonoDevice=$GSColorDevice
     fi
-    AC_MSG_RESULT([$GSMonoDevice])
+    AC_MSG_NOTICE([$GSMonoDevice])
 
     # GSPDFDevice
     AC_MSG_CHECKING([for gs PDF writing device])
@@ -3144,7 +3446,7 @@ if test $have_gs = 'yes'; then
     else
         GSPDFDevice=nodevice
     fi
-        AC_MSG_RESULT([$GSPDFDevice])
+        AC_MSG_NOTICE([$GSPDFDevice])
 
     # GSPSDevice
     AC_MSG_CHECKING([for gs PS writing device])
@@ -3153,7 +3455,7 @@ if test $have_gs = 'yes'; then
     else
         GSPSDevice=nodevice
     fi
-    AC_MSG_RESULT([$GSPSDevice])
+    AC_MSG_NOTICE([$GSPSDevice])
 
     # GSEPSDevice
     AC_MSG_CHECKING([for gs EPS writing device])
@@ -3162,7 +3464,7 @@ if test $have_gs = 'yes'; then
     else
         GSEPSDevice=nodevice
     fi
-    AC_MSG_RESULT([$GSEPSDevice])
+    AC_MSG_NOTICE([$GSEPSDevice])
 fi
 
 AC_SUBST(GSAlphaDevice)
@@ -3182,9 +3484,9 @@ AC_SUBST(GSVersion)
 # If name/path of desired PERL interpreter is specified, look for that one first
 have_perl='no'
 if test "$with_perl" != 'no'; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_NOTICE([-------------------------------------------------------------])
     AC_MSG_CHECKING([for Perl])
-    AC_MSG_RESULT([])
+    AC_MSG_NOTICE([])
     if test "$with_perl" != 'yes'; then
         AC_CACHE_CHECK(for perl,ac_cv_path_PERL,ac_cv_path_PERL="$with_perl");
         PERL=$ac_cv_path_PERL
@@ -3214,7 +3516,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')
@@ -3228,7 +3530,7 @@ if test $with_perl_static = 'yes'; then
     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)
 
@@ -3250,8 +3552,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
@@ -3320,9 +3624,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 $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $PANGO_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)
 
@@ -3368,18 +3672,17 @@ 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],[],[])
-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])
 
-AC_MSG_RESULT([-------------------------------------------------------------])
-AC_MSG_RESULT([Update ImageMagick configuration])
+AC_MSG_NOTICE([-------------------------------------------------------------])
+AC_MSG_NOTICE([Update ImageMagick configuration])
 AC_OUTPUT
 
 rm -f magick-version
@@ -3399,7 +3702,7 @@ if test "${windows_font_dir}x" != 'x'; then
     result_windows_font_dir=${windows_font_dir}
 fi
 
-AC_MSG_RESULT([
+AC_MSG_NOTICE([
 ImageMagick is configured as follows. Please verify that this configuration
 matches your expectations.
 
@@ -3435,14 +3738,18 @@ 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
+PANGO             --with-pango=$with_pango             $have_pango
 PERL              --with-perl=$with_perl               $have_perl
 PNG               --with-png=$with_png         $have_png
 RSVG              --with-rsvg=$with_rsvg               $have_rsvg
 TIFF              --with-tiff=$with_tiff               $have_tiff
+WEBP              --with-webp=$with_webp               $have_webp
 Windows fonts     --with-windows-font-dir=$with_windows_font_dir       $result_windows_font_dir
 WMF               --with-wmf=$with_wmf         $have_wmf
 X11               --with-x=$with_x                     $have_x
@@ -3469,4 +3776,5 @@ Options used to compile and link:
   LIBS            = $MAGICK_LIBS
   CXX             = $CXX
   CXXFLAGS        = $CXXFLAGS
+  FEATURES        = $MAGICK_FEATURES
 ])