-# Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization
+# Copyright 1999-2014 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
ImageMagick.spec \
Magick++/bin/Magick++-config \
MagickCore/ImageMagick.pc \
- Magick++/lib/ImageMagick++.pc \
Magick++/lib/Magick++.pc \
MagickCore/MagickCore-config \
MagickCore/MagickCore.pc \
MagickCore/version.h \
Makefile \
magick.sh \
- PerlMagick/Magick.pm \
- PerlMagick/Makefile.PL \
PerlMagick/check.sh \
+ PerlMagick/default/Magick.pm \
+ PerlMagick/Makefile.PL \
+ PerlMagick/default/Makefile.PL \
+ PerlMagick/quantum/Makefile.PL \
+ PerlMagick/quantum/quantum.pm \
+ PerlMagick/quantum/quantum.xs \
+ PerlMagick/quantum/typemap \
utilities/animate.1 \
utilities/compare.1 \
utilities/composite.1 \
AC_SUBST(MAGICK_TARGET_OS)
AC_DEFINE_UNQUOTED(MAGICK_TARGET_OS,$MAGICK_TARGET_OS,[Target Host OS])
+
+# Substitute versioning
+AC_SUBST([MAGICK_MAJOR_VERSION],[magick_major_version])
+AC_SUBST([MAGICK_MINOR_VERSION],[magick_minor_version])
+AC_SUBST([MAGICK_MICRO_VERSION],[magick_micro_version])
+AC_SUBST([MAGICK_PATCHLEVEL_VERSION],[magick_patchlevel_version])
+AC_SUBST([MAGICK_VERSION],[magick_version])
+AC_SUBST([MAGICK_SVN_REVISION],[magick_svn_revision])
+
# Substitute library versioning
AC_SUBST(MAGICK_LIBRARY_CURRENT)dnl
AC_SUBST(MAGICK_LIBRARY_REVISION)dnl
[`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(MAGICKPP_LIBRARY_CURRENT)dnl
+AC_SUBST(MAGICKPP_LIBRARY_REVISION)dnl
+AC_SUBST(MAGICKPP_LIBRARY_AGE)dnl
+AC_SUBST([MAGICKPP_LIBRARY_CURRENT_MIN],
+ [`expr $MAGICKPP_LIBRARY_CURRENT - $MAGICKPP_LIBRARY_AGE`])
+AC_SUBST([MAGICKPP_LIBRARY_VERSION_INFO],
+ [$MAGICKPP_LIBRARY_CURRENT:$MAGICKPP_LIBRARY_REVISION:$MAGICKPP_LIBRARY_AGE])
AC_SUBST(PACKAGE_NAME)dnl
AC_SUBST(PACKAGE_VERSION)dnl
# Ensure that make can run correctly
AM_SANITY_CHECK
-AM_INIT_AUTOMAKE([1.12 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip])
+AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip])
# Enable support for silent build rules
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+# versionning of library
MAGICK_LIB_VERSION="0x"
if test ${MAGICK_LIBRARY_CURRENT} -lt 10 ; then
MAGICK_LIB_VERSION=${MAGICK_LIB_VERSION}0
MAGICK_LIB_VERSION_NUMBER="${MAGICK_LIBRARY_CURRENT},${MAGICK_LIBRARY_AGE},${MAGICK_LIBRARY_REVISION}"
AC_SUBST(MAGICK_LIB_VERSION_NUMBER)
+MAGICKPP_LIB_VERSION="0x"
+if test ${MAGICKPP_LIBRARY_CURRENT} -lt 10 ; then
+ MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}0
+fi
+MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_CURRENT}
+if test ${MAGICKPP_LIBRARY_AGE} -lt 10 ; then
+ MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}0
+fi
+MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_AGE}
+if test ${MAGICKPP_LIBRARY_REVISION} -lt 10 ; then
+ MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}0
+fi
+MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_REVISION}
+AC_SUBST(MAGICKPP_LIB_VERSION)
+
+# Definition used to define MagickLibVersionText in version.h
+MAGICKPP_LIB_VERSION_TEXT="${PACKAGE_VERSION}"
+AC_SUBST(MAGICKPP_LIB_VERSION_TEXT)
+
+# Definition used to define MagickLibVersionNumber in version.h
+MAGICK_LIB_VERSION_NUMBER="${MAGICK_LIBRARY_CURRENT},${MAGICK_LIBRARY_AGE},${MAGICK_LIBRARY_REVISION}"
+AC_SUBST(MAGICK_LIB_VERSION_NUMBER)
+
+
+
# Regenerate config.status if ChangeLog or version.sh is updated.
AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/version.sh'])
AC_PROG_CC_C99
AM_PROG_CC_C_O
AX_CFLAGS_WARN_ALL
-AX_COMPILER_VENDOR
AC_PROG_INSTALL
AC_PROG_MAKE_SET
AC_PROG_LN_S
+AC_PROG_SED
AC_PROG_AWK
AM_WITH_DMALLOC
AX_C___ATTRIBUTE__
AX_GCC_ARCHFLAG([no])
PKG_PROG_PKG_CONFIG
-# Check for linker script support
+# Test for 64-bit build.
+AC_CHECK_SIZEOF([size_t])
+
+AX_COMPILER_VENDOR
+# The AX_CFLAGS_WARN_ALL macro doesn't currently work for sunpro
+# compiler.
+if test "$ax_cv_c_compiler_vendor" != "sun"; then
+ AX_CFLAGS_WARN_ALL
+fi
+
+if test "x$GCC" = "xyes"; then
+ CFLAGS="$CFLAGS -fexceptions"
+ touch local.exp
+else
+ cat > local.exp <<EOF
+set CC_FOR_TARGET "$CC"
+EOF
+fi
+
+# Check for linker script support
gl_LD_VERSION_SCRIPT
#
dnl Platform-specific stuff
case "$host" in
-*darwin* | *-macos10*)
- dnl OS X universal binary support, requires --disable-dependency-tracking
- AC_ARG_ENABLE([osx-universal-binary],
+ *darwin* | *-macos10*)
+ dnl Disable FORTIFY_SOURCE to fix a bug in LVVM / OpenMP support
+ CFLAGS="${CFLAGS} -D_FORTIFY_SOURCE=0"
+ dnl OS X universal binary support, requires --disable-dependency-tracking
+ 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])
- if test "${build_osxuniversal}" != no ; then
- if test "$enable_dependency_tracking" != no ; then
- AC_MSG_ERROR([--enable-osx-universal-binary requires --disable-dependency-tracking.
+ if test "${build_osxuniversal}" != no ; then
+ if test "$enable_dependency_tracking" != no ; then
+ AC_MSG_ERROR([--enable-osx-universal-binary requires --disable-dependency-tracking.
Please re-run configure with these options:
--disable-dependency-tracking --enable-osx-universal-binary
])
- fi
- CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386"
- CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386"
- LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386"
+ fi
+ CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386"
+ CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386"
+ LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386"
fi
;;
esac
[sharearch_dir="${LIB_DIR}"])
eval "eval SHAREARCH_DIR=$sharearch_dir"
-SHAREARCH_DIR="$sharearch_dir"
AC_SUBST(SHAREARCH_DIR)
+# Path to the pkgconfig folder
+AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=DIR],
+ [Path to the pkgconfig directory @<:@LIBDIR/pkgconfig@:>@]),
+ [pkgconfigdir="$withval"], [pkgconfigdir='${libdir}/pkgconfig'])
+AC_SUBST([pkgconfigdir])
+
#
# Enable support for threads
+#
+# Find Posix threads library
+#
AC_ARG_WITH([threads],
[AC_HELP_STRING([--without-threads], [disable threads support])],
[with_threads=$withval],
[with_threads='yes'])
+THREAD_LIBS=''
have_threads=no
if test "$with_threads" != 'no'; then
AX_PTHREAD()
DEF_THREAD="$PTHREAD_CFLAGS"
CFLAGS="$CFLAGS $DEF_THREAD"
CXXFLAGS="$CXXFLAGS $DEF_THREAD"
+ THREAD_LIBS="$PTHREAD_LIBS"
if test "$CC" != "$PTHREAD_CC"; then
AC_MSG_WARN([Replacing compiler $CC with compiler $PTHREAD_CC to support pthreads.])
CC="$PTHREAD_CC"
AC_DEFINE(THREAD_SUPPORT,1,[Define if you have POSIX threads libraries and header files.])
fi
fi
+LIBS="$LIBS $THREAD_LIBS"
+AC_SUBST(THREAD_LIBS)
# Enable support for OpenMP
if test "$have_threads" != 'yes'; then
# Enable support for OpenCL
AX_OPENCL([C])
CFLAGS="$CL_CFLAGS $CFLAGS"
+CPPFLAGS="$CL_CFLAGS $CPPFLAGS"
LIBS="$CL_LIBS $LIBS"
AC_SUBST(CL_CFLAGS)
if test "$enable_opencl" != no; then
exit(!(sizeof(off_t) == 8));
}])],
[ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
- AC_MSG_NOTICE([yes])],
- [AC_MSG_NOTICE([no])])
+ AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])])
;;
*)
LFS_CPPFLAGS="$LFS_CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
fi
if test "$build_modules" != 'no' ; then
AC_DEFINE(BUILD_MODULES,1,Define if coders and filters are to be built as modules.)
+ MAGICK_FEATURES="$MAGICK_FEATURES Modules"
fi
AM_CONDITIONAL(WITH_MODULES, test "$build_modules" != 'no')
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_hdri_enable='1';
MAGICK_FEATURES="HDRI $MAGICK_FEATURES"
+else
+ magick_hdri_enable='0'
fi
+AC_DEFINE_UNQUOTED(HDRI_ENABLE_OBSOLETE_IN_H,$magick_hdri_enable,[Whether hdri is enabled or not])
AC_SUBST(MAGICK_HDRI)dnl
+MAGICK_PCFLAGS="$MAGICK_PCFLAGS -DMAGICKCORE_HDRI_ENABLE=$magick_hdri_enable"
+CFLAGS="$CFLAGS -DMAGICKCORE_HDRI_ENABLE=$magick_hdri_enable"
+CPPFLAGS="$CPPFLAGS -DMAGICKCORE_HDRI_ENABLE=$magick_hdri_enable"
# Build a version of ImageMagick with assert statements.
AC_ARG_ENABLE([assert],
# Don't emit "rebuild rules" for configure, Makefile.ins, etc.
AM_MAINTAINER_MODE
+# Enable hugepages support
+AC_ARG_ENABLE([hugepages],
+ [AC_HELP_STRING([--enable-hugepages],
+ [enable 'huge pages' support])],
+ [enable_hugepages=$enableval],
+ [enable_hugepages='no'])
+
# Enable ccmalloc memory debugging support
AC_ARG_ENABLE([ccmalloc],
[AC_HELP_STRING([--enable-ccmalloc],
* ) 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)])
+AC_DEFINE_UNQUOTED(QUANTUM_DEPTH_OBSOLETE_IN_H,$QUANTUM_DEPTH,[Number of bits in a pixel Quantum (8/16/32/64)])
AC_SUBST(QUANTUM_DEPTH)dnl
+MAGICK_PCFLAGS="$MAGICK_PCFLAGS -DMAGICKCORE_QUANTUM_DEPTH=$QUANTUM_DEPTH"
+CFLAGS="$CFLAGS -DMAGICKCORE_QUANTUM_DEPTH=$QUANTUM_DEPTH"
+CPPFLAGS="$CPPFLAGS -DMAGICKCORE_QUANTUM_DEPTH=$QUANTUM_DEPTH"
# define a lib suffix for abi purpose
-MAGICK_ABISUFFIX="Q${MAGICK_HDRI}${QUANTUM_DEPTH}"
-AC_SUBST(MAGICK_ABISUFFIX)
-
+MAGICK_ABI_SUFFIX="Q${QUANTUM_DEPTH}"
+if test "$enable_hdri" = 'yes'; then
+ MAGICK_ABI_SUFFIX="Q${QUANTUM_DEPTH}${MAGICK_HDRI}"
+fi
+AC_SUBST(MAGICK_ABI_SUFFIX)
# Set pixel cache threshold
AC_ARG_WITH([cache],
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 sun_prefetch.h stdarg.h sys/ipc.h sys/mman.h sys/resource.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h wchar.h xlocale.h)
+AC_CHECK_HEADERS(arm/limits.h arpa/inet.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h netinet/in.h OS.h process.h sun_prefetch.h stdarg.h sys/ipc.h sys/mman.h sys/resource.h sys/socket.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h wchar.h xlocale.h)
########
#
AC_STRUCT_TIMEZONE
AC_SYS_INTERPRETER
-# 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.
+#
+# Checks for language qualifiers and semantics.
+#
+AC_C_CHAR_UNSIGNED
+AC_C_CONST
AC_C_INLINE
-
-# If the C compiler supports the keyword restrict, do nothing. Otherwise
-# define restrict to __restrict__ or __restrict if it accepts one of those,
-# otherwise define restrict to be empty.
AC_C_RESTRICT
+AC_C_VOLATILE
# If words are stored with the most significant byte first (like
# Motorola and SPARC CPUs), define `WORDS_BIGENDIAN'.
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.
-AC_C_CHAR_UNSIGNED
-
# Float_t and double_t are intended to be the the most efficient type.
AC_CHECK_TYPES([float_t], [], [], [[#include <math.h>]])
AC_CHECK_TYPES([double_t], [], [], [[#include <math.h>]])
AC_MSG_CHECKING(for signed 8-bit type)
INT8_T='signed char'
-AC_MSG_NOTICE($INT8_T)
+AC_MSG_RESULT($INT8_T)
AC_SUBST(INT8_T)
AC_MSG_CHECKING(for unsigned 8-bit type)
UINT8_T='unsigned char'
-AC_MSG_NOTICE($UINT8_T)
+AC_MSG_RESULT($UINT8_T)
AC_SUBST(UINT8_T)
AC_MSG_CHECKING(for signed 16-bit type)
INT16_T='signed short'
-AC_MSG_NOTICE($INT16_T)
+AC_MSG_RESULT($INT16_T)
AC_SUBST(INT16_T)
AC_MSG_CHECKING(for unsigned 16-bit type)
UINT16_T='unsigned short'
-AC_MSG_NOTICE($UINT16_T)
+AC_MSG_RESULT($UINT16_T)
AC_SUBST(UINT16_T)
AC_MSG_CHECKING(for signed 32-bit type)
INT32_T='signed long'
INT32_F='"l"'
fi
-AC_MSG_NOTICE($INT32_T)
+AC_MSG_RESULT($INT32_T)
AC_SUBST(INT32_T)
AC_SUBST(INT32_F)
UINT32_T='unsigned long'
UINT32_F='"l"'
fi
-AC_MSG_NOTICE($UINT32_T)
+AC_MSG_RESULT($UINT32_T)
AC_SUBST(UINT32_T)
AC_SUBST(UINT32_F)
INT64_F='"I64"'
;;
esac
-AC_MSG_NOTICE($INT64_T)
+AC_MSG_RESULT($INT64_T)
AC_SUBST(INT64_T)
AC_SUBST(INT64_F)
UINT64_F='"I64"'
;;
esac
-AC_MSG_NOTICE($UINT64_T)
+AC_MSG_RESULT($UINT64_T)
AC_SUBST(UINT64_T)
AC_SUBST(UINT64_F)
UINTMAX_T=$UINT32_T
UINTMAX_F=$UINT32_F
fi
-AC_MSG_NOTICE($UINTMAX_T)
+AC_MSG_RESULT($UINTMAX_T)
AC_SUBST(UINTMAX_T)
AC_SUBST(UINTMAX_F)
UINTPTR_T='unsigned long long'
UINTPTR_F='"ll"'
fi
-AC_MSG_NOTICE($UINTPTR_T)
+AC_MSG_RESULT($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_NOTICE([yes]),
- AC_MSG_NOTICE([no])
+ AC_MSG_RESULT([yes]),
+ AC_MSG_RESULT([no])
AC_MSG_CHECKING([whether our compiler supports __FUNCTION__])
AC_TRY_COMPILE([],
[{ const char *func = __FUNCTION__; return(func != 0 ? 0 : 1); }],
- AC_MSG_NOTICE([yes])
+ AC_MSG_RESULT([yes])
AC_DEFINE(__func__, __FUNCTION__,
[Define to appropriate substitue if compiler does not have __func__]),
- AC_MSG_NOTICE([no])
+ AC_MSG_RESULT([no])
AC_DEFINE(__func__, __FILE__,
[Define to appropriate substitue if compiler does not have __func__])))
# Check for functions
#
########
-MAGICK_FUNC_MMAP_FILEIO
AC_FUNC_CLOSEDIR_VOID
AC_FUNC_MMAP
AC_FUNC_FORK
LIBS="$MATH_LIBS $LIBS"
AC_SUBST(MATH_LIBS)
-AC_CHECK_FUNCS([acosh _aligned_malloc 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 isnan 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])
+#
+# Find socket library
+#
+AC_SEARCH_LIBS(gethostbyname, resolv nsl)
+AC_SEARCH_LIBS(socket, socket,
+[
+ AC_DEFINE([HAVE_SOCKET],[1],[Define to 1 if you have socket support.])
+ MAGICK_FEATURES="DPC $MAGICK_FEATURES"
+])
+
+AC_CHECK_FUNCS([acosh _aligned_malloc 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 isnan 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 socket 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().
[[#include <time.h>]],
[[clockid_t clockType = CLOCK_REALTIME;]])],
[
- AC_MSG_NOTICE(yes)
- AC_DEFINE([HAVE_CLOCK_REALTIME],[1],
+ AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_CLOCK_REALTIME],[1],
[Define to 1 if clock_gettime supports CLOCK_REALTIME.])
],
- AC_MSG_NOTICE(no)
+ AC_MSG_RESULT(no)
)
],
[
else
have_magick_plus_plus='no (failed tests)'
fi
- AC_MSG_NOTICE([$have_magick_plus_plus])
+ AC_MSG_RESULT([$have_magick_plus_plus])
LIBS="$OLIBS"
fi
AM_CONDITIONAL(WITH_MAGICK_PLUS_PLUS, test "$have_magick_plus_plus" = 'yes')
# 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 lzma magick png tiff/libtiff ttf/include wand webp 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 openjp2/include png tiff/libtiff ttf/include wand webp/src wmf/include xml/include zlib; do
if test -d "$builddir/$dir"; then
CPPFLAGS="$CPPFLAGS -I$builddir/$dir"
else
done
# Libraries
- for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick png tiff/libtiff ttf/objs wand webp wmf/src xml zlib; do
+ for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick openjp2 png tiff/libtiff ttf/objs wand webp wmf/src xml zlib; do
if test -d "$builddir/$dir/.libs"; then
LDFLAGS="$LDFLAGS -L$builddir/$dir/.libs"
else
# Assume that delegate headers reside under same directory as ImageMagick
# installation prefix.
-MAGICK_CPPFLAGS="-I$INCLUDE_DIR/ImageMagick $MAGICK_CPPFLAGS"
+MAGICK_CPPFLAGS="-I$INCLUDE_DIR/${PACKAGE_NAME}-$MAGICK_MAJOR_VERSION $MAGICK_CPPFLAGS"
#
# Find the X11 RGB database
X11ConfigurePath=`$WinPathScript "$X11ConfigurePath=" 1`
;;
esac
-AC_DEFINE_UNQUOTED(X11_CONFIGURE_PATH,"$X11ConfigurePath",Location of X11 configure files)
+AC_DEFINE_UNQUOTED(X11_CONFIGURE_PATH,"$X11ConfigurePath",[Location of X11 configure files])
#
# Find OpenMP library
fi
AC_SUBST(GOMP_LIBS)
-#
-# Find Posix threads library
-#
-THREAD_LIBS=''
-if test "$with_threads" != 'no' && test "$have_threads" = 'yes'; then
- if test "x$PTHREAD_LIBS" = "x"; then
- case "${host_cpu}-${host_os}" in
- *-freebsd*)
- MAGICK_CHECK_PTHREAD_LIB(c_r,PTHREAD_LIBS=-lc_r) ;;
- esac
- fi
-
- for lib in pthread pthreads; do
- if test "x$PTHREAD_LIBS" = "x"; then
- MAGICK_CHECK_PTHREAD_LIB([$lib],[PTHREAD_LIBS=-l$lib])
- fi
- done
-
- THREAD_LIBS="$PTHREAD_LIBS"
- LIBS="$LIBS $THREAD_LIBS"
-fi
-AC_SUBST(THREAD_LIBS)
#
# Check for umem.
UMEM_LIBS=''
if test "$with_umem" != 'no'; then
AC_MSG_CHECKING(for UMEM support )
- AC_MSG_NOTICE()
+ AC_MSG_RESULT()
failed=0
passed=0
AC_CHECK_HEADER(umem.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
AC_MSG_CHECKING(if umem memory allocation library is complete)
if test $passed -gt 0; then
if test $failed -gt 0; then
- AC_MSG_NOTICE(no -- some components failed test)
+ AC_MSG_RESULT(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_NOTICE(yes)
+ AC_MSG_RESULT(yes)
have_umem='yes'
fi
else
- AC_MSG_NOTICE(no)
+ AC_MSG_RESULT(no)
fi
fi
AM_CONDITIONAL(HasUMEM, test "$have_umem" = 'yes')
fi
fi
+#
+# Add support for 'huge pages' if requested
+#
+AS_IF([test "x$enable_hugepages" != "xno"],[
+ AC_DEFINE(HAVE_HUGEPAGES, 1, [Compile with hugepage support])
+])
+
#
# Add support for efence memory debugging library if requested
#
have_bzlib='no'
if test "$with_bzlib" != 'no'; then
BZLIB_LIBS=''
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for BZLIB])
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
failed=0
passed=0
found_libbz=0
AC_MSG_CHECKING(if BZLIB package is complete)
if test $passed -gt 0; then
if test $failed -gt 0; then
- AC_MSG_NOTICE(no -- some components failed test)
+ AC_MSG_RESULT(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_NOTICE(yes)
+ AC_MSG_RESULT(yes)
have_bzlib='yes'
fi
else
- AC_MSG_NOTICE(no)
+ AC_MSG_RESULT(no)
fi
fi
AM_CONDITIONAL(BZLIB_DELEGATE, test "$have_bzlib" = 'yes')
XT_LIBS=''
AC_PATH_XTRA
if test "$no_x" != 'yes'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for X11])
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
LDFLAGS="$LDFLAGS $X_LIBS"
X11_LIBS="$X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
LIBS="$X11_LIBS $LIBS"
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_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for ZLIB])
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
ZLIB_LIBS=''
failed=0
passed=0
AC_MSG_CHECKING([if ZLIB package is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
- AC_MSG_NOTICE([no -- some components failed test])
+ AC_MSG_RESULT([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_NOTICE([yes])
+ AC_MSG_RESULT([yes])
have_zlib='yes'
fi
else
- AC_MSG_NOTICE([no])
+ AC_MSG_RESULT([no])
fi
fi
AM_CONDITIONAL(ZLIB_DELEGATE, test "$have_zlib" = 'yes')
have_ltdl='no'
LTDL_LIBS=''
if test "$build_modules" != 'no' ; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for libltdl])
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
failed=0
passed=0
AC_CHECK_HEADER([ltdl.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
AUTOTRACE_LIBS=""
AUTOTRACE_PKG=""
if test "x$with_autotrace" = "xyes"; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
PKG_CHECK_MODULES(AUTOTRACE,[autotrace >= 0.31.1], have_autotrace=yes, have_autotrace=no)
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
fi
if test "$have_autotrace" = 'yes'; then
failed=0
AC_DEFINE(AUTOTRACE_DELEGATE,1,Define if you have AUTOTRACE library)
if test "$build_modules" = 'no'; then
- CPPFLAGS="$AUTOTRACE_CFLAGS $CPPFLAGS"
+ CPPFLAGS="$AUTOTRACE_CFLAGS $CPPFLAGS"
fi
fi
have_dps='no'
DPS_LIBS=''
if test "$with_dps" != 'no' && test "$with_x" != 'no'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for DPS])
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
failed=0
passed=0
PERSIST_CPPFLAGS="$CPPFLAGS"
AC_MSG_CHECKING([if DPS package is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
- AC_MSG_NOTICE([no -- some components failed test])
+ AC_MSG_RESULT([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_NOTICE([yes])
+ AC_MSG_RESULT([yes])
have_dps='yes'
fi
else
- AC_MSG_NOTICE([no])
+ AC_MSG_RESULT([no])
CPPFLAGS=$PERSIST_CPPFLAGS
fi
fi
have_djvu='no'
DJVU_LIBS=''
if test "$with_djvu" != 'no'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for DJVU])
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
failed=0
passed=0
AC_CHECK_HEADER(libdjvu/ddjvuapi.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
AC_MSG_CHECKING([if DJVU package is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
- AC_MSG_NOTICE([no -- some components failed test])
+ AC_MSG_RESULT([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_NOTICE([yes])
+ AC_MSG_RESULT([yes])
have_djvu='yes'
fi
else
- AC_MSG_NOTICE([no])
+ AC_MSG_RESULT([no])
fi
fi
AM_CONDITIONAL(DJVU_DELEGATE, test "$have_djvu" = 'yes')
have_fftw='no'
FFTW_LIBS=''
if test "$with_fftw" != 'no'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for FFTW])
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
failed=0
passed=0
AC_CHECK_HEADER(fftw3.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
AC_MSG_CHECKING([if FFTW package is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
- AC_MSG_NOTICE([no -- some components failed test])
+ AC_MSG_RESULT([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_NOTICE([yes])
+ AC_MSG_RESULT([yes])
have_fftw='yes'
fi
else
- AC_MSG_NOTICE([no])
+ AC_MSG_RESULT([no])
fi
fi
AM_CONDITIONAL(FFTW_DELEGATE, test "$have_fftw" = 'yes')
have_fpx='no'
FPX_LIBS=''
+SAVED_LIBS=${LIBS}
+LIBS=${LIBS/-ldjvulibre/}
if test "$with_fpx" != 'no'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for FlashPIX])
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
failed=0
passed=0
AC_LANG_PUSH(C++)
AC_MSG_CHECKING([if FlashPIX package is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
- AC_MSG_NOTICE([no -- some components failed test])
+ AC_MSG_RESULT([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_NOTICE([yes])
+ AC_MSG_RESULT([yes])
have_fpx='yes'
PERLMAINCC="$CXX"
fi
else
- AC_MSG_NOTICE([no])
+ AC_MSG_RESULT([no])
fi
fi
AM_CONDITIONAL(FPX_DELEGATE, test "$have_fpx" = 'yes')
AC_SUBST(FPX_LIBS)
+LIBS=${SAVED_LIBS}
dnl ===========================================================================
FONTCONFIG_LIBS=""
FONTCONFIG_PKG=""
if test "x$with_fontconfig" = "xyes"; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
PKG_CHECK_MODULES(FONTCONFIG,[fontconfig >= 2.1.0], have_fontconfig=yes, have_fontconfig=no)
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
fi
if test "$have_fontconfig" = 'yes'; then
dnl ===========================================================================
#
-# Check for freetype delegate library.
+# Check for the Freetype delegate library.
#
AC_ARG_WITH([freetype],
[AC_HELP_STRING([--without-freetype],
[with_freetype=$withval],
[with_freetype='yes'])
-
if test "$with_freetype" != 'yes'; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-freetype=$with_freetype "
fi
have_freetype='no'
-FREETYPE_LIBS=''
-if test "$with_freetype" != 'no'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
- AC_MSG_CHECKING(for FreeType 2.0 )
- AC_MSG_NOTICE()
- failed=0
- passed=0
- PERSIST_LDFLAGS="$LDFLAGS"
- PERSIST_CPPFLAGS="$CPPFLAGS"
- 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`
- 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 "$have_freetype_h" = 'yes'; then
- passed=`expr $passed + 1`
- else
- failed=`expr $failed + 1`
- CPPFLAGS="$PERSIST_CPPFLAGS"
- fi
+FREETYPE_CFLAGS=""
+FREETYPE_LIBS=""
+FREETYPE_PKG=""
+if test "x$with_freetype" = "xyes"; then
+ AC_MSG_RESULT([-------------------------------------------------------------])
+ PKG_CHECK_MODULES(FREETYPE,[freetype2], have_freetype=yes, have_freetype=no)
+ AC_MSG_RESULT([])
+fi
- AC_MSG_CHECKING(if FreeType package is complete)
- if test $passed -gt 0; then
- 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_NOTICE(no)
- fi
+if test "$have_freetype" = 'yes'; then
+ AC_DEFINE(FREETYPE_DELEGATE,1,Define if you have FREETYPE library)
+ CFLAGS="$FREETYPE_CFLAGS $CFLAGS"
fi
+
AM_CONDITIONAL(FREETYPE_DELEGATE, test "$have_freetype" = 'yes')
+AC_SUBST(FREETYPE_CFLAGS)
AC_SUBST(FREETYPE_LIBS)
dnl ===========================================================================
# or -framework Ghostscript
AC_ARG_WITH([gslib],
- [AC_HELP_STRING([--without-gslib],
+ [AC_HELP_STRING([--with-gslib],
[enable Ghostscript library support])],
[with_gslib=$withval],
[with_gslib='no'])
have_gslib='no'
GS_LIBS=''
if test "$with_gslib" != 'no'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for Ghostscript])
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
framework=0
failed=0
passed=0
AC_MSG_CHECKING([if Ghostscript package is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
- AC_MSG_NOTICE([no -- some components failed test])
+ AC_MSG_RESULT([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_NOTICE([yes, using framework.])
+ AC_MSG_RESULT([yes, using framework.])
else
- AC_MSG_NOTICE([yes, using library.])
+ AC_MSG_RESULT([yes, using library.])
GS_LIBS='-lgs'
fi
LIBS="$GS_LIBS $LIBS"
have_gslib='yes'
fi
else
- AC_MSG_NOTICE([no])
+ AC_MSG_RESULT([no])
fi
fi
AM_CONDITIONAL(GS_DELEGATE, test "$have_gslib" = 'yes')
if test "$with_fontpath" != "yes" && test -z "$with_fontpath"; then
with_fontpath=''
else
- AC_DEFINE_UNQUOTED(MAGICK_FONT_PATH,"$with_fontpath",Define to prepend to default font search path.)
+ AC_DEFINE_UNQUOTED(MAGICK_FONT_PATH,"$with_fontpath",[Define to prepend to default font search path.])
fi
if test "$with_fontpath=" != ''; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-fontpath=$with_fontpath "
#
AC_ARG_WITH(gvc,
[AC_HELP_STRING([--with-gvc],
- [disable GVC support])],
+ [enable GVC support])],
[with_gvc=$withval],
[with_gvc='no'])
GVC_PKG=""
if test "x$with_gvc" = "xyes"; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
PKG_CHECK_MODULES(GVC,[libgvc >= 2.9.0], have_gvc=yes, have_gvc=no)
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
fi
if test "$have_gvc" = 'yes'; then
have_jbig='no'
JBIG_LIBS=''
if test "$with_jbig" != 'no'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for JBIG])
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
failed=0
passed=0
AC_CHECK_HEADER(jbig.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
AC_MSG_CHECKING([if JBIG package is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
- AC_MSG_NOTICE([no -- some components failed test])
+ AC_MSG_RESULT([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_NOTICE([yes])
+ AC_MSG_RESULT([yes])
have_jbig='yes'
fi
else
- AC_MSG_NOTICE([no])
+ AC_MSG_RESULT([no])
fi
fi
AM_CONDITIONAL(JBIG_DELEGATE, test "$have_jbig" = 'yes')
have_jpeg='no'
JPEG_LIBS=''
if test "$with_jpeg" != 'no'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for JPEG])
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
failed=0
passed=0
AC_CHECK_HEADER(jconfig.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
AC_MSG_CHECKING([if JPEG package is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
- AC_MSG_NOTICE([no -- some components failed test])
+ AC_MSG_RESULT([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_NOTICE([yes])
+ AC_MSG_RESULT([yes])
have_jpeg='yes'
fi
else
- AC_MSG_NOTICE([no])
+ AC_MSG_RESULT([no])
fi
fi
AM_CONDITIONAL(JPEG_DELEGATE, test "$have_jpeg" = 'yes')
dnl ===========================================================================
-#
-# Check for JPEG Version 2 delegate library.
-#
-AC_ARG_WITH([jp2],
- [AC_HELP_STRING([--without-jp2],
- [disable JPEG-2000 support])],
- [with_jp2=$withval],
- [with_jp2='yes'])
-
-if test "$with_jp2" != 'yes'; then
- DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-jp2=$with_jp2 "
-fi
-
-have_jp2='no'
-JP2_LIBS=''
-if test "$with_jp2" != 'no'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
- AC_MSG_CHECKING([for JPEG Version 2])
- AC_MSG_NOTICE([])
- failed=0
- passed=0
- AC_CHECK_HEADER(jasper/jasper.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
- AC_CHECK_LIB(jasper,jas_stream_fopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
- 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_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_NOTICE([yes])
- have_jp2='yes'
- fi
- else
- AC_MSG_NOTICE([no])
- fi
-fi
-AM_CONDITIONAL(JP2_DELEGATE, test "$have_jp2" = 'yes')
-AC_SUBST(JP2_LIBS)
-
-dnl ===========================================================================
-
#
# Check for LCMS delegate library.
#
have_lcms2='no'
LCMS_LIBS=''
if test "$with_lcms2" != 'no'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for LCMS v2])
- AC_MSG_NOTICE()
+ AC_MSG_RESULT()
failed=0
passed=0
have_lcms_header='no'
AC_MSG_CHECKING(if LCMS v2 package is complete)
if test $passed -gt 0; then
if test $failed -gt 0; then
- AC_MSG_NOTICE(no -- some components failed test)
+ AC_MSG_RESULT(no -- some components failed test)
have_lcms2='no (failed tests)'
else
LCMS_LIBS='-llcms2'
LIBS="$LCMS_LIBS $LIBS"
- AC_MSG_NOTICE(yes)
+ AC_MSG_RESULT(yes)
have_lcms2='yes'
fi
else
- AC_MSG_NOTICE(no)
+ AC_MSG_RESULT(no)
fi
fi
have_lcms='no'
if test "$with_lcms" != 'no'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for LCMS v1.1X])
- AC_MSG_NOTICE()
+ AC_MSG_RESULT()
failed=0
passed=0
have_lcms_header='no'
AC_MSG_CHECKING(if LCMS package is complete)
if test $passed -gt 0; then
if test $failed -gt 0; then
- AC_MSG_NOTICE(no -- some components failed test)
+ AC_MSG_RESULT(no -- some components failed test)
have_lcms='no (failed tests)'
else
LCMS_LIBS='-llcms'
LIBS="$LCMS_LIBS $LIBS"
- AC_MSG_NOTICE(yes)
+ AC_MSG_RESULT(yes)
have_lcms='yes'
fi
else
- AC_MSG_NOTICE(no)
+ AC_MSG_RESULT(no)
fi
fi
AC_SUBST(LCMS_LIBS)
+dnl ===========================================================================
+
+#
+# Check for the OpenJP2 delegate library.
+#
+AC_ARG_WITH([openjp2],
+ [AC_HELP_STRING([--without-openjp2],
+ [disable OpenJP2 support])],
+ [with_openjp2=$withval],
+ [with_openjp2='yes'])
+
+if test "$with_openjp2" != 'yes'; then
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-openjp2=$with_openjp2 "
+fi
+
+have_openjp2='no'
+LIBOPENJP2_CFLAGS=""
+LIBOPENJP2_LIBS=""
+LIBOPENJP2_PKG=""
+if test "x$with_openjp2" = "xyes"; then
+ AC_MSG_RESULT([-------------------------------------------------------------])
+ PKG_CHECK_MODULES(LIBOPENJP2,[libopenjp2 >= 2.1.0], have_openjp2=yes, have_openjp2=no)
+ AC_MSG_RESULT([])
+fi
+
+if test "$have_openjp2" = 'yes'; then
+ AC_DEFINE(LIBOPENJP2_DELEGATE,1,Define if you have OPENJP2 library)
+ if test "$build_modules" = 'no'; then
+ CFLAGS="$LIBOPENJP2_CFLAGS $CFLAGS"
+ fi
+fi
+
+AM_CONDITIONAL(LIBOPENJP2_DELEGATE, test "$have_openjp2" = 'yes')
+AC_SUBST(LIBOPENJP2_CFLAGS)
+AC_SUBST(LIBOPENJP2_LIBS)
+
+
dnl ===========================================================================
#
LQR_LIBS=""
LQR_PKG=""
if test "x$with_lqr" = "xyes"; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
PKG_CHECK_MODULES(LQR,[lqr-1 >= 0.1.0], have_lqr=yes, have_lqr=no)
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
fi
if test "$have_lqr" = 'yes'; then
# Disable LZMA (lzma library)
AC_ARG_WITH(lzma,
- [ --without-lzma disable LZMA support],
- [with_lzma=$withval],
- [with_lzma='yes'])
+ [ --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
LZMA_PKG=""
if test "x$with_lzma" = "xyes"; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
PKG_CHECK_MODULES(LZMA,[liblzma >= 2.9.0], have_lzma=yes, have_lzma=no)
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
fi
if test "$have_lzma" = 'yes'; then
OPENEXR_LIBS=""
OPENEXR_PKG=""
if test "x$with_openexr" = "xyes"; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
PKG_CHECK_MODULES(OPENEXR,[OpenEXR >= 1.0.6], have_openexr=yes, have_openexr=no)
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
fi
if test "$have_openexr" = 'yes'; then
PNG_LIBS=''
if test "$with_png" != 'no' -a "$have_zlib" != 'no' ; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING(for PNG support )
- AC_MSG_NOTICE()
+ AC_MSG_RESULT()
failed=0
passed=0
AC_CHECK_HEADER(png.h,passed=`expr $passed + 1`,
failed=`expr $failed + 1`,)
if test $passed -gt 0; then
- for var in 5 4 2 '' ; do
+ for var in 7 6 5 4 2 '' ; do
if test "$have_png" = 'no' ; then
if test "x${var}" = 'x' ; then
pnglib='png'
ac_cv_libpng_ok='no')
if test "$ac_cv_libpng_ok" = 'yes' ; then
passed=`expr $passed + 1`
- AC_MSG_NOTICE(yes)
+ AC_MSG_RESULT(yes)
else
failed=`expr $failed + 1`
- AC_MSG_NOTICE(no)
+ AC_MSG_RESULT(no)
fi
else
passed=`expr $passed + 1`
- AC_MSG_NOTICE(yes)
+ AC_MSG_RESULT(yes)
fi
fi
if test $passed -gt 0 -a $failed -le 0; then
+ if test "1${var}" = '17' ; then
+ AC_CHECK_LIB(png17,png_get_io_ptr,passed=`expr $passed + 1`,
+ failed=`expr $failed + 1`,)
+ AC_CHECK_LIB(png17,png_longjmp,passed=`expr $passed + 1`,
+ failed=`expr $failed + 1`,)
+ fi
+ if test "1${var}" = '16' ; then
+ AC_CHECK_LIB(png16,png_get_io_ptr,passed=`expr $passed + 1`,
+ failed=`expr $failed + 1`,)
+ AC_CHECK_LIB(png16,png_longjmp,passed=`expr $passed + 1`,
+ failed=`expr $failed + 1`,)
+ fi
if test "1${var}" = '15' ; then
AC_CHECK_LIB(png15,png_get_io_ptr,passed=`expr $passed + 1`,
failed=`expr $failed + 1`,)
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)
+ AC_MSG_RESULT(no -- some components failed test)
have_png='no (failed tests)'
else
PNG_LIBS="-l${pnglib}"
LIBS="$PNG_LIBS $LIBS"
AC_DEFINE(PNG_DELEGATE,1,Define if you have PNG library)
- AC_MSG_NOTICE(yes)
+ AC_MSG_RESULT(yes)
have_png='yes'
fi
fi
# Check for RSVG delegate library.
#
AC_ARG_WITH([rsvg],
- [AC_HELP_STRING([--without-rsvg],
+ [AC_HELP_STRING([--with-rsvg],
[enable RSVG support])],
[with_rsvg=$withval],
[with_rsvg='no'])
RSVG_LIBS=""
RSVG_PKG=""
if test "x$with_rsvg" = "xyes"; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
PKG_CHECK_MODULES(RSVG,[librsvg-2.0 >= 2.9.0], have_rsvg=yes, have_rsvg=no)
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
PKG_CHECK_MODULES(CAIRO_SVG, cairo-svg, have_cairo=yes, have_cairo=no)
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
fi
if test "$have_rsvg" = 'yes'; then
have_tiff='no'
TIFF_LIBS=''
if test "$with_tiff" != 'no'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for TIFF])
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
failed=0
passed=0
AC_CHECK_HEADER(tiff.h,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_NOTICE([no -- some components failed test])
+ AC_MSG_RESULT([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_NOTICE([yes])
+ AC_MSG_RESULT([yes])
have_tiff='yes'
AC_CHECK_HEADERS(tiffconf.h)
AC_CHECK_FUNCS([TIFFIsCODECConfigured TIFFMergeFieldInfo \
TIFFSwabArrayOfTriples])
fi
else
- AC_MSG_NOTICE([no])
+ AC_MSG_RESULT([no])
fi
fi
AM_CONDITIONAL(TIFF_DELEGATE, test "$have_tiff" = 'yes')
have_webp='no'
WEBP_LIBS=''
if test "$with_webp" != 'no'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for WEBP])
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
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_CHECK_LIB(webp,WebPPictureInitInternal,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])
+ AC_MSG_RESULT([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])
+ AC_MSG_RESULT([yes])
have_webp='yes'
fi
else
- AC_MSG_NOTICE([no])
+ AC_MSG_RESULT([no])
fi
fi
AM_CONDITIONAL(WEBP_DELEGATE,test "$have_webp" = 'yes')
have_xml='no'
XML_LIBS=''
if test "$with_xml" != 'no'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for XML])
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
PERSIST_LDFLAGS=$LDFLAGS
PERSIST_CPPFLAGS=$CPPFLAGS
xml2_config=''
AC_MSG_CHECKING([if XML package is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
- AC_MSG_NOTICE([no -- some components failed test])
+ AC_MSG_RESULT([no -- some components failed test])
have_xml='no (failed tests)'
LDFLAGS="$PERSIST_LDFLAGS"
CPPFLAGS="$PERSIST_CPPFLAGS"
XML_LIBS='-lxml2'
LIBS="$XML_LIBS $LIBS"
AC_DEFINE(XML_DELEGATE,1,Define if you have XML library)
- AC_MSG_NOTICE([yes])
+ AC_MSG_RESULT([yes])
have_xml='yes'
fi
else
- AC_MSG_NOTICE([no])
+ AC_MSG_RESULT([no])
fi
fi
AM_CONDITIONAL(XML_DELEGATE,test "$have_xml" = 'yes')
#
# Path to ImageMagick header files
-INCLUDE_RELATIVE_PATH="ImageMagick"
-INCLUDE_PATH="${INCLUDEARCH_DIR}/${INCLUDE_RELATIVE_PATH}"
-DEFINE_INCLUDE_PATH="${INCLUDEARCH_DIR}/${INCLUDE_RELATIVE_PATH}/"
+INCLUDE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}"
+INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}"
+DEFINE_INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}/"
case "${build_os}" in
mingw* )
DEFINE_INCLUDE_PATH=`$WinPathScript "$DEFINE_INCLUDE_PATH" 1`
;;
esac
-AC_DEFINE_UNQUOTED(INCLUDE_PATH,"$DEFINE_INCLUDE_PATH",Directory where ImageMagick headers live.)
+AC_DEFINE_UNQUOTED(INCLUDE_PATH,"$DEFINE_INCLUDE_PATH",[Directory where ImageMagick headers live.])
AC_SUBST(INCLUDE_PATH)
+# Path to ImageMagick header files (arch part)
+INCLUDEARCH_PATH="${INCLUDEARCH_DIR}/${INCLUDE_RELATIVE_PATH}"
+DEFINE_INCLUDEARCH_PATH="${INCLUDEARCH_DIR}/${INCLUDE_RELATIVE_PATH}/"
+case "${build_os}" in
+ mingw* )
+ DEFINE_INCLUDEARCH_PATH=`$WinPathScript "$DEFINE_INCLUDEARCH_PATH" 1`
+ ;;
+esac
+AC_DEFINE_UNQUOTED(INCLUDEARCH_PATH,"$DEFINE_INCLUDE_PATH",[Directory where ImageMagick architecture headers live.])
+AC_SUBST(INCLUDEARCH_PATH)
+
# Subdirectory under lib to place ImageMagick lib files
LIBRARY_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
-AC_DEFINE_UNQUOTED(LIBRARY_RELATIVE_PATH,"$LIBRARY_RELATIVE_PATH",Subdirectory of lib where ImageMagick architecture dependent files are installed)
+AC_DEFINE_UNQUOTED(LIBRARY_RELATIVE_PATH,"$LIBRARY_RELATIVE_PATH",[Subdirectory of lib where ImageMagick architecture dependent files are installed.])
# Path to ImageMagick bin directory
EXECUTABLE_PATH="${BIN_DIR}"
DEFINE_EXECUTABLE_PATH=`$WinPathScript "$DEFINE_EXECUTABLE_PATH" 1`
;;
esac
-AC_DEFINE_UNQUOTED(EXECUTABLE_PATH,"$DEFINE_EXECUTABLE_PATH",Directory where executables are installed.)
+AC_DEFINE_UNQUOTED(EXECUTABLE_PATH,"$DEFINE_EXECUTABLE_PATH",[Directory where executables are installed.])
AC_SUBST(EXECUTABLE_PATH)
# Path to ImageMagick lib
DEFINE_LIBRARY_PATH=`$WinPathScript "$DEFINE_LIBRARY_PATH" 1`
;;
esac
-AC_DEFINE_UNQUOTED(LIBRARY_PATH,"$DEFINE_LIBRARY_PATH",Directory where architecture-dependent files live.)
+AC_DEFINE_UNQUOTED(LIBRARY_PATH,"$DEFINE_LIBRARY_PATH",[Directory where architecture-dependent files live.])
AC_SUBST(LIBRARY_PATH)
+#
+# path to local binaries
+if test "x$LIB_BIN_BASEDIRNAME" = "x"; then
+ LIB_BIN_BASEDIRNAME="bin"
+fi
+AC_DEFINE_UNQUOTED(LIB_BIN_BASEDIRNAME,"$LIB_BIN_BASEDIRNAME",[Binaries in libraries path base name (will be during install linked to bin)])
+AC_SUBST(LIB_BIN_BASEDIRNAME)
+
+if test "x$LIB_BIN_DIR" = "x"; then
+ LIB_BIN_DIR=${LIB_BIN_BASEDIRNAME}-${MAGICK_ABI_SUFFIX}
+fi
+AC_SUBST(LIB_BIN_DIR)
+
+LIB_BIN_DIR_RELATIVE_PATH=$LIB_BIN_DIR
+AC_SUBST(LIB_BIN_DIR_RELATIVE_PATH)
+LIB_BIN_DIR_PATH="${LIBRARY_PATH}/${LIB_BIN_DIR_RELATIVE_PATH}"
+AC_SUBST(LIB_BIN_DIR_PATH)
+
#
# path to modules lib
if test "x$MODULES_BASEDIRNAME" = "x"; then
MODULES_BASEDIRNAME="modules"
fi
-AC_DEFINE_UNQUOTED(MODULES_BASEDIRNAME,"$MODULES_BASEDIRNAME",Module directory name without ABI part.)
+AC_DEFINE_UNQUOTED(MODULES_BASEDIRNAME,"$MODULES_BASEDIRNAME",[Module directory name without ABI part.])
AC_SUBST(MODULES_BASEDIRNAME)
if test "x$MODULES_DIRNAME" = "x"; then
- MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${MAGICK_ABISUFFIX}
+ MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${MAGICK_ABI_SUFFIX}
else
- # not defined by default
- AC_DEFINE_UNQUOTED(MODULES_DIRNAME,"$MODULES_DIRNAME",Module directory dirname (if different of default)")
+ AC_DEFINE_UNQUOTED(MODULES_DIRNAME,"$MODULES_DIRNAME",[Module directory dirname])
fi
AC_SUBST(MODULES_DIRNAME)
-MODULES_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/${MODULES_DIRNAME}"
+MODULES_RELATIVE_PATH="${MODULES_DIRNAME}"
AC_SUBST(MODULES_RELATIVE_PATH)
MODULES_PATH="${LIBRARY_PATH}/${MODULES_RELATIVE_PATH}"
AC_SUBST(MODULES_PATH)
if test "x$CODER_DIRNAME" = "x"; then
CODER_DIRNAME="coders"
fi
-AC_DEFINE_UNQUOTED(CODER_DIRNAME,"$CODER_DIRNAME","coders subdirectory".)
+AC_DEFINE_UNQUOTED(CODER_DIRNAME,"$CODER_DIRNAME",[coders subdirectory.])
AC_SUBST(CODER_DIRNAME)
-CODER_RELATIVE_PATH="${MODULES_RELATIVE_PATH}/${CODER_DIRNAME}"
+CODER_RELATIVE_PATH="${CODER_DIRNAME}"
CODER_PATH="${MODULES_PATH}/${CODER_DIRNAME}"
AC_SUBST(CODER_PATH)
if test "x$FILTER_DIRNAME" = "x"; then
FILTER_DIRNAME="filters"
fi
-AC_DEFINE_UNQUOTED(FILTER_DIRNAME,"$FILTER_DIRNAME","filter subdirectory".)
+AC_DEFINE_UNQUOTED(FILTER_DIRNAME,"$FILTER_DIRNAME",[filter subdirectory.])
AC_SUBST(FILTER_DIRNAME)
-FILTER_RELATIVE_PATH="${MODULES_RELATIVE_PATH}/${FILTER_DIRNAME}"
+FILTER_RELATIVE_PATH="${FILTER_DIRNAME}"
FILTER_PATH="${MODULES_PATH}/${FILTER_DIRNAME}"
AC_SUBST(FILTER_PATH)
#
# Path to ImageMagick documentation files
-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
+DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}"
DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
case "${build_os}" in
DEFINE_DOCUMENTATION_PATH=`$WinPathScript "$DEFINE_DOCUMENTATION_PATH" 1`
;;
esac
-AC_DEFINE_UNQUOTED(DOCUMENTATION_PATH,"$DEFINE_DOCUMENTATION_PATH",Directory where ImageMagick documents live.)
+AC_DEFINE_UNQUOTED(DOCUMENTATION_PATH,"$DEFINE_DOCUMENTATION_PATH",[Directory where ImageMagick documents live.])
AC_SUBST(DOCUMENTATION_PATH)
+#
+# Enable/Disable documentation
+AC_ARG_ENABLE([docs],
+ [AS_HELP_STRING([--disable-docs],
+ [disable building of documentation])],
+ wantdocs=$enableval, wantdocs=yes)
+AM_CONDITIONAL([INSTALL_DOC], [test "$wantdocs" = "yes"])
+
# Subdirectory to place architecture-dependent 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_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}"
+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
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_DEFINE_UNQUOTED(CONFIGURE_PATH,"$DEFINE_CONFIGURE_PATH",[Directory where architecture-dependent configuration files live.])
AC_SUBST(CONFIGURE_PATH)
# Subdirectory to place architecture-independent 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_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}"
+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
DEFINE_SHARE_PATH=`$WinPathScript "$DEFINE_SHARE_PATH" 1`
;;
esac
-AC_DEFINE_UNQUOTED(SHARE_PATH,"$DEFINE_SHARE_PATH",Directory where architecture-independent configuration files live.)
+AC_DEFINE_UNQUOTED(SHARE_PATH,"$DEFINE_SHARE_PATH",[Directory where architecture-independent configuration files live.])
AC_SUBST(SHARE_PATH)
-# Subdirectory to place architecture-dependent configuration files
-SHAREARCH_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/config"
-AC_DEFINE_UNQUOTED(SHAREARCH_RELATIVE_PATH,"$SHAREARCH_RELATIVE_PATH",Subdirectory of lib where architecture-independent configuration files live.)
-SHAREARCH_PATH="${SHAREARCH_DIR}/${SHAREARCH_RELATIVE_PATH}"
-DEFINE_SHAREARCH_PATH="${SHAREARCH_DIR}/${SHAREARCH_RELATIVE_PATH}/"
-case "${build_os}" in
- mingw* )
- DEFINE_SHAREARCH_PATH=`$WinPathScript "$DEFINE_SHAREARCH_PATH" 1`
- ;;
-esac
-AC_DEFINE_UNQUOTED(SHAREARCH_PATH,"$DEFINE_SHAREARCH_PATH",Directory where architecture-independent configuration files live.)
+#
+# Subdirectory to place architecture-dependent configuration files.
+if test "x$SHAREARCH_BASEDIRNAME" = "x"; then
+ SHAREARCH_BASEDIRNAME="config"
+fi
+AC_DEFINE_UNQUOTED(SHAREARCH_BASEDIRNAME,"$SHAREARCH_BASEDIRNAME",[Sharearch directory name without ABI part.])
+AC_SUBST(SHAREARCH_BASEDIRNAME)
+
+if test "x$SHAREARCH_DIRNAME" = "x"; then
+ SHAREARCH_DIRNAME=${SHAREARCH_BASEDIRNAME}-${MAGICK_ABI_SUFFIX}
+else
+ AC_DEFINE_UNQUOTED(SHAREARCH_DIRNAME,"$SHAREARCH_DIRNAME",[Sharearch directory dirname])
+fi
+AC_SUBST(SHAREARCH_DIRNAME)
+
+SHAREARCH_RELATIVE_PATH="${SHAREARCH_DIRNAME}"
+AC_SUBST(SHAREARCH_RELATIVE_PATH)
+SHAREARCH_PATH="${LIBRARY_PATH}/${SHAREARCH_RELATIVE_PATH}"
AC_SUBST(SHAREARCH_PATH)
#
configure_transform_name=`echo ${program_transform_name} | sed 's,\\$\\$,$,'`
# Default delegate definitions
-AC_MSG_NOTICE([-------------------------------------------------------------])
+AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for ImageMagick delegate programs])
-AC_MSG_NOTICE([])
+AC_MSG_RESULT([])
AutotraceDecodeDelegateDefault='autotrace'
BlenderDecodeDelegateDefault='blender'
BZIPDelegateDefault='bzip2'
BrowseDelegateDefault='xdg-open'
-CGMDecodeDelegateDefault='ralcgm'
CatDelegateDefault='cat'
DNGDecodeDelegateDefault='ufraw-batch'
+DOCDecodeDelegateDefault='soffice'
GVCDecodeDelegateDefault='dot'
DVIDecodeDelegateDefault='dvips'
EchoDelegateDefault='echo'
EditorDelegateDefault='xterm'
-FIGDecodeDelegateDefault='fig2dev'
ConvertDelegateDefault=`echo convert | sed ${configure_transform_name}`
DisplayDelegateDefault=`echo display | sed ${configure_transform_name}`
MogrifyDelegateDefault=`echo mogrify | sed ${configure_transform_name}`
HTMLDecodeDelegateDefault='html2ps'
ILBMDecodeDelegateDefault='ilbmtoppm'
ILBMEncodeDelegateDefault='ppmtoilbm'
+JXRDecodeDelegateDefault='JxrDecApp'
+JXREncodeDelegateDefault='JxrEncApp'
LPDelegateDefault='lp'
LPRDelegateDefault='lpr'
LaunchDelegateDefault='gimp'
MANDelegateDefault='groff'
-MPEGDecodeDelegateDefault='ffmpeg'
-MPEGEncodeDelegateDefault='ffmpeg'
+MPEGDecodeDelegateDefault='avconv'
+MPEGEncodeDelegateDefault='avconv'
MrSIDDecodeDelegateDefault='mrsidgeodecode'
MVDelegateDefault='mv'
PCLDelegateDefault='pcl6'
SVGDecodeDelegateDefault='inkscape'
TXTDelegateDefault='enscript'
UniconvertorDelegateDefault='uniconvertor'
+WebPDecodeDelegateDefault='dwebp'
+WebPEncodeDelegateDefault='cwebp'
WMFDecodeDelegateDefault='wmf2eps'
WWWDecodeDelegateDefault='curl'
XPSDelegateDefault='gxps'
AC_PATH_PROG(BlenderDecodeDelegate, "$BlenderDecodeDelegateDefault", "$BlenderDecodeDelegateDefault")
AC_PATH_PROG(BZIPDelegate, "$BZIPDelegateDefault", "$BZIPDelegateDefault")
AC_PATH_PROGS(BrowseDelegate, "$BrowseDelegateDefault" google-chrome firefox konqueror mozilla lynx, "$BrowseDelegateDefault")
-AC_PATH_PROG(CGMDecodeDelegate, "$CGMDecodeDelegateDefault", "$CGMDecodeDelegateDefault")
AC_PATH_PROG(CatDelegate, "$CatDelegateDefault", "$CatDelegateDefault")
AC_PATH_PROG(DNGDecodeDelegate, "$DNGDecodeDelegateDefault", "$DNGDecodeDelegateDefault")
-AC_PATH_PROG(GVCDecodeDelegate, "$GVCDecodeDelegateDefault", "$GVCDecodeDelegateDefault")
+AC_PATH_PROG(DOCDecodeDelegate, "$DOCDecodeDelegateDefault", "$DOCDecodeDelegateDefault")
AC_PATH_PROG(DVIDecodeDelegate, "$DVIDecodeDelegateDefault", "$DVIDecodeDelegateDefault")
-AC_PATH_PROG(EchoDelegate, "$EchoDelegateDefault", "$EchoDelegateDefault")
-AC_PATH_PROG(EditorDelegate, "$EditorDelegateDefault", "$EditorDelegateDefault")
-AC_PATH_PROG(FIGDecodeDelegate, "$FIGDecodeDelegateDefault", "$FIGDecodeDelegateDefault")
AC_PATH_PROG(ConvertDelegate, "$ConvertDelegateDefault", "$ConvertDelegateDefault")
AC_PATH_PROG(DisplayDelegate, "$DisplayDelegateDefault", "$DisplayDelegateDefault")
-AC_PATH_PROG(MogrifyDelegate, "$MogrifyDelegateDefault", "$MogrifyDelegateDefault")
+AC_PATH_PROG(EchoDelegate, "$EchoDelegateDefault", "$EchoDelegateDefault")
+AC_PATH_PROG(EditorDelegate, "$EditorDelegateDefault", "$EditorDelegateDefault")
AC_PATH_PROG(GnuplotDecodeDelegate, "$GnuplotDecodeDelegateDefault", "$GnuplotDecodeDelegateDefault")
+AC_PATH_PROG(GVCDecodeDelegate, "$GVCDecodeDelegateDefault", "$GVCDecodeDelegateDefault")
AC_PATH_PROG(HPGLDecodeDelegate, "$HPGLDecodeDelegateDefault", "$HPGLDecodeDelegateDefault")
AC_PATH_PROG(HTMLDecodeDelegate, "$HTMLDecodeDelegateDefault", "$HTMLDecodeDelegateDefault")
AC_PATH_PROG(ILBMDecodeDelegate, "$ILBMDecodeDelegateDefault", "$ILBMDecodeDelegateDefault")
AC_PATH_PROG(ILBMEncodeDelegate, "$ILBMEncodeDelegateDefault", "$ILBMEncodeDelegateDefault")
+AC_PATH_PROG(JXRDecodeDelegate, "$JXRDecodeDelegateDefault", "$JXRDecodeDelegateDefault")
+AC_PATH_PROG(JXREncodeDelegate, "$JXREncodeDelegateDefault", "$JXREncodeDelegateDefault")
AC_PATH_PROG(LPDelegate, "$LPDelegateDefault", no)
AC_PATH_PROG(LPRDelegate, "$LPRDelegateDefault", "$LPRDelegateDefault")
AC_PATH_PROG(LaunchDelegate, "$LaunchDelegateDefault", "$LaunchDelegateDefault")
AC_PATH_PROG(MANDelegate, "$MANDelegateDefault", "$MANDelegateDefault")
+AC_PATH_PROG(MogrifyDelegate, "$MogrifyDelegateDefault", "$MogrifyDelegateDefault")
AC_PATH_PROG(MPEGDecodeDelegate, "$MPEGDecodeDelegateDefault", "$MPEGDecodeDelegateDefault")
+if test "$MPEGDecodeDelegate" == "$MPEGDecodeDelegateDefault" ; then
+ MPEGDecodeDelegateDefault='ffmpeg'
+ AC_PATH_PROG(MPEGDecodeDelegate, "$MPEGDecodeDelegateDefault", "$MPEGDecodeDelegateDefault")
+fi;
AC_PATH_PROG(MPEGEncodeDelegate, "$MPEGEncodeDelegateDefault", "$MPEGEncodeDelegateDefault")
+if test "$MPEGEncodeDelegate" == "$MPEGEncodeDelegateDefault" ; then
+ MPEGEncodeDelegateDefault='ffmpeg'
+ AC_PATH_PROG(MPEGEncodeDelegate, "$MPEGEncodeDelegateDefault", "$MPEGEncodeDelegateDefault")
+fi;
AC_PATH_PROG(MrSIDDecodeDelegate, "$MrSIDDecodeDelegateDefault", "$MrSIDDecodeDelegateDefault")
AC_PATH_PROG(MVDelegate, "$MVDelegateDefault", "$MVDelegateDefault")
AC_PATH_PROG(PCLDelegate, "$PCLDelegateDefault", "$PCLDelegateDefault")
AC_PATH_PROG(SVGDecodeDelegate, "$SVGDecodeDelegateDefault", "$SVGDecodeDelegateDefault")
AC_PATH_PROG(TXTDelegate, "$TXTDelegateDefault", "$TXTDelegateDefault")
AC_PATH_PROG(UniconvertorDelegate, "$UniconvertorDelegateDefault", "$UniconvertorDelegateDefault")
+AC_PATH_PROG(WebPDecodeDelegate, "$WebPDecodeDelegateDefault", "$WebPDecodeDelegateDefault")
+AC_PATH_PROG(WebPEncodeDelegate, "$WebPEncodeDelegateDefault", "$WebPEncodeDelegateDefault")
AC_PATH_PROG(WMFDecodeDelegate, "$WMFDecodeDelegateDefault", "$WMFDecodeDelegateDefault")
AC_PATH_PROG(WWWDecodeDelegate, "$WWWDecodeDelegateDefault", "$WWWDecodeDelegateDefault")
AC_PATH_PROG(XPSDelegate, "$XPSDelegateDefault", "$XPSDelegateDefault")
MogrifyDelegate="${BIN_DIR}/${MogrifyDelegateDefault}"
# Set delegate booleans
-have_ffmpeg='no'; if test "$MPEGDecodeDelegate" != "$MPEGDecodeDelegateDefault" ; then have_ffmpeg='yes'; fi
-have_fig2dev='no' ; if test "$FIGDecodeDelegate" != "$FIGDecodeDelegateDefault" ; then have_fig2dev='yes'; fi
+have_avconv='no'; if test "$MPEGDecodeDelegate" != "$MPEGDecodeDelegateDefault" ; then have_avconv='yes'; fi
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_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_ralcgm='no' ; if test "$CGMDecodeDelegate" != "$CGMDecodeDelegateDefault" ; then have_ralcgm='yes'; fi
have_xps='no' ; if test "$XPSDelegate" != "$XPSDelegateDefault"; then have_xps='yes'; fi
#
fi
if test "${dejavu_font_dir}x" != 'x'; then
type_include_files="${type_include_files} "'<include file="type-dejavu.xml" />'
- AC_MSG_NOTICE([$dejavu_font_dir])
+ AC_MSG_RESULT([$dejavu_font_dir])
else
- AC_MSG_NOTICE([not found!]);
+ AC_MSG_RESULT([not found!]);
fi
AC_SUBST(dejavu_font_dir)
fi
if test "${ghostscript_font_dir}x" != 'x'; then
type_include_files="${type_include_files} "'<include file="type-ghostscript.xml" />'
- AC_MSG_NOTICE([$ghostscript_font_dir])
+ AC_MSG_RESULT([$ghostscript_font_dir])
else
- AC_MSG_NOTICE([not found!]);
+ AC_MSG_RESULT([not found!]);
fi
AC_SUBST(ghostscript_font_dir)
case "${build_os}" in
BlenderDecodeDelegate="$BlenderDecodeDelegateDefault"
BZIPDelegate="$BZIPDelegateDefault"
BrowseDelegate="$BrowseDelegateDefault"
- CGMDecodeDelegate="$CGMDecodeDelegateDefault"
CatDelegate="$CatDelegateDefault"
ConvertDelegate="$ConvertDelegateDefault"
- GVCDecodeDelegate="$GVCDecodeDelegateDefault"
+ DisplayDelegate="$DisplayDelegateDefault"
+ DNGDecodeDelegate="$DNGDecodeDelegateDefault"
+ DOCDecodeDelegate="$DOCDecodeDelegateDefault"
DVIDecodeDelegate="$DVIDecodeDelegateDefault"
EchoDelegate="$EchoDelegateDefault"
EditorDelegate="$EditorDelegateDefault"
- FIGDecodeDelegate="$FIGDecodeDelegateDefault"
GnuplotDecodeDelegate="$GnuplotDecodeDelegateDefault"
+ GVCDecodeDelegate="$GVCDecodeDelegateDefault"
HPGLDecodeDelegate="$HPGLDecodeDelegateDefault"
HTMLDecodeDelegate="$HTMLDecodeDelegateDefault"
ILBMDecodeDelegate="$ILBMDecodeDelegateDefault"
ILBMEncodeDelegate="$ILBMEncodeDelegateDefault"
+ JXRDecodeDelegate="$JXRDecodeDelegateDefault"
+ JXREncodeDelegate="$JXREncodeDelegateDefault"
LPDelegate="$LPDelegateDefault"
LaunchDelegate="$LaunchDelegateDefault"
MANDelegate="$MANDelegateDefault"
ShowImageDelegate="$ShowImageDelegateDefault"
TXTDelegate="$TXTDelegateDefault"
UniconvertorDelegate="$UniconvertorDelegateDefault"
+ WebPDecodeDelegate="$WebPDecodeDelegateDefault"
+ WebPEncodeDelegate="$WebPEncodeDelegateDefault"
WMFDecodeDelegate="$WMFDecodeDelegateDefault"
WWWDecodeDelegate="$WWWDecodeDelegateDefault"
XPSDelegate="$XPSDelegateDefault"
AC_SUBST(BlenderDecodeDelegate)
AC_SUBST(BZIPDelegate)
AC_SUBST(BrowseDelegate)
-AC_SUBST(CGMDecodeDelegate)
AC_SUBST(CatDelegate)
AC_SUBST(ConvertDelegate)
AC_SUBST(GVCDecodeDelegate)
AC_SUBST(DVIDecodeDelegate)
AC_SUBST(EchoDelegate)
AC_SUBST(EditorDelegate)
-AC_SUBST(FIGDecodeDelegate)
AC_SUBST(GnuplotDecodeDelegate)
AC_SUBST(HPGLDecodeDelegate)
AC_SUBST(HTMLDecodeDelegate)
AC_SUBST(ILBMDecodeDelegate)
AC_SUBST(ILBMEncodeDelegate)
+AC_SUBST(JXRDecodeDelegate)
+AC_SUBST(JXREncodeDelegate)
AC_SUBST(LPDelegate)
AC_SUBST(LaunchDelegate)
AC_SUBST(MANDelegate)
AC_SUBST(TXTDelegate)
AC_SUBST(UniconvertorDelegate)
AC_SUBST(WMFDecodeDelegate)
+AC_SUBST(WebPDecodeDelegate)
+AC_SUBST(WebPEncodeDelegate)
AC_SUBST(WWWDecodeDelegate)
AC_SUBST(XPSDelegate)
AC_SUBST(ZipDelegate)
PCLVersion='unknown'
fi
if test $have_pcl = 'yes'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for PCL])
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
# PCLColorDevice
AC_MSG_CHECKING([for pcl color device])
if $PCLDelegate -dBATCH -sDEVICE=$PCLColorDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
else
PCLColorDevice=ppmraw
fi
- AC_MSG_NOTICE([$PCLColorDevice])
+ AC_MSG_RESULT([$PCLColorDevice])
# PCLCMYKDevice
AC_MSG_CHECKING([for pcl CMYK device])
else
PCLCMYKDevice=$PCLColorDevice
fi
- AC_MSG_NOTICE([$PCLCMYKDevice])
+ AC_MSG_RESULT([$PCLCMYKDevice])
# PCLMonoDevice
AC_MSG_CHECKING([for pcl mono device])
else
PCLMonoDevice=$PCLColorDevice
fi
- AC_MSG_NOTICE([$PCLMonoDevice])
+ AC_MSG_RESULT([$PCLMonoDevice])
fi
AC_SUBST(PCLMonoDevice)
XPSVersion='unknown'
fi
if test $have_xps = 'yes'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for XPS])
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
# XPSColorDevice
AC_MSG_CHECKING([for xps color device])
if $XPSDelegate -dBATCH -sDEVICE=$XPSColorDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
else
XPSColorDevice=ppmraw
fi
- AC_MSG_NOTICE([$XPSColorDevice])
+ AC_MSG_RESULT([$XPSColorDevice])
# XPSCMYKDevice
AC_MSG_CHECKING([for xps CMYK device])
else
XPSCMYKDevice=$XPSColorDevice
fi
- AC_MSG_NOTICE([$XPSCMYKDevice])
+ AC_MSG_RESULT([$XPSCMYKDevice])
# XPSMonoDevice
AC_MSG_CHECKING([for xps mono device])
else
XPSMonoDevice=$XPSColorDevice
fi
- AC_MSG_NOTICE([$XPSMonoDevice])
+ AC_MSG_RESULT([$XPSMonoDevice])
fi
AC_SUBST(XPSMonoDevice)
GSCMYKDevice=pam
GSMonoDevice=pbmraw
GSPDFDevice=pdfwrite
-GSPSDevice=pswrite
+GSPSDevice=ps2write
GSEPSDevice=epswrite
GSVersion='unknown'
if test $have_gs = 'yes'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for Ghostscript])
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
AC_MSG_CHECKING([for Ghostscript version])
if GSVersion=`$PSDelegate --version`; then
:
else
GSVersion=`$PSDelegate --help | sed -e '1q' | awk '{ print $3 }'`
fi
- AC_MSG_NOTICE([$GSVersion])
+ AC_MSG_RESULT([$GSVersion])
# GSAlphaDevice
AC_MSG_CHECKING([for gs alpha device])
else
GSAlphaDevice=pnmraw
fi
- AC_MSG_NOTICE([$GSAlphaDevice])
+ AC_MSG_RESULT([$GSAlphaDevice])
# GSColorDevice
AC_MSG_CHECKING([for gs color device])
else
GSColorDevice=pnmraw
fi
- AC_MSG_NOTICE([$GSColorDevice])
+ AC_MSG_RESULT([$GSColorDevice])
# GSCMYKDevice
AC_MSG_CHECKING([for gs CMYK device])
else
GSCMYKDevice=bmpsep8
fi
- AC_MSG_NOTICE([$GSCMYKDevice])
+ AC_MSG_RESULT([$GSCMYKDevice])
# GSMonoDevice
AC_MSG_CHECKING([for gs mono device])
else
GSMonoDevice=$GSColorDevice
fi
- AC_MSG_NOTICE([$GSMonoDevice])
+ AC_MSG_RESULT([$GSMonoDevice])
# GSPDFDevice
AC_MSG_CHECKING([for gs PDF writing device])
else
GSPDFDevice=nodevice
fi
- AC_MSG_NOTICE([$GSPDFDevice])
+ AC_MSG_RESULT([$GSPDFDevice])
# GSPSDevice
AC_MSG_CHECKING([for gs PS writing device])
else
GSPSDevice=nodevice
fi
- AC_MSG_NOTICE([$GSPSDevice])
+ AC_MSG_RESULT([$GSPSDevice])
# GSEPSDevice
AC_MSG_CHECKING([for gs EPS writing device])
else
GSEPSDevice=nodevice
fi
- AC_MSG_NOTICE([$GSEPSDevice])
+ AC_MSG_RESULT([$GSEPSDevice])
fi
AC_SUBST(GSAlphaDevice)
# 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_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for Perl])
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
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
fi
AC_SUBST(MAGICKCORE_PATH)
-# Create a simple string containing format names for all delegate libraries
-DELEGATES=''
-if test "$have_autotrace" = 'yes'; then DELEGATES="$DELEGATES autotrace"; fi
-if test "$have_bzlib" = 'yes'; then DELEGATES="$DELEGATES bzlib"; fi
-if test "$have_djvu" = 'yes'; then DELEGATES="$DELEGATES djvu"; fi
-if test "$have_dps" = 'yes'; then DELEGATES="$DELEGATES dps"; fi
-if test "$have_fftw" = 'yes'; then DELEGATES="$DELEGATES fftw"; fi
-if test "$have_fpx" = 'yes'; then DELEGATES="$DELEGATES fpx"; fi
-if test "$have_fontconfig" = 'yes'; then DELEGATES="$DELEGATES fontconfig"; fi
-if test "$have_freetype" = 'yes'; then DELEGATES="$DELEGATES freetype"; fi
-if test "$have_gslib" = 'yes'; then DELEGATES="$DELEGATES gs"; fi
-if test "$have_gvc" = 'yes'; then DELEGATES="$DELEGATES gvc"; fi
-if test "$have_jbig" = 'yes'; then DELEGATES="$DELEGATES jbig"; fi
-if test "$have_jpeg" = 'yes'; then
- DELEGATES="$DELEGATES jpeg";
- 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_pango" = 'yes'; then DELEGATES="$DELEGATES pango"; fi
-if test "$have_png" = 'yes'; then DELEGATES="$DELEGATES png"; fi
-if test "$have_rsvg" = 'yes'; then DELEGATES="$DELEGATES rsvg"; fi
-if test "$have_tiff" = 'yes'; then DELEGATES="$DELEGATES tiff"; fi
-if test "$have_x" = 'yes'; then DELEGATES="$DELEGATES x11"; fi
-if test "$have_xml" = 'yes'; then DELEGATES="$DELEGATES xml"; fi
-if test "$have_wmf" = 'yes'; then DELEGATES="$DELEGATES wmf"; fi
-if test "$have_zlib" = 'yes'; then DELEGATES="$DELEGATES zlib"; fi
-
-AC_SUBST(DELEGATES)
+# Create a simple string containing format names for all delegate libraries.
+MAGICK_DELEGATES=''
+if test "$have_autotrace" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES autotrace"
+fi
+if test "$have_bzlib" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES bzlib"
+fi
+if test "$have_dps" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES dps"
+fi
+if test "$have_djvu" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES djvu"
+fi
+if test "$have_avconv" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES mpeg"
+fi
+if test "$have_fftw" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES fftw"
+fi
+if test "$have_fpx" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES fpx"
+fi
+if test "$have_fontconfig" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES fontconfig"
+fi
+if test "$have_freetype" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES freetype"
+fi
+if test "$have_gslib" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES gslib"
+fi
+if test "$have_jbig" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES jbig"
+fi
+if test "$have_png$have_jpeg" = 'yesyes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES jng"
+fi
+if test "$have_jp2" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES jp2"
+fi
+if test "$have_jpeg" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES jpeg"
+fi
+if test "$have_lcms" = 'yes' || test "$have_lcms2" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES lcms"
+fi
+if test "$have_lqr" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES lqr"
+fi
+if test "$have_lzma" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES lzma"
+fi
+if test "$have_openexr" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES openexr"
+fi
+if test "$have_openjp2" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES openjp2"
+fi
+if test "$have_pango" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES pango"
+fi
+if test "$have_png" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES png"
+fi
+have_ps='no'
+if test "$have_dps" = 'yes' || \
+ test "$have_gs" = 'yes' || \
+ test "${native_win32_build}" = 'yes' ; then
+ have_ps='yes'
+fi
+if test "$have_ps" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES ps"
+fi
+if test "$have_ra_ppm" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES rad"
+fi
+if test "$have_rsvg" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES rsvg"
+fi
+if test "$have_tiff" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES tiff"
+fi
+if test "$have_ttf" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES ttf"
+fi
+if test "$have_webp" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES webp"
+fi
+if test "$have_wmf" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES wmf"
+fi
+if test "$have_x" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES x"
+fi
+if test "$have_xml" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES xml"
+fi
+if test "$have_zlib" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES zlib"
+fi
+# Remove extraneous spaces from output variables (asthetic)
+MAGICK_DELEGATES=`echo $MAGICK_DELEGATES | sed -e 's/ */ /g'`
+MAGICK_FEATURES=`echo $MAGICK_FEATURES | sed -e 's/ */ /g'`
+AC_SUBST(MAGICK_DELEGATES)
+AC_SUBST(MAGICK_FEATURES)
#
# Handle special compiler flags
#
if test "$build_modules" != 'no'; then
- MAGICK_DEP_LIBS="$LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
+ MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_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 $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 $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
+ MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_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 $OPENJPEG_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
fi
AC_SUBST(MAGICK_DEP_LIBS)
CFLAGS=`echo $CFLAGS | sed -e 's/ */ /g'`
CPPFLAGS=`echo $CPPFLAGS | sed -e 's/ */ /g'`
CXXFLAGS=`echo $CXXFLAGS | sed -e 's/ */ /g'`
-DELEGATES=`echo $DELEGATES | sed -e 's/^ //g'`
DISTCHECK_CONFIG_FLAGS=`echo $DISTCHECK_CONFIG_FLAGS | sed -e 's/ */ /g'`
LDFLAGS=`echo $LDFLAGS | sed -e 's/ */ /g'`
TESTED_LIBS=`echo $LIBS | sed -e 's/ */ /g'`
MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/ */ /g'`
MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/ */ /g'`
MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS"
-MAGICK_LIBS="-lMagickCore $MAGICK_DEP_LIBS"
+MAGICK_LIBS="$MAGICK_DEP_LIBS"
AC_SUBST(MAGICK_CFLAGS)
AC_SUBST(MAGICK_CXXFLAGS)
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([Magick++-config.in],[chmod +x Magick++/bin/Magick++-config])
AC_CONFIG_COMMANDS([PerlMagick/check.sh.in],[chmod +x PerlMagick/check.sh])
-AC_MSG_NOTICE([-------------------------------------------------------------])
-AC_MSG_NOTICE([Update ImageMagick configuration])
+AC_MSG_RESULT([-------------------------------------------------------------])
+AC_MSG_RESULT([Update ImageMagick configuration])
AC_OUTPUT
rm -f magick-version
result_windows_font_dir=${windows_font_dir}
fi
-AC_MSG_NOTICE([
+AC_MSG_RESULT([
ImageMagick is configured as follows. Please verify that this configuration
matches your expectations.
JPEG-2000 --with-jp2=$with_jp2 $have_jp2
LCMS v1 --with-lcms=$with_lcms $have_lcms
LCMS v2 --with-lcms2=$with_lcms2 $have_lcms2
+LIBJPEG2 --with-openjp2=$with_openjp2 $have_openjp2
LQR --with-lqr=$with_lqr $have_lqr
LTDL --with-ltdl=$with_ltdl $have_ltdl
LZMA --with-lzma=$with_lzma $have_lzma
VERSION = $PACKAGE_VERSION
CC = $CC
CFLAGS = $CFLAGS
- CPPFLAGS = $MAGICK_CPPFLAGS
- PCFLAGS = $MAGICK_PCFLAGS
+ CPPFLAGS = $CPPFLAGS
+ PCFLAGS = $PCFLAGS
DEFS = $DEFS
LDFLAGS = $LDFLAGS
- MAGICK_LDFLAGS = $MAGICK_LDFLAGS
- LIBS = $MAGICK_LIBS
+ LIBS = $LIBS
CXX = $CXX
CXXFLAGS = $CXXFLAGS
FEATURES = $MAGICK_FEATURES
+ DELEGATES = $MAGICK_DELEGATES
])
projects / imagemagick / blobdiff