# 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.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_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_LN_S
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_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],
# 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)
[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 "
[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([-------------------------------------------------------------])
- PKG_CHECK_MODULES(PANGO, [pangoft2 >= 1.28.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.28.1], have_pango=yes, have_pango=no)
AC_MSG_RESULT([])
fi
fi
-if test "$have_pangoft2" = 'yes'; then
- AC_DEFINE(PANGOFT2_DELEGATE,1,Define if you have PANGOFT2 library)
+if test "$have_pangocairo" = 'yes'; then
+ AC_DEFINE(PANGOCAIRO_DELEGATE,1,Define if you have PANGOCAIRO library)
if test "$with_modules" = 'no'; then
- CPPFLAGS="$PANGOFT2_CFLAGS $CPPFLAGS"
+ 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_HELP_STRING([--without-rsvg],
[disable RSVG support])],
[with_rsvg=$withval],
- [with_rsvg=$have_x])
+ [with_rsvg='yes'])
if test "$with_rsvg" != 'yes'; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-rsvg=$with_rsvg "
[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
fi
RLEEncodeDelegateDefault='rawtorle'
RMDelegateDefault='rm'
-RSVGDecodeDelegateDefault='rsvg'
+RSVGDecodeDelegateDefault='rsvg-convert'
SCANDecodeDelegateDefault='scanimage'
TXTDelegateDefault='enscript'
UniconvertorDelegateDefault='uniconvertor'
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