-# Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+# Copyright 1999-2012 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
# limitations under the License.
#
# Copyright (C) 2003 - 2008 GraphicsMagick Group
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
-AC_PREREQ(2.67)
+AC_PREREQ(2.69)
m4_define([magick_major_version], [7])
m4_define([magick_minor_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/'"]))
+m4_define([magick_svn_revision], esyscmd([sh -c "(svnversion .) | awk '{ print \$1 }' | tr -d '\n'"]))
AC_INIT([ImageMagick],[magick_version],[http://www.imagemagick.org],[ImageMagick])
AC_CONFIG_SRCDIR([MagickCore/MagickCore.h])
AC_CONFIG_AUX_DIR([config])
+AC_REQUIRE_AUX_FILE([tap-driver.sh])
AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_LIBOBJ_DIR([ltdl])
AC_CONFIG_HEADERS([config/config.h])
AX_PREFIX_CONFIG_H([MagickCore/magick-config.h],[MagickCore])
AC_CONFIG_FILES([\
+ common.shi \
config/configure.xml \
config/delegates.xml \
config/ImageMagick.rdf \
config/MagickCore.dox \
config/MagickWand.dox \
+ config/Magick++.dox \
config/type-dejavu.xml \
config/type-ghostscript.xml \
config/type-windows.xml \
AC_CANONICAL_SYSTEM
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
MAGICK_TARGET_CPU=$host_cpu
AC_SUBST(MAGICK_TARGET_CPU)
+AC_DEFINE_UNQUOTED(MAGICK_TARGET_CPU,$MAGICK_TARGET_CPU,[Target Host CPU])
MAGICK_TARGET_VENDOR=$host_vendor
AC_SUBST(MAGICK_TARGET_VENDOR)
+AC_DEFINE_UNQUOTED(MAGICK_TARGET_VENDOR,$MAGICK_TARGET_VENDOR,[Target Host Vendor])
MAGICK_TARGET_OS=$host_os
AC_SUBST(MAGICK_TARGET_OS)
+AC_DEFINE_UNQUOTED(MAGICK_TARGET_OS,$MAGICK_TARGET_OS,[Target Host OS])
# Substitute library versioning
AC_SUBST(MAGICK_LIBRARY_CURRENT)dnl
# Ensure that make can run correctly
AM_SANITY_CHECK
-AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-zip dist-bzip2 dist-xz])
+AM_INIT_AUTOMAKE([1.12 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])])
AC_SUBST(LIBEXEC_DIR)
eval "eval DATA_DIR=$datadir"
AC_SUBST(DATA_DIR)
-eval "eval DOC_DIR=$docdir"
+eval "eval DOC_DIR=$datadir/doc"
AC_SUBST(DOC_DIR)
eval "eval SYSCONF_DIR=$sysconfdir"
AC_SUBST(SYSCONF_DIR)
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_AWK
AM_WITH_DMALLOC
AX_C___ATTRIBUTE__
+AX_GCC_ARCHFLAG([no])
PKG_PROG_PKG_CONFIG
#
# Enable run-time checking.
#
AC_ARG_ENABLE([bounds-checking],
- [AC_HELP_STRING([--bounds-checking],
+ [AC_HELP_STRING([--enable-bounds-checking],
[enable run-time bounds-checking])],
[enable_bounds_checking=$enableval],
[enable_bounds_checking='no'])
#
AC_EXEEXT
AC_OBJEXT
-AX_LANG_COMPILER_MS
GDI32_LIBS=''
native_win32_build='no'
[AC_HELP_STRING([--sharearch-dir=DIR],
[ARCH specific config directory])],
[sharearch_dir=$withval],
- [sharearch_dir="${DATA_DIR}"])
+ [sharearch_dir="${LIB_DIR}"])
eval "eval SHAREARCH_DIR=$sharearch_dir"
SHAREARCH_DIR="$sharearch_dir"
LT_LANG([C++])
AC_SUBST(LIBTOOL_DEPS)
-# Configure libltdl
-LT_CONFIG_LTDL_DIR([ltdl])
-LTDL_INIT([convenience nonrecursive])
-
# Check to see if building shared libraries
libtool_build_shared_libs='no'
if test "$enable_shared" = 'yes'; then
#
# Enable support for building loadable modules
#
+build_modules='no'
AC_ARG_WITH([modules],
[AC_HELP_STRING([--with-modules],
[enable building dynamically loadable modules])],
if test "$with_modules" != 'no' ; then
if test "$libtool_build_shared_libs" = 'no'; then
AC_MSG_WARN([Modules may only be built if building shared libraries is enabled.])
- with_modules='no'
- fi
+ build_modules='no'
+ else
+ build_modules='yes'
+ fi
fi
-if test "$with_modules" != 'no'; then
+if test "$build_modules" != 'no' ; then
AC_DEFINE(BUILD_MODULES,1,Define if coders and filters are to be built as modules.)
fi
-AM_CONDITIONAL(WITH_MODULES, test "$with_modules" != 'no')
-
-# Enable building/use of libltdl if we are building shared libraries regardless
-# of whether modules are built or not.
-with_ltdl='no'
-if test "$libtool_build_shared_libs" != 'no'; then
- with_ltdl='yes'
-fi
-
-AM_CONDITIONAL(WITH_LTDL, test "$with_ltdl" != 'no')
-if test "$with_ltdl" != 'no'; then
- AC_DEFINE(LTDL_DELEGATE,1,Define if using libltdl to support dynamically loadable modules)
-
- # Set DLLDFLAGS
- if test X"$enable_shared" = Xyes; then
- DLLDFLAGS=-export-dynamic
- AC_SUBST(DLLDFLAGS)
- fi
-fi
+AM_CONDITIONAL(WITH_MODULES, test "$build_modules" != 'no')
# Enable build using delegate libraries built in subdirectories rather than installed
# delegate libraries (bzlib fftw fpx gslib jp2 jbig jpeg lcms lzma png tiff ttf wmf xml zlib)
AC_ARG_ENABLE([deprecated],
[AC_HELP_STRING([--disable-deprecated],
- [exclude deprecated methods in MagickCore and MagickWand API's])],
+ [exclude deprecated methods in MagickCore and MagickWand APIs])],
[enable_deprecated=$enableval],
[enable_deprecated='no'])
# Build a high dynamic range version of ImageMagick.
AC_ARG_ENABLE([hdri],
- [AC_HELP_STRING([--enable-hdri],
+ [AC_HELP_STRING([--disable-hdri],
[accurately represent the wide range of intensity levels found in real scenes])],
[enable_hdri=$enableval],
- [enable_hdri='no'])
+ [enable_hdri='yes'])
MAGICK_HDRI=""
if test "$enable_hdri" = 'yes'; then
AC_ARG_WITH([method-prefix],
[AC_HELP_STRING([--with-method-prefix=PREFIX],
[prefix MagickCore API methods])],
- [with_method_prefix=$enableval],
- [with_method_prefix=''])
+ [with_method_prefix=$withval],
+ [with_method_prefix='no'])
-if test "$with_method_prefix" != ''; then
+if test "$with_method_prefix" != 'no'; then
AC_DEFINE_UNQUOTED(NAMESPACE_PREFIX,$with_method_prefix,[Magick API method prefix])
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-method-prefix "
fi
+# Enable legacy support (default no)
+AC_ARG_ENABLE(legacy-support,
+ [ --enable-legacy-support install legacy command-line utilities (default disabled)],
+ [with_legacy_support=$enableval],
+ [with_legacy_support='no'])
+AM_CONDITIONAL(LEGACY_SUPPORT, test "$with_legacy_support" != 'no')
+
# Number of bits in a Quantum
AC_ARG_WITH([quantum-depth],
[AC_HELP_STRING([--with-quantum-depth=DEPTH],
[with_magick_plus_plus=$withval],
[with_magick_plus_plus='yes'])
+# Encode the this name into the shared library.
+AC_ARG_WITH([package-release-name],
+ [AC_HELP_STRING([--with-package-release-name=NAME],
+ [encode this name into the shared library])],
+[MAGICK_LT_RELEASE_OPTS="-release $withval"])
+AC_SUBST(MAGICK_LT_RELEASE_OPTS)
+
# Disable build/install of PerlMagick.
AC_ARG_WITH([perl],
[AC_HELP_STRING([--with-perl],
# Options to pass when configuring PerlMagick
AC_ARG_WITH([perl-options],
[AC_HELP_STRING([--with-perl-options=OPTIONS],
- [options to pass on command-line when generating PerlMagick's build file])],
+ [options to pass on command-line when generating PerlMagick build file])],
PERL_MAKE_OPTIONS=$withval)
AC_SUBST(PERL_MAKE_OPTIONS)
MAGICK_CPPFLAGS="$MAGICK_CPPFLAGS -D_DLL"
MAGICK_PCFLAGS="$MAGICK_PCFLAGS -D_DLL"
LIBRARY_EXTRA_CPPFLAGS="$LIBRARY_EXTRA_CPPFLAGS -D_MAGICKLIB_"
- if test "$with_modules" = 'yes'; then
+ if test "$build_modules" = 'yes'; then
LIBRARY_EXTRA_CPPFLAGS="$LIBRARY_EXTRA_CPPFLAGS -D_MAGICKMOD_"
else
MODULE_EXTRA_CPPFLAGS="$MODULE_EXTRA_CPPFLAGS -D_MAGICKLIB_"
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 xlocale.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 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)
########
#
INT64_T='signed long long'
INT64_F='"ll"'
fi
-case "${build_os}" in
+case "${host_os}" in
mingw* )
INT64_F='"I64"'
;;
UINT64_T='unsigned long long'
UINT64_F='"ll"'
fi
-case "${build_os}" in
+case "${host_os}" in
mingw* )
UINT64_F='"I64"'
;;
LIBS="$MATH_LIBS $LIBS"
AC_SUBST(MATH_LIBS)
-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])
+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])
#
# Check for clock_gettime().
# 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 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 webp 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 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 webp wmf/src xml zlib; do
if test -d "$builddir/$dir/.libs"; then
LDFLAGS="$LDFLAGS -L$builddir/$dir/.libs"
else
GOMP_LIBS=''
if test "$enable_openmp" != 'no'; then
if test "${GCC}" = "yes"; then
- AC_CHECK_LIB(gomp,GOMP_parallel_start,GOMP_LIBS="-lgomp",,) # gcc
+ # Open64 (passes for GCC but uses different OpenMP implementation)
+ if test "x$GOMP_LIBS" = x ; then
+ if $CC --version 2>&1 | grep Open64 > /dev/null ; then
+ AC_CHECK_LIB(openmp,omp_get_num_procs,GOMP_LIBS="-lopenmp",,)
+ fi
+ fi
+ # GCC
+ if test "x$GOMP_LIBS" = x ; then
+ AC_CHECK_LIB(gomp,GOMP_parallel_start,GOMP_LIBS="-lgomp",,)
+ fi
else
- AC_CHECK_LIB(mtsk,sunw_mp_register_warn,GOMP_LIBS="-lmtsk",,) # solaris cc
- AC_CHECK_LIB(xlsmp,_xlsmpFlush,GOMP_LIBS="-lxlsmp",,) # AIX xlc
- AC_CHECK_LIB(mp,mp_destroy,GOMP_LIBS="-lmp",,) # SGI IRIX 6.5 MIPSpro C/C++
+ # Sun CC
+ if test "x$GOMP_LIBS" = x ; then
+ AC_CHECK_LIB(mtsk,sunw_mp_register_warn,GOMP_LIBS="-lmtsk",,)
+ fi
+ # AIX xlc
+ if test "x$GOMP_LIBS" = x ; then
+ AC_CHECK_LIB(xlsmp,_xlsmpFlush,GOMP_LIBS="-lxlsmp",,)
+ fi
+ # SGI IRIX 6.5 MIPSpro C/C++
+ if test "x$GOMP_LIBS" = x ; then
+ AC_CHECK_LIB(mp,mp_destroy,GOMP_LIBS="-lmp",,)
+ fi
fi
LIBS="$GOMP_LIBS $LIBS"
fi
AM_CONDITIONAL(ZLIB_DELEGATE, test "$have_zlib" = 'yes')
AC_SUBST(ZLIB_LIBS)
+# whether modules are built or not.
+with_ltdl='yes'
+have_ltdl='no'
+LTDL_LIBS=''
+if test "$build_modules" != 'no' ; then
+ AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_CHECKING([for libltdl])
+ AC_MSG_NOTICE([])
+ failed=0
+ passed=0
+ AC_CHECK_HEADER([ltdl.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
+ AC_CHECK_LIB([ltdl],[lt_dlinit],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],)
+ AC_MSG_CHECKING([if libltdl package is complete])
+ if test $passed -gt 0 ; then
+ if test $failed -gt 0 ; then
+ AC_MSG_RESULT([no -- some components failed test])
+ have_ltdl='no (failed tests)'
+ else
+ LTDL_LIBS='-lltdl'
+ LIBS="$LTDL_LIBS $LIBS"
+ AC_DEFINE(LTDL_DELEGATE,1,[Define if using libltdl to support dynamically loadable modules])
+ AC_MSG_RESULT([yes])
+ have_ltdl='yes'
+ fi
+ else
+ AC_MSG_RESULT([no])
+ fi
+ if test "$have_ltdl" != 'yes' ; then
+ AC_MSG_FAILURE([libltdl is required for modules build],[1])
+ fi
+fi
+AM_CONDITIONAL(WITH_LTDL, test "$have_ltdl" != 'no')
+
#
# If profiling, then check for -ldl and dlopen (required for Solaris & gcc)
#
if test "$have_autotrace" = 'yes'; then
failed=0
AC_DEFINE(AUTOTRACE_DELEGATE,1,Define if you have AUTOTRACE library)
- if test "$with_modules" = 'no'; then
+ if test "$build_modules" = 'no'; then
CPPFLAGS="$AUTOTRACE_CFLAGS $CPPFLAGS"
fi
fi
[AC_HELP_STRING([--without-fontconfig],
[disable fontconfig support])],
[with_fontconfig=$withval],
- [with_fontconfig=$have_x])
+ [with_fontconfig='yes'])
if test "$with_fontconfig" != 'yes'; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-fontconfig=$with_fontconfig "
if test "$have_fontconfig" = 'yes'; then
AC_DEFINE(FONTCONFIG_DELEGATE,1,Define if you have FONTCONFIG library)
- if test "$with_modules" = 'no'; then
+ if test "$build_modules" = 'no'; then
CPPFLAGS="$FONTCONFIG_CFLAGS $CPPFLAGS"
fi
fi
# Check for GVC delegate library.
#
AC_ARG_WITH(gvc,
- [AC_HELP_STRING([--without-gvc],
+ [AC_HELP_STRING([--with-gvc],
[disable GVC support])],
[with_gvc=$withval],
- [with_gvc='yes'])
+ [with_gvc='no'])
if test "$with_gvc" != 'yes'; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-gvc=$with_gvc "
if test "$have_gvc" = 'yes'; then
AC_DEFINE(GVC_DELEGATE,1,Define if you have GVC library)
- if test "$with_modules" = 'no'; then
+ if test "$build_modules" = 'no'; then
CPPFLAGS="$GVC_CFLAGS $CPPFLAGS"
fi
fi
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
+LZMA_PKG=""
+if test "x$with_lzma" = "xyes"; 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'
+ PKG_CHECK_MODULES(LZMA,[liblzma >= 2.9.0], have_lzma=yes, have_lzma=no)
+ AC_MSG_NOTICE([])
+fi
+
+if test "$have_lzma" = 'yes'; then
+ AC_DEFINE(LZMA_DELEGATE,1,Define if you have LZMA library)
+ if test "$build_modules" = 'no'; then
+ CPPFLAGS="$LZMA_CFLAGS $CPPFLAGS"
fi
- else
- AC_MSG_NOTICE(no)
- fi
fi
+
AM_CONDITIONAL(LZMA_DELEGATE, test "$have_lzma" = 'yes')
+AC_SUBST(LZMA_CFLAGS)
AC_SUBST(LZMA_LIBS)
dnl ===========================================================================
if test "$have_openexr" = 'yes'; then
AC_DEFINE(OPENEXR_DELEGATE,1,Define if you have OPENEXR library)
- if test "$with_modules" = 'no'; then
+ if test "$build_modules" = 'no'; then
CFLAGS="$OPENEXR_CFLAGS $CFLAGS"
fi
fi
[AC_HELP_STRING([--without-pango],
[disable PANGO support])],
[with_pango=$withval],
- [with_pango=$have_x])
+ [with_pango='yes'])
if test "$with_pango" != 'yes'; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-pango=$with_pango "
fi
have_pango='no'
-have_pangoft2='no'
+have_pangocairo='no'
PANGO_CFLAGS=""
PANGO_LIBS=""
PANGO_PKG=""
if test "x$with_pango" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- AC_MSG_CHECKING(for PANGO support )
- PKG_CHECK_MODULES(PANGO, [pangoft2 >= 1.15.1], have_pangoft2=yes, have_pangoft2=no)
+ PKG_CHECK_MODULES(PANGO, [pangocairo >= 1.28.1], have_pangocairo=yes, have_pangocairo=no)
AC_MSG_RESULT([])
- PKG_CHECK_MODULES(PANGO, [pango >= 1.15.1], have_pango=yes, have_pango=no)
+ PKG_CHECK_MODULES(PANGO, [pango >= 1.28.1], 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
+ if test "$build_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"
+if test "$have_pangocairo" = 'yes'; then
+ AC_DEFINE(PANGOCAIRO_DELEGATE,1,Define if you have PANGOCAIRO library)
+ if test "$build_modules" = 'no'; then
+ CPPFLAGS="$PANGOCAIRO_CFLAGS $CPPFLAGS"
fi
fi
AM_CONDITIONAL(PANGO_DELEGATE, test "$have_pango" = 'yes')
-AM_CONDITIONAL(PANGOFT2_DELEGATE, test "$have_pangoft2" = 'yes')
+AM_CONDITIONAL(PANGOCAIRO_DELEGATE, test "$have_pangocairo" = 'yes')
AC_SUBST(PANGO_CFLAGS)
AC_SUBST(PANGO_LIBS)
#
AC_ARG_WITH([rsvg],
[AC_HELP_STRING([--without-rsvg],
- [disable RSVG support])],
+ [enable RSVG support])],
[with_rsvg=$withval],
- [with_rsvg=$have_x])
+ [with_rsvg='no'])
if test "$with_rsvg" != 'yes'; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-rsvg=$with_rsvg "
if test "$have_rsvg" = 'yes'; then
AC_DEFINE(RSVG_DELEGATE,1,Define if you have RSVG library)
- if test "$with_modules" = 'no'; then
+ if test "$build_modules" = 'no'; then
CPPFLAGS="$RSVG_CFLAGS $CPPFLAGS"
fi
fi
if test "$have_cairo" = 'yes'; then
AC_DEFINE(CAIRO_DELEGATE,1,Define if you have CAIRO library)
- if test "$with_modules" = 'no'; then
+ if test "$build_modules" = 'no'; then
CPPFLAGS="$CAIRO_SVG_CFLAGS $CPPFLAGS"
fi
fi
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`,)
have_tiff='yes'
AC_CHECK_HEADERS(tiffconf.h)
AC_CHECK_FUNCS([TIFFIsCODECConfigured TIFFMergeFieldInfo \
- TIFFReadEXIFDirectory TIFFSetErrorHandlerExt TIFFSetTagExtender \
- TIFFSetWarningHandlerExt TIFFSwabArrayOfTriples])
+ TIFFIsBigEndian TIFFReadEXIFDirectory TIFFSetErrorHandlerExt \
+ TIFFSetTagExtender TIFFSetWarningHandlerExt \
+ TIFFSwabArrayOfTriples])
fi
else
AC_MSG_NOTICE([no])
# Check for WMF delegate library.
#
AC_ARG_WITH([wmf],
- [AC_HELP_STRING([--without-wmf],
- [disable WMF support])],
+ [AC_HELP_STRING([--with-wmf],
+ [enable WMF support])],
[with_wmf=$withval],
- [with_wmf='yes'])
+ [with_wmf='no'])
if test "$with_wmf" != 'yes'; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-wmf=$with_wmf "
have_wmf='no'
WMF_LIBS=''
+WMF_LIBS_DEPS=''
+OLIBS="$LIBS"
if test "$with_wmf" != 'no'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for WMF])
- 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`,"-lwmflite")
- AC_MSG_CHECKING([if WMF package is complete])
- if test $passed -gt 0; then
- if test $failed -gt 0; then
- AC_MSG_NOTICE([no -- some components failed test])
- have_wmf='no (failed tests)'
- else
- WMF_LIBS='-lwmf -lwmflite'
+ AC_MSG_RESULT([])
+ have_libwmf='no'
+ have_libwmflite='no'
+ have_libwmf_ipa_h='no'
+
+ AC_CHECK_HEADER([libwmf/ipa.h],[have_libwmf_ipa_h='yes'],,[$FT2BUILD_H])
+ if test "$have_libwmf_ipa_h" = 'yes'; then
+ AC_CHECK_LIB(wmflite,wmf_lite_create,have_libwmflite='yes',,)
+ if test "$have_libwmflite" = 'yes'; then
+ AC_DEFINE(WMFLITE_DELEGATE,1,Define if you have wmflite library)
+ WMF_LIBS='-lwmflite'
LIBS="$WMF_LIBS $LIBS"
- AC_DEFINE(WMF_DELEGATE,1,Define if you have WMF library)
- AC_MSG_NOTICE([yes])
have_wmf='yes'
+ else
+ WMF_LIBS_DEPS=''
+ WMF_CONFIG_LIBS=`libwmf-config --libs`
+ for lib in xml2 expat freetype jpeg png z; do
+ testlib="-l${lib}"
+ echo "$WMF_CONFIG_LIBS" | grep -- "$testlib" > /dev/null && WMF_LIBS_DEPS="$WMF_LIBS_DEPS $testlib"
+ done
+ AC_CHECK_LIB(wmf,wmf_api_create,have_libwmf='yes',,$WMF_LIBS_DEPS)
+ if test "$have_libwmf" = 'yes'; then
+ AC_DEFINE(WMF_DELEGATE,1,Define if you have wmf library)
+ WMF_LIBS='-lwmf'
+ LIBS="$WMF_LIBS $LIBS"
+ have_wmf='yes'
+ else
+ AC_MSG_RESULT([no -- some components failed test])
+ have_wmf='no (failed tests)'
+ have_wmflite='no (failed tests)'
+ LIBS="$OLIBS"
+ WMF_LIBS=''
+ fi
fi
+ fi
+ AC_MSG_CHECKING([if WMF package is complete])
+ if test "$have_wmf" = 'yes'; then
+ AC_MSG_RESULT([yes])
else
- AC_MSG_NOTICE([no])
+ AC_MSG_RESULT([no])
fi
fi
-AM_CONDITIONAL(WMF_DELEGATE,test "$have_wmf" = 'yes')
+AM_CONDITIONAL(WMF_DELEGATE, test "$have_wmf" = 'yes')
AC_SUBST(WMF_LIBS)
-
-dnl ===========================================================================
+AC_SUBST(WMF_LIBS_DEPS)
dnl ===========================================================================
[AC_HELP_STRING([--without-xml],
[disable XML support])],
[with_xml=$withval],
- [with_xml=$have_x])
+ [with_xml='yes'])
if test "$with_xml" != 'yes' ; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-xml=$with_xml "
#
# Path to ImageMagick documentation files
-DOCUMENTATION_RELATIVE_PATH=""
+DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
case "${build_os}" in
AC_DEFINE_UNQUOTED(SHARE_PATH,"$DEFINE_SHARE_PATH",Directory where architecture-independent configuration files live.)
AC_SUBST(SHARE_PATH)
-# Subdirectory to place architecture-independent configuration files
-SHAREARCH_RELATIVE_PATH="${LIBRARY_RELATIVE_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="${DATA_DIR}/${SHAREARCH_RELATIVE_PATH}"
-DEFINE_SHAREARCH_PATH="${DATA_DIR}/${SHAREARCH_RELATIVE_PATH}/"
+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`
ILBMEncodeDelegateDefault='ppmtoilbm'
LPDelegateDefault='lp'
LPRDelegateDefault='lpr'
-LZWDecodeDelegateDefault='uncompress'
-LZWEncodeDelegateDefault='compress'
LaunchDelegateDefault='gimp'
MANDelegateDefault='groff'
MPEGDecodeDelegateDefault='ffmpeg'
fi
RLEEncodeDelegateDefault='rawtorle'
RMDelegateDefault='rm'
-RSVGDecodeDelegateDefault='rsvg'
+RSVGDecodeDelegateDefault='rsvg-convert'
SCANDecodeDelegateDefault='scanimage'
+SVGDecodeDelegateDefault='inkscape'
TXTDelegateDefault='enscript'
UniconvertorDelegateDefault='uniconvertor'
WMFDecodeDelegateDefault='wmf2eps'
AC_PATH_PROG(AutotraceDecodeDelegate, "$AutotraceDecodeDelegateDefault", "$AutotraceDecodeDelegateDefault")
AC_PATH_PROG(BlenderDecodeDelegate, "$BlenderDecodeDelegateDefault", "$BlenderDecodeDelegateDefault")
AC_PATH_PROG(BZIPDelegate, "$BZIPDelegateDefault", "$BZIPDelegateDefault")
-AC_PATH_PROG(BrowseDelegate, "$BrowseDelegateDefault" mozilla firefox netscape, "$BrowseDelegateDefault")
+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(ILBMEncodeDelegate, "$ILBMEncodeDelegateDefault", "$ILBMEncodeDelegateDefault")
AC_PATH_PROG(LPDelegate, "$LPDelegateDefault", no)
AC_PATH_PROG(LPRDelegate, "$LPRDelegateDefault", "$LPRDelegateDefault")
-AC_PATH_PROG(LZWDecodeDelegate, "$LZWDecodeDelegateDefault", "$LZWDecodeDelegateDefault")
-AC_PATH_PROG(LZWEncodeDelegate, "$LZWEncodeDelegateDefault", "$LZWEncodeDelegateDefault")
AC_PATH_PROG(LaunchDelegate, "$LaunchDelegateDefault", "$LaunchDelegateDefault")
AC_PATH_PROG(MANDelegate, "$MANDelegateDefault", "$MANDelegateDefault")
AC_PATH_PROG(MPEGDecodeDelegate, "$MPEGDecodeDelegateDefault", "$MPEGDecodeDelegateDefault")
AC_PATH_PROG(RMDelegate, "$RMDelegateDefault", "$RMDelegateDefault")
AC_PATH_PROG(RSVGDecodeDelegate, "$RSVGDecodeDelegateDefault", "$RSVGDecodeDelegateDefault")
AC_PATH_PROG(SCANDecodeDelegate, "$SCANDecodeDelegateDefault", "$SCANDecodeDelegateDefault")
+AC_PATH_PROG(SVGDecodeDelegate, "$SVGDecodeDelegateDefault", "$SVGDecodeDelegateDefault")
AC_PATH_PROG(TXTDelegate, "$TXTDelegateDefault", "$TXTDelegateDefault")
AC_PATH_PROG(UniconvertorDelegate, "$UniconvertorDelegateDefault", "$UniconvertorDelegateDefault")
AC_PATH_PROG(WMFDecodeDelegate, "$WMFDecodeDelegateDefault", "$WMFDecodeDelegateDefault")
ILBMDecodeDelegate="$ILBMDecodeDelegateDefault"
ILBMEncodeDelegate="$ILBMEncodeDelegateDefault"
LPDelegate="$LPDelegateDefault"
- LZWDecodeDelegate="$LZWDecodeDelegateDefault"
- LZWEncodeDelegate="$LZWEncodeDelegateDefault"
LaunchDelegate="$LaunchDelegateDefault"
MANDelegate="$MANDelegateDefault"
MPEGDecodeDelegate="$MPEGDecodeDelegateDefault"
RMDelegate="$RMDelegateDefault"
RSVGDecodeDelegate="$RSVGDecodeDelegateDefault"
SCANDecodeDelegate="$SCANDecodeDelegateDefault"
+ SVGDecodeDelegate="$SVGDecodeDelegateDefault"
ShowImageDelegate="$ShowImageDelegateDefault"
TXTDelegate="$TXTDelegateDefault"
UniconvertorDelegate="$UniconvertorDelegateDefault"
AC_SUBST(ILBMDecodeDelegate)
AC_SUBST(ILBMEncodeDelegate)
AC_SUBST(LPDelegate)
-AC_SUBST(LZWDecodeDelegate)
-AC_SUBST(LZWEncodeDelegate)
AC_SUBST(LaunchDelegate)
AC_SUBST(MANDelegate)
AC_SUBST(MPEGDecodeDelegate)
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
# Build library dependency list for libMagickCore
#
-MAGICK_LIBLTDL='' # Libltdl for build
-MAGICK_API_LIBLTDL='' # libltdl for dependent application (API) build
-MAGICK_LTDLDEPS='' # extra libltdl dependencies
-if test "$with_ltdl" != 'no'
-then
- if test \( "$with_included_ltdl" = 'no' -o "$enable_ltdl_convenience" = 'no' \) -o "$enable_ltdl_install" = 'yes'; then
- MAGICK_API_LIBLTDL='-lltdl'
- fi
- MAGICK_LIBLTDL=${LIBLTDL}
- MAGICK_LTDLDEPS=${LTDLDEPS}
-fi
-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 $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
+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"
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 $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 $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
fi
AC_SUBST(MAGICK_DEP_LIBS)
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_API_LIBLTDL"
+MAGICK_LIBS="-lMagickCore $MAGICK_DEP_LIBS"
AC_SUBST(MAGICK_CFLAGS)
AC_SUBST(MAGICK_CXXFLAGS)
# Set configured scripts to executable.
AC_CONFIG_COMMANDS([default],[],[])
+AC_CONFIG_COMMANDS([magick.sh.in],[chmod +x magick.sh])
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])
-------------------------------------------------------------------------------
Shared libraries --enable-shared=$enable_shared $libtool_build_shared_libs
Static libraries --enable-static=$enable_static $libtool_build_static_libs
-Module support --with-modules=$with_modules $with_modules
+Module support --with-modules=$build_modules $build_modules
GNU ld --with-gnu-ld=$with_gnu_ld $lt_cv_prog_gnu_ld
Quantum depth --with-quantum-depth=$with_quantum_depth $with_quantum_depth
High Dynamic Range Imagery
LCMS v1 --with-lcms=$with_lcms $have_lcms
LCMS v2 --with-lcms2=$with_lcms2 $have_lcms2
LQR --with-lqr=$with_lqr $have_lqr
+LTDL --with-ltdl=$with_ltdl $have_ltdl
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
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
+WMF --with-wmf=$with_wmf $have_wmf
X11 --with-x=$with_x $have_x
XML --with-xml=$with_xml $have_xml
ZLIB --with-zlib=$with_zlib $have_zlib
projects / imagemagick / blobdiff