-# Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization
+# Copyright 1999-2010 ImageMagick Studio LLC, a non-profit organization
# dedicated to making software imaging solutions freely available.
#
# You may not use this file except in compliance with the License. You may
# Copyright (C) 2003 - 2008 GraphicsMagick Group
AC_PREREQ(2.63)
-AC_INIT([ImageMagick],[6.5.6],[http://www.imagemagick.org],[ImageMagick])
+AC_INIT([ImageMagick],[6.6.0],[http://www.imagemagick.org],[ImageMagick])
AC_CONFIG_SRCDIR([magick/MagickCore.h])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
config/ImageMagick.rdf \
config/MagickCore.dox \
config/MagickWand.dox \
+ config/type-dejavu.xml \
config/type-ghostscript.xml \
config/type-windows.xml \
config/type.xml \
# Source file containing package/library versioning information.
. ${srcdir}/version.sh
-echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}${PACKAGE_LIB_SUBVERSION}"
+echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}${PACKAGE_VERSION_ADDENDUM}"
+AC_CANONICAL_SYSTEM
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
AC_CANONICAL_TARGET([])
# Substitute library versioning
AC_SUBST(MAGICK_LIBRARY_CURRENT)dnl
AC_SUBST(MAGICK_LIBRARY_REVISION)dnl
AC_SUBST(MAGICK_LIBRARY_AGE)dnl
+AC_SUBST([MAGICK_LIBRARY_CURRENT_MIN],
+ [`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`])
+AC_SUBST([MAGICK_LIBRARY_VERSION_INFO],
+ [$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE])
AC_SUBST(PACKAGE_NAME)dnl
AC_SUBST(PACKAGE_VERSION)dnl
AC_SUBST(PACKAGE_LIB_VERSION)dnl
AC_SUBST(PACKAGE_LIB_VERSION_NUMBER)dnl
AC_SUBST(PACKAGE_RELEASE_DATE)dnl
-AC_SUBST(PACKAGE_LIB_SUBVERSION)dnl
+AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl
# Ensure that make can run correctly
AM_SANITY_CHECK
-AM_INIT_AUTOMAKE($PACKAGE_NAME,"${PACKAGE_VERSION}${PACKAGE_LIB_SUBVERSION}", ' ')
+AM_INIT_AUTOMAKE($PACKAGE_NAME,"${PACKAGE_VERSION}${PACKAGE_VERSION_ADDENDUM}", ' ')
# Enable support for silent build rules
AM_SILENT_RULES([yes])
AC_SUBST(MAGICK_FILTER_MODULE_PATH)
AC_SUBST(DIRSEP)
+
+#
+# Enable OS features.
+#
+AC_USE_SYSTEM_EXTENSIONS
+
# Check for programs
AC_PROG_CC
+AC_PROG_CXX
AC_PROG_CC_STDC
AC_PROG_CPP
AC_PROG_LD
-AC_PROG_RANLIB
AC_SUBST(LD)
+AC_PROG_CC_C99
AM_PROG_CC_C_O
+AC_COMPILE_WARNINGS
+AC_INCLUDES_DEFAULT
AC_PROG_INSTALL
AC_PROG_MAKE_SET
-AC_COMPILE_WARNINGS
AC_PROG_LN_S
AM_WITH_DMALLOC
PKG_PROG_PKG_CONFIG
-#
-# Enable OS features.
-#
-AC_GNU_SOURCE
-
#
# Enable run-time checking.
#
AC_OBJEXT
GDI32_LIBS=''
-StaticCplusPlusLibraries='no'
native_win32_build='no'
cygwin_build='no'
case "${host_os}" in
cygwin* )
- StaticCplusPlusLibraries='yes'
cygwin_build='yes'
GDI32_LIBS='-lgdi32'
;;
mingw* )
- StaticCplusPlusLibraries='yes'
native_win32_build='yes'
GDI32_LIBS='-lgdi32'
;;
LDFLAGS="$LDFLAGS -L/sw/lib"
fi
dnl OS X universal binary support, requires --disable-dependency-tracking
- AC_ARG_ENABLE(osx-universal-binary,
+ AC_ARG_ENABLE([osx-universal-binary],
AC_HELP_STRING([--enable-osx-universal-binary],
[build universal binary on OS X [[default=no]]]),
[build_osxuniversal="${enableval}"], [build_osxuniversal=no])
AC_SUBST(OPENMP_CFLAGS)
# Enable support for OpenCL
-AX_CHECK_CL
+AX_OPENCL([C])
+CFLAGS="$CL_CFLAGS $CFLAGS"
+LIBS="$CL_LIBS $LIBS"
+AC_SUBST(CL_CFLAGS)
########
#
libtool_build_static_libs='yes'
fi
-# MinGW and Cygwin can't build C++ DLLs which support exceptions.
-if test "${StaticCplusPlusLibraries}" = 'yes'; then
- LTCXXLIBOPTS='--static'
- AC_SUBST(LTCXXLIBOPTS)
-fi
-
+AM_CONDITIONAL(WITH_SHARED_LIBS, test "${libtool_build_shared_libs}" = 'yes')
#
# Enable support for building loadable modules
#
[AC_HELP_STRING([--with-modules],
[enable building dynamically loadable modules])],
[with_modules=$withval],
- [with_modules=$libtool_build_shared_libs])
+ [with_modules='no'])
# Only allow building loadable modules if we are building shared libraries
if test "$with_modules" != 'no' ; then
fi
# Enable build using delegate libraries built in subdirectories rather than installed
-# delegate libraries (bzlib fftw fpx jp2 jbig jpeg lcms png tiff ttf wmf xml zlib)
+# delegate libraries (bzlib fftw fpx gslib jp2 jbig jpeg lcms png tiff ttf wmf xml zlib)
AC_ARG_ENABLE([delegate-build],
[AC_HELP_STRING([--enable-delegate-build],
[look for delegate libraries in build directory])],
MAGICK_HDRI=""
if test "$enable_hdri" = 'yes'; then
MAGICK_HDRI="HDRI"
- AC_DEFINE(HDRI_SUPPORT,1,[accurately represent the wide range of intensity levels in real scenes])
+ AC_DEFINE(HDRI_SUPPORT,1,[accurately represent the wide range of intensity levels in real scenes])
fi
AC_SUBST(MAGICK_HDRI)dnl
-# Enable verbose output from libtool (enable libtool's default)
-AC_ARG_ENABLE([libtool-verbose],
- [AC_HELP_STRING([--enable-libtool-verbose],
- [enable verbose libtool output])],
- [enable_libtool_verbose=$enableval],
- [enable_libtool_verbose='no'])
-
-if test "$enable_libtool_verbose" = 'no'; then
- LIBTOOL="$LIBTOOL --silent"
-fi
-
# Build a version of ImageMagick with assert statements.
AC_ARG_ENABLE([assert],
[AC_HELP_STRING([--disable-assert],
# Options to pass when configuring PerlMagick
AC_ARG_WITH([perl-options],
[AC_HELP_STRING([--with-perl-options=OPTIONS],
- [options to pass on command-line when generating PerlMagick's build file])])
-
-PERL_MAKE_OPTIONS=$with_perl_options
+ [options to pass on command-line when generating PerlMagick's build file])],
+PERL_MAKE_OPTIONS=$withval)
AC_SUBST(PERL_MAKE_OPTIONS)
-
# Enable umem, object-caching memory allocation library.
AC_ARG_WITH(umem,
[ --with-umem enable umem memory allocation library support],
header files. Compilation cannot proceed. Please install the ANSI C
headers and rerun this script.]);
fi
+AC_HEADER_ASSERT
AC_HEADER_DIRENT
# Check additional headers
-AC_CHECK_HEADERS(arm/limits.h complex.h errno.h fcntl.h inttypes.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h OS.h stdarg.h stddef.h string.h strings.h sys/ipc.h sys/resource.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/types.h sys/wait.h unistd.h wchar.h)
+AC_CHECK_HEADERS(arm/limits.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h OS.h process.h stdarg.h sys/ipc.h sys/resource.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h wchar.h)
########
#
AC_STRUCT_TM
AC_SYS_INTERPRETER
-# If the C compiler does not fully support the ANSI C qualifier const,
-# define const to be empty.
-AC_C_CONST
-
# If the C compiler supports the keyword inline, do nothing. Otherwise
# define inline to __inline__ or __inline if it accepts one of those,
# otherwise define inline to be empty.
AC_FUNC_STRTOD
AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([_exit atexit clock clock_gettime directio execvp floor fork ftime ftruncate getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r localtime_r lstat memmove memset mkstemp munmap _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign pow pread pwrite raise rand_r readlink readdir_r realpath select seekdir setlocale sqrt setvbuf stat strchr strerror_r strrchr strcspn strdup strpbrk strspn strstr strtol symlink sysconf sigemptyset sigaction strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times usleep vsprintf vsnprintf waitpid _wfopen _wstat])
+AC_CHECK_FUNCS([_exit atexit clock directio execvp fchmod floor fork ftime ftruncate getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r localtime_r lstat memmove memset mkstemp munmap _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign pow pread pwrite raise rand_r readlink readdir_r realpath select seekdir setlocale sqrt setvbuf stat strchr strerror_r strrchr strcspn strdup strpbrk strspn strstr strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times usleep utime vsprintf vsnprintf waitpid _wfopen _wstat])
+
+#
+# Check for clock_gettime().
+#
+AC_SEARCH_LIBS(clock_gettime, rt,
+[
+ AC_DEFINE([HAVE_CLOCK_GETTIME],[1],[Define to 1 if you have clock_gettime.])
+ AC_MSG_CHECKING([whether clock_gettime supports CLOCK_REALTIME])
+ AC_COMPILE_IFELSE(
+ AC_LANG_PROGRAM(
+ [[#include <time.h>]],
+ [[clockid_t clockType = CLOCK_REALTIME;]]),
+ [
+ AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_CLOCK_REALTIME],[1],
+ [Define to 1 if clock_gettime supports CLOCK_REALTIME.])
+ ],
+ AC_MSG_RESULT(no)
+ )
+ ],
+ [
+ AC_CHECK_FUNCS([gettimeofday ftime], [break])
+ ]
+)
########
#
# Most delegates have includes in the same directory as the library, but not all...
#
# Includes
- for dir in bzlib fftw fpx jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include magick png tiff/libtiff ttf/include wand wmf/include xml/include zlib; do
+ for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include magick png tiff/libtiff ttf/include wand wmf/include xml/include zlib; do
if test -d "$builddir/$dir"; then
CPPFLAGS="$CPPFLAGS -I$builddir/$dir"
else
done
# Libraries
- for dir in bzlib fftw fpx jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src magick png tiff/libtiff ttf/objs wand wmf/src xml zlib; do
+ for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src magick png tiff/libtiff ttf/objs wand wmf/src xml zlib; do
if test -d "$builddir/$dir/.libs"; then
LDFLAGS="$LDFLAGS -L$builddir/$dir/.libs"
else
dnl ===========================================================================
+#
+# Set DejaVu font directory.
+#
+AC_ARG_WITH([dejavu-font-dir],
+ [AC_HELP_STRING([--with-dejavu-font-dir=DIR],
+ [DejaVu font directory])],
+ [with_dejavu_font_dir=$withval],
+ [with_dejavu_font_dir='default'])
+
+if test "$with_dejavu_font_dir" != 'default'; then
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-dejavu-font-dir=$with_dejavu_font_dir "
+fi
+
+dnl ===========================================================================
+
#
# Check for FFTW delegate library.
#
AC_MSG_RESULT([])
failed=0
passed=0
- PERSIST_LDFLAGS="$LDFLAGS"
+ PERSIST_LIBS="$LIBS"
PERSIST_CPPFLAGS="$CPPFLAGS"
if test "$enable_delegate_build" != 'no' && test -d "$builddir/freetype/include"; then
:
if test -n "$freetype_config"; then
freetype_cflags=`$freetype_config --cflags`
freetype_libs=`$freetype_config --libs`
- LDFLAGS="$LDFLAGS $freetype_libs"
+ LIBS="$LIBS $freetype_libs"
CPPFLAGS="$freetype_cflags $CPPFLAGS"
fi
fi
passed=`expr $passed + 1`
else
failed=`expr $failed + 1`
- LDFLAGS="$PERSIST_LDFLAGS"
+ LIBS="$PERSIST_LIBS"
fi
fi
[AC_HELP_STRING([--without-wmf],
[disable WMF support])],
[with_wmf=$withval],
- [with_wmf=$with_modules])
+ [with_wmf='yes'])
if test "$with_wmf" != 'yes'; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-wmf=$with_wmf "
fi
RLEEncodeDelegateDefault='rawtorle'
RMDelegateDefault='rm'
+RSVGDecodeDelegateDefault='rsvg'
SCANDecodeDelegateDefault='scanimage'
TXTDelegateDefault='enscript'
WMFDecodeDelegateDefault='wmf2eps'
AC_PATH_PROGS(PSDelegate, gsx gsc "$PSDelegateDefault", "$PSDelegateDefault")
AC_PATH_PROG(RLEEncodeDelegate, "$RLEEncodeDelegateDefault", "$RLEEncodeDelegateDefault")
AC_PATH_PROG(RMDelegate, "$RMDelegateDefault", "$RMDelegateDefault")
+AC_PATH_PROG(RSVGDecodeDelegate, "$RSVGDecodeDelegateDefault", "$RSVGDecodeDelegateDefault")
AC_PATH_PROG(SCANDecodeDelegate, "$SCANDecodeDelegateDefault", "$SCANDecodeDelegateDefault")
AC_PATH_PROG(TXTDelegate, "$TXTDelegateDefault", "$TXTDelegateDefault")
AC_PATH_PROG(WMFDecodeDelegate, "$WMFDecodeDelegateDefault", "$WMFDecodeDelegateDefault")
#
type_include_files=''
+# Dejavu fonts.
+AC_MSG_CHECKING(for Dejavu fonts directory)
+dejavu_font_dir=''
+if test "${with_dejavu_font_dir}" != 'default'; then
+ dejavu_font_dir="${with_dejavu_font_dir}/"
+else
+ for font_dir in "${prefix}/share/dejavu/fonts/" '/usr/share/fonts/dejavu/'; do
+ if test -f "${font_dir}DejaVuSerif.ttf"; then
+ dejavu_font_dir="${font_dir}"
+ break 1
+ fi
+ done
+fi
+if test "${dejavu_font_dir}x" != 'x'; then
+ type_include_files="${type_include_files} "'<include file="type-dejavu.xml" />'
+ AC_MSG_RESULT([$dejavu_font_dir])
+else
+ AC_MSG_RESULT([not found!]);
+fi
+AC_SUBST(dejavu_font_dir)
+
# Windows
windows_font_dir=''
if test "$with_windows_font_dir" != "no" && test -n "$with_windows_font_dir"; then
windows_font_dir="${with_windows_font_dir}/"
fi
-if test -n "$windows_font_dir"; then
+if test "${windows_font_dir}x" != 'x'; then
if test -f '/usr/X11R6/lib/X11/fonts/truetype/arial.ttf'; then
windows_font_dir='/usr/X11R6/lib/X11/fonts/truetype/'
fi
windows_font_dir='/usr/share/fonts/msttcore/truetype/'
fi
fi
-if test -n "$windows_font_dir"; then
+if test "${windows_font_dir}x" != 'x'; then
type_include_files="$type_include_files "'<include file="type-windows.xml" />'
fi
AC_SUBST(windows_font_dir)
HDRDecodeDelegate="$HDRDecodeDelegateDefault"
RLEEncodeDelegate="$RLEEncodeDelegateDefault"
RMDelegate="$RMDelegateDefault"
+ RSVGDecodeDelegate="$RSVGDecodeDelegateDefault"
SCANDecodeDelegate="$SCANDecodeDelegateDefault"
ShowImageDelegate="$ShowImageDelegateDefault"
TXTDelegate="$TXTDelegateDefault"
fi
fi
+if test "$with_perl" != 'yes' ; then
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-perl=$with_perl "
+fi
+
+PERL_SUPPORTS_DESTDIR='no'
+
with_perl_static='no'
with_perl_dynamic='no'
if test "$have_perl" != 'no'; then
AC_SUBST(MAGICK_LTDLDEPS)
if test "$with_modules" != 'no'; then
- MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $THREAD_LIBS"
+ MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
else
- MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $THREAD_LIBS"
+ MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
fi
AC_SUBST(MAGICK_DEP_LIBS)
rm -f magick-version
+result_dejavu_font_dir='none'
+if test "${dejavu_font_dir}x" != 'x'; then
+ result_dejavu_font_dir=$dejavu_font_dir
+fi
+
result_ghostscript_font_dir='none'
if test "${ghostscript_font_dir}x" != 'x'; then
result_ghostscript_font_dir=$ghostscript_font_dir
Delegate Configuration:
BZLIB --with-bzlib=$with_bzlib $have_bzlib
Autotrace --with-autotrace=$with_autotrace $have_autotrace
+Dejavu fonts --with-dejavu-font-dir=$with_dejavu_font_dir $result_dejavu_font_dir
DJVU --with-djvu=$with_djvu $have_djvu
DPS --with-dps=$with_dps $have_dps
FFTW --with-fftw=$with_fftw $have_fftw
VERSION = $PACKAGE_VERSION
CC = $CC
CFLAGS = $CFLAGS
- MAGICK_CFLAGS = $MAGICK_CFLAGS
CPPFLAGS = $MAGICK_CPPFLAGS
PCFLAGS = $MAGICK_PCFLAGS
DEFS = $DEFS
projects / imagemagick / blobdiff