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(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])])
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
+# 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
AC_ARG_WITH([threads],
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"
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],
* ) 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_ABI_SUFFIX="Q${QUANTUM_DEPTH}"
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__])))
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')
# 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
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')
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
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=''
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')
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')
#
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')
have_jp2='no'
JP2_LIBS=''
if test "$with_jp2" != 'no'; then
- AC_MSG_NOTICE([-------------------------------------------------------------])
+ AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for JPEG Version 2])
- AC_MSG_NOTICE([])
+ AC_MSG_RESULT([])
failed=0
passed=0
AC_CHECK_HEADER(jasper/jasper.h,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])
+ AC_MSG_RESULT([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])
+ AC_MSG_RESULT([yes])
have_jp2='yes'
fi
else
- AC_MSG_NOTICE([no])
+ AC_MSG_RESULT([no])
fi
fi
AM_CONDITIONAL(JP2_DELEGATE, test "$have_jp2" = 'yes')
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
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
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`
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_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
#
# 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
AC_SUBST(DOCUMENTATION_PATH)
# Subdirectory to place architecture-dependent configuration files
-CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}"
+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}/"
AC_SUBST(CONFIGURE_PATH)
# Subdirectory to place architecture-independent configuration files
-SHARE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}"
+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}/"
if test "x$SHAREARCH_BASEDIRNAME" = "x"; then
SHAREARCH_BASEDIRNAME="config"
fi
-AC_DEFINE_UNQUOTED(SHAREARCH_BASEDIRNAME,"$SHAREARCH_BASEDIRNAME",[Configure directory name without ABI part.])
+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",[Configure directory dirname])
+ AC_DEFINE_UNQUOTED(SHAREARCH_DIRNAME,"$SHAREARCH_DIRNAME",[Sharearch directory dirname])
fi
AC_SUBST(SHAREARCH_DIRNAME)
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'
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
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)
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
AC_SUBST(MAGICKCORE_PATH)
# Create a simple string containing format names for all delegate libraries.
-DELEGATES=''
+MAGICK_DELEGATES=''
if test "$have_autotrace" = 'yes' ; then
- DELEGATES="$DELEGATES autotrace"
- MAGICK_FEATURES="$MAGICK_FEATURES Autotrace"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES autotrace"
fi
if test "$have_bzlib" = 'yes' ; then
- DELEGATES="$DELEGATES bzlib"
- MAGICK_FEATURES="$MAGICK_FEATURES BZLIB"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES bzlib"
fi
if test "$have_dps" = 'yes' ; then
- DELEGATES="$DELEGATES dps"
- MAGICK_FEATURES="$MAGICK_FEATURES DPS"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES dps"
fi
if test "$have_djvu" = 'yes' ; then
- DELEGATES="$DELEGATES djvu"
- MAGICK_FEATURES="$MAGICK_FEATURES DJVU"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES djvu"
fi
if test "$have_ffmpeg" = 'yes' ; then
- DELEGATES="$DELEGATES mpeg"
- MAGICK_FEATURES="$MAGICK_FEATURES MPEG"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES mpeg"
fi
if test "$have_fftw" = 'yes' ; then
- DELEGATES="$DELEGATES fftw"
- MAGICK_FEATURES="$MAGICK_FEATURES FFTW"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES fftw"
fi
if test "$have_fig2dev" = 'yes' && test "$have_ps" = 'yes' ; then
- DELEGATES="$DELEGATES xfig"
- MAGICK_FEATURES="$MAGICK_FEATURES XFIG"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES xfig"
fi
if test "$have_fpx" = 'yes' ; then
- DELEGATES="$DELEGATES fpx"
- MAGICK_FEATURES="$MAGICK_FEATURES FPX"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES fpx"
fi
if test "$have_fontconfig" = 'yes' ; then
- DELEGATES="$DELEGATES fontconfig"
- MAGICK_FEATURES="$MAGICK_FEATURES Fontconfig"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES fontconfig"
fi
if test "$have_freetype" = 'yes' ; then
- DELEGATES="$DELEGATES freetype"
- MAGICK_FEATURES="$MAGICK_FEATURES Freetype"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES freetype"
fi
if test "$have_gslib" = 'yes' ; then
- DELEGATES="$DELEGATES gslib"
- MAGICK_FEATURES="$MAGICK_FEATURES Ghostscript"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES gslib"
fi
if test "$have_jbig" = 'yes' ; then
- DELEGATES="$DELEGATES jbig"
- MAGICK_FEATURES="$MAGICK_FEATURES JBIG"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES jbig"
fi
if test "$have_png$have_jpeg" = 'yesyes' ; then
- DELEGATES="$DELEGATES jng"
- MAGICK_FEATURES="$MAGICK_FEATURES JNG"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES jng"
fi
if test "$have_jp2" = 'yes' ; then
- DELEGATES="$DELEGATES jp2"
- MAGICK_FEATURES="$MAGICK_FEATURES JP2"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES jp2"
fi
if test "$have_jpeg" = 'yes' ; then
- DELEGATES="$DELEGATES jpeg"
- MAGICK_FEATURES="$MAGICK_FEATURES JPEG"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES jpeg"
fi
if test "$have_lcms" = 'yes' || test "$have_lcms2" = 'yes' ; then
- DELEGATES="$DELEGATES lcms"
- MAGICK_FEATURES="$MAGICK_FEATURES LCMS"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES lcms"
fi
if test "$have_lqr" = 'yes' ; then
- DELEGATES="$DELEGATES lqr"
- MAGICK_FEATURES="$MAGICK_FEATURES LQR"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES lqr"
fi
if test "$have_lzma" = 'yes' ; then
- DELEGATES="$DELEGATES lzma"
- MAGICK_FEATURES="$MAGICK_FEATURES LZMA"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES lzma"
fi
if test "$have_openexr" = 'yes' ; then
- DELEGATES="$DELEGATES openexr"
- MAGICK_FEATURES="$MAGICK_FEATURES OpenEXR"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES openexr"
fi
if test "$have_pango" = 'yes' ; then
- DELEGATES="$DELEGATES pango"
- MAGICK_FEATURES="$MAGICK_FEATURES Pango"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES pango"
fi
if test "$have_png" = 'yes' ; then
- DELEGATES="$DELEGATES png"
- MAGICK_FEATURES="$MAGICK_FEATURES PNG"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES png"
fi
have_ps='no'
if test "$have_dps" = 'yes' || \
have_ps='yes'
fi
if test "$have_ps" = 'yes' ; then
- DELEGATES="$DELEGATES ps"
- MAGICK_FEATURES="$MAGICK_FEATURES PS"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES ps"
fi
if test "$have_ralcgm" = 'yes' ; then
- DELEGATES="$DELEGATES cgm"
- MAGICK_FEATURES="$MAGICK_FEATURES CGM"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES cgm"
fi
if test "$have_ra_ppm" = 'yes' ; then
- DELEGATES="$DELEGATES rad"
- MAGICK_FEATURES="$MAGICK_FEATURES RAD"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES rad"
fi
if test "$have_rsvg" = 'yes' ; then
- DELEGATES="$DELEGATES rsvg"
- MAGICK_FEATURES="$MAGICK_FEATURES RSVG"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES rsvg"
fi
if test "$have_tiff" = 'yes' ; then
- DELEGATES="$DELEGATES tiff"
- MAGICK_FEATURES="$MAGICK_FEATURES TIFF"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES tiff"
fi
if test "$have_ttf" = 'yes' ; then
- DELEGATES="$DELEGATES ttf"
- MAGICK_FEATURES="$MAGICK_FEATURES TTF"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES ttf"
fi
if test "$have_wmf" = 'yes' ; then
- DELEGATES="$DELEGATES wmf"
- MAGICK_FEATURES="$MAGICK_FEATURES WMF"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES wmf"
fi
if test "$have_x" = 'yes' ; then
- DELEGATES="$DELEGATES x"
- MAGICK_FEATURES="$MAGICK_FEATURES X"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES x"
fi
if test "$have_xml" = 'yes' ; then
- DELEGATES="$DELEGATES xml"
- MAGICK_FEATURES="$MAGICK_FEATURES XML"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES xml"
fi
if test "$have_zlib" = 'yes' ; then
- DELEGATES="$DELEGATES zlib"
- MAGICK_FEATURES="$MAGICK_FEATURES ZLIB"
+ MAGICK_DELEGATES="$MAGICK_DELEGATES zlib"
fi
# Remove extraneous spaces from output variables (asthetic)
-DELEGATES=`echo $DELEGATES | sed -e 's/ */ /g'`
+MAGICK_DELEGATES=`echo $MAGICK_DELEGATES | sed -e 's/ */ /g'`
MAGICK_FEATURES=`echo $MAGICK_FEATURES | sed -e 's/ */ /g'`
-AC_SUBST(DELEGATES)
+AC_SUBST(MAGICK_DELEGATES)
AC_SUBST(MAGICK_FEATURES)
#
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'`
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.
CXX = $CXX
CXXFLAGS = $CXXFLAGS
FEATURES = $MAGICK_FEATURES
+ DELEGATES = $MAGICK_DELEGATES
])
projects / imagemagick / blobdiff