X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=configure.ac;h=9d85726fc04cc4ca2504e806cbfb390d505f83f0;hb=775194c2a1ab7cface73fe0e484cd65c963739a8;hp=6c1dd0687d9d1750b2080359e7d1dff29e7cb516;hpb=2ec87cc1e6933031aad7d2b86bfac53a68fd3c83;p=imagemagick diff --git a/configure.ac b/configure.ac index 6c1dd0687..9d85726fc 100755 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization +# Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization # dedicated to making software imaging solutions freely available. # # You may not use this file except in compliance with the License. You may @@ -57,12 +57,13 @@ AC_CONFIG_FILES([\ Makefile \ magick.sh \ 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 \ - PerlMagick/Magick.pm \ utilities/animate.1 \ utilities/compare.1 \ utilities/composite.1 \ @@ -133,7 +134,13 @@ AC_SUBST([MAGICK_LIBRARY_CURRENT_MIN], AC_SUBST([MAGICK_LIBRARY_VERSION_INFO], [$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE]) - +AC_SUBST(MAGICKPP_LIBRARY_CURRENT)dnl +AC_SUBST(MAGICKPP_LIBRARY_REVISION)dnl +AC_SUBST(MAGICKPP_LIBRARY_AGE)dnl +AC_SUBST([MAGICKPP_LIBRARY_CURRENT_MIN], + [`expr $MAGICKPP_LIBRARY_CURRENT - $MAGICKPP_LIBRARY_AGE`]) +AC_SUBST([MAGICKPP_LIBRARY_VERSION_INFO], + [$MAGICKPP_LIBRARY_CURRENT:$MAGICKPP_LIBRARY_REVISION:$MAGICKPP_LIBRARY_AGE]) AC_SUBST(PACKAGE_NAME)dnl AC_SUBST(PACKAGE_VERSION)dnl @@ -153,6 +160,7 @@ AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-ob # Enable support for silent build rules m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) +# versionning of library MAGICK_LIB_VERSION="0x" if test ${MAGICK_LIBRARY_CURRENT} -lt 10 ; then MAGICK_LIB_VERSION=${MAGICK_LIB_VERSION}0 @@ -176,6 +184,31 @@ AC_SUBST(MAGICK_LIB_VERSION_TEXT) MAGICK_LIB_VERSION_NUMBER="${MAGICK_LIBRARY_CURRENT},${MAGICK_LIBRARY_AGE},${MAGICK_LIBRARY_REVISION}" AC_SUBST(MAGICK_LIB_VERSION_NUMBER) +MAGICKPP_LIB_VERSION="0x" +if test ${MAGICKPP_LIBRARY_CURRENT} -lt 10 ; then + MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}0 +fi +MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_CURRENT} +if test ${MAGICKPP_LIBRARY_AGE} -lt 10 ; then + MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}0 +fi +MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_AGE} +if test ${MAGICKPP_LIBRARY_REVISION} -lt 10 ; then + MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}0 +fi +MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_REVISION} +AC_SUBST(MAGICKPP_LIB_VERSION) + +# Definition used to define MagickLibVersionText in version.h +MAGICKPP_LIB_VERSION_TEXT="${PACKAGE_VERSION}" +AC_SUBST(MAGICKPP_LIB_VERSION_TEXT) + +# Definition used to define MagickLibVersionNumber in version.h +MAGICK_LIB_VERSION_NUMBER="${MAGICK_LIBRARY_CURRENT},${MAGICK_LIBRARY_AGE},${MAGICK_LIBRARY_REVISION}" +AC_SUBST(MAGICK_LIB_VERSION_NUMBER) + + + # Regenerate config.status if ChangeLog or version.sh is updated. AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/version.sh']) @@ -279,17 +312,36 @@ AC_SUBST(LD) AC_PROG_CC_C99 AM_PROG_CC_C_O AX_CFLAGS_WARN_ALL -AX_COMPILER_VENDOR AC_PROG_INSTALL AC_PROG_MAKE_SET AC_PROG_LN_S +AC_PROG_SED AC_PROG_AWK AM_WITH_DMALLOC AX_C___ATTRIBUTE__ AX_GCC_ARCHFLAG([no]) PKG_PROG_PKG_CONFIG -# Check for linker script support +# Test for 64-bit build. +AC_CHECK_SIZEOF([size_t]) + +AX_COMPILER_VENDOR +# The AX_CFLAGS_WARN_ALL macro doesn't currently work for sunpro +# compiler. +if test "$ax_cv_c_compiler_vendor" != "sun"; then + AX_CFLAGS_WARN_ALL +fi + +if test "x$GCC" = "xyes"; then + CFLAGS="$CFLAGS -fexceptions" + touch local.exp +else + cat > local.exp <@]), [pkgconfigdir="$withval"], [pkgconfigdir='${libdir}/pkgconfig']) @@ -438,11 +490,15 @@ AC_SUBST([pkgconfigdir]) # # Enable support for threads +# +# Find Posix threads library +# AC_ARG_WITH([threads], [AC_HELP_STRING([--without-threads], [disable threads support])], [with_threads=$withval], [with_threads='yes']) +THREAD_LIBS='' have_threads=no if test "$with_threads" != 'no'; then AX_PTHREAD() @@ -451,6 +507,7 @@ if test "$with_threads" != 'no'; then DEF_THREAD="$PTHREAD_CFLAGS" CFLAGS="$CFLAGS $DEF_THREAD" CXXFLAGS="$CXXFLAGS $DEF_THREAD" + THREAD_LIBS="$PTHREAD_LIBS" if test "$CC" != "$PTHREAD_CC"; then AC_MSG_WARN([Replacing compiler $CC with compiler $PTHREAD_CC to support pthreads.]) CC="$PTHREAD_CC" @@ -458,6 +515,8 @@ if test "$with_threads" != 'no'; then AC_DEFINE(THREAD_SUPPORT,1,[Define if you have POSIX threads libraries and header files.]) fi fi +LIBS="$LIBS $THREAD_LIBS" +AC_SUBST(THREAD_LIBS) # Enable support for OpenMP if test "$have_threads" != 'yes'; then @@ -476,6 +535,7 @@ fi # Enable support for OpenCL AX_OPENCL([C]) CFLAGS="$CL_CFLAGS $CFLAGS" +CPPFLAGS="$CL_CFLAGS $CPPFLAGS" LIBS="$CL_LIBS $LIBS" AC_SUBST(CL_CFLAGS) if test "$enable_opencl" != no; then @@ -656,6 +716,13 @@ fi # Don't emit "rebuild rules" for configure, Makefile.ins, etc. AM_MAINTAINER_MODE +# Enable hugepages support +AC_ARG_ENABLE([hugepages], + [AC_HELP_STRING([--enable-hugepages], + [enable 'huge pages' support])], + [enable_hugepages=$enableval], + [enable_hugepages='no']) + # Enable ccmalloc memory debugging support AC_ARG_ENABLE([ccmalloc], [AC_HELP_STRING([--enable-ccmalloc], @@ -1115,7 +1182,6 @@ AC_TRY_COMPILE([], # Check for functions # ######## -MAGICK_FUNC_MMAP_FILEIO AC_FUNC_CLOSEDIR_VOID AC_FUNC_MMAP AC_FUNC_FORK @@ -1237,7 +1303,7 @@ if test "$enable_delegate_build" != 'no'; then # Most delegates have includes in the same directory as the library, but not all... # # Includes - for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include lzma magick png tiff/libtiff ttf/include wand webp wmf/include xml/include zlib; do + for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include lzma magick openjp2/include png tiff/libtiff ttf/include wand webp/src wmf/include xml/include zlib; do if test -d "$builddir/$dir"; then CPPFLAGS="$CPPFLAGS -I$builddir/$dir" else @@ -1248,7 +1314,7 @@ if test "$enable_delegate_build" != 'no'; then done # Libraries - for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick png tiff/libtiff ttf/objs wand webp wmf/src xml zlib; do + for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick openjp2 png tiff/libtiff ttf/objs wand webp wmf/src xml zlib; do if test -d "$builddir/$dir/.libs"; then LDFLAGS="$LDFLAGS -L$builddir/$dir/.libs" else @@ -1268,7 +1334,7 @@ fi # 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 @@ -1360,29 +1426,7 @@ if test "$enable_openmp" != 'no'; then fi AC_SUBST(GOMP_LIBS) -# -# Find Posix threads library -# -THREAD_LIBS='' -if test "$with_threads" != 'no' && test "$have_threads" = 'yes'; then - if test "x$PTHREAD_LIBS" = "x"; then - case "${host_cpu}-${host_os}" in - *-freebsd*) - MAGICK_CHECK_PTHREAD_LIB(c_r,PTHREAD_LIBS=-lc_r) ;; - esac - fi - - for lib in pthread pthreads; do - if test "x$PTHREAD_LIBS" = "x"; then - MAGICK_CHECK_PTHREAD_LIB([$lib],[PTHREAD_LIBS=-l$lib]) - fi - done - - THREAD_LIBS="$PTHREAD_LIBS" - LIBS="$LIBS $THREAD_LIBS" -fi -AC_SUBST(THREAD_LIBS) # # Check for umem. @@ -1439,6 +1483,13 @@ if test "$enable_ccmalloc" = 'yes'; then fi fi +# +# Add support for 'huge pages' if requested +# +AS_IF([test "x$enable_hugepages" != "xno"],[ + AC_DEFINE(HAVE_HUGEPAGES, 1, [Compile with hugepage support]) +]) + # # Add support for efence memory debugging library if requested # @@ -1873,6 +1924,8 @@ fi have_fpx='no' FPX_LIBS='' +SAVED_LIBS=${LIBS} +LIBS=${LIBS/-ldjvulibre/} if test "$with_fpx" != 'no'; then AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for FlashPIX]) @@ -1901,6 +1954,7 @@ if test "$with_fpx" != 'no'; then fi AM_CONDITIONAL(FPX_DELEGATE, test "$have_fpx" = 'yes') AC_SUBST(FPX_LIBS) +LIBS=${SAVED_LIBS} dnl =========================================================================== @@ -1981,7 +2035,7 @@ 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']) @@ -2065,7 +2119,7 @@ dnl =========================================================================== # AC_ARG_WITH(gvc, [AC_HELP_STRING([--with-gvc], - [disable GVC support])], + [enable GVC support])], [with_gvc=$withval], [with_gvc='no']) @@ -2201,50 +2255,6 @@ AC_SUBST(JPEG_LIBS) dnl =========================================================================== -# -# Check for JPEG Version 2 delegate library. -# -AC_ARG_WITH([jp2], - [AC_HELP_STRING([--without-jp2], - [disable JPEG-2000 support])], - [with_jp2=$withval], - [with_jp2='yes']) - -if test "$with_jp2" != 'yes'; then - DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-jp2=$with_jp2 " -fi - -have_jp2='no' -JP2_LIBS='' -if test "$with_jp2" != 'no'; then - AC_MSG_RESULT([-------------------------------------------------------------]) - AC_MSG_CHECKING([for JPEG Version 2]) - AC_MSG_RESULT([]) - failed=0 - passed=0 - AC_CHECK_HEADER(jasper/jasper.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`) - AC_CHECK_LIB(jasper,jas_stream_fopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) - AC_MSG_CHECKING([if JPEG version 2 support package is complete]) - if test $passed -gt 0; then - if test $failed -gt 0; then - AC_MSG_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_RESULT([yes]) - have_jp2='yes' - fi - else - AC_MSG_RESULT([no]) - fi -fi -AM_CONDITIONAL(JP2_DELEGATE, test "$have_jp2" = 'yes') -AC_SUBST(JP2_LIBS) - -dnl =========================================================================== - # # Check for LCMS delegate library. # @@ -2377,6 +2387,43 @@ fi AC_SUBST(LCMS_LIBS) +dnl =========================================================================== + +# +# Check for the OpenJP2 delegate library. +# +AC_ARG_WITH([openjp2], + [AC_HELP_STRING([--without-openjp2], + [disable OpenJP2 support])], + [with_openjp2=$withval], + [with_openjp2='yes']) + +if test "$with_openjp2" != 'yes'; then + DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-openjp2=$with_openjp2 " +fi + +have_openjp2='no' +LIBOPENJP2_CFLAGS="" +LIBOPENJP2_LIBS="" +LIBOPENJP2_PKG="" +if test "x$with_openjp2" = "xyes"; then + AC_MSG_RESULT([-------------------------------------------------------------]) + PKG_CHECK_MODULES(LIBOPENJP2,[libopenjp2 >= 2.1.0], have_openjp2=yes, have_openjp2=no) + AC_MSG_RESULT([]) +fi + +if test "$have_openjp2" = 'yes'; then + AC_DEFINE(LIBOPENJP2_DELEGATE,1,Define if you have OPENJP2 library) + if test "$build_modules" = 'no'; then + CFLAGS="$LIBOPENJP2_CFLAGS $CFLAGS" + fi +fi + +AM_CONDITIONAL(LIBOPENJP2_DELEGATE, test "$have_openjp2" = 'yes') +AC_SUBST(LIBOPENJP2_CFLAGS) +AC_SUBST(LIBOPENJP2_LIBS) + + dnl =========================================================================== # @@ -2658,7 +2705,7 @@ dnl =========================================================================== # Check for RSVG delegate library. # AC_ARG_WITH([rsvg], - [AC_HELP_STRING([--without-rsvg], + [AC_HELP_STRING([--with-rsvg], [enable RSVG support])], [with_rsvg=$withval], [with_rsvg='no']) @@ -2777,7 +2824,7 @@ if test "$with_webp" != 'no'; then 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 @@ -2955,7 +3002,7 @@ AC_SUBST(PERLMAINCC) # # Path to ImageMagick header files -INCLUDE_RELATIVE_PATH="ImageMagick" +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 @@ -3003,6 +3050,24 @@ esac 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 @@ -3051,7 +3116,7 @@ AC_SUBST(FILTER_PATH) # # Path to ImageMagick documentation files -DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}" +DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}" DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}" DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/" case "${build_os}" in @@ -3062,8 +3127,16 @@ esac AC_DEFINE_UNQUOTED(DOCUMENTATION_PATH,"$DEFINE_DOCUMENTATION_PATH",[Directory where ImageMagick documents live.]) AC_SUBST(DOCUMENTATION_PATH) +# +# Enable/Disable documentation +AC_ARG_ENABLE([docs], + [AS_HELP_STRING([--disable-docs], + [disable building of documentation])], + wantdocs=$enableval, wantdocs=yes) +AM_CONDITIONAL([INSTALL_DOC], [test "$wantdocs" = "yes"]) + # Subdirectory to place architecture-dependent configuration files -CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}" +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}/" @@ -3076,7 +3149,7 @@ AC_DEFINE_UNQUOTED(CONFIGURE_PATH,"$DEFINE_CONFIGURE_PATH",[Directory where arch 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}/" @@ -3121,14 +3194,13 @@ AutotraceDecodeDelegateDefault='autotrace' BlenderDecodeDelegateDefault='blender' BZIPDelegateDefault='bzip2' BrowseDelegateDefault='xdg-open' -CGMDecodeDelegateDefault='ralcgm' CatDelegateDefault='cat' DNGDecodeDelegateDefault='ufraw-batch' +DOCDecodeDelegateDefault='soffice' GVCDecodeDelegateDefault='dot' DVIDecodeDelegateDefault='dvips' EchoDelegateDefault='echo' EditorDelegateDefault='xterm' -FIGDecodeDelegateDefault='fig2dev' ConvertDelegateDefault=`echo convert | sed ${configure_transform_name}` DisplayDelegateDefault=`echo display | sed ${configure_transform_name}` MogrifyDelegateDefault=`echo mogrify | sed ${configure_transform_name}` @@ -3137,12 +3209,14 @@ HPGLDecodeDelegateDefault='hp2xx' HTMLDecodeDelegateDefault='html2ps' ILBMDecodeDelegateDefault='ilbmtoppm' ILBMEncodeDelegateDefault='ppmtoilbm' +JXRDecodeDelegateDefault='JxrDecApp' +JXREncodeDelegateDefault='JxrEncApp' LPDelegateDefault='lp' LPRDelegateDefault='lpr' LaunchDelegateDefault='gimp' MANDelegateDefault='groff' -MPEGDecodeDelegateDefault='ffmpeg' -MPEGEncodeDelegateDefault='ffmpeg' +MPEGDecodeDelegateDefault='avconv' +MPEGEncodeDelegateDefault='avconv' MrSIDDecodeDelegateDefault='mrsidgeodecode' MVDelegateDefault='mv' PCLDelegateDefault='pcl6' @@ -3162,6 +3236,8 @@ SCANDecodeDelegateDefault='scanimage' SVGDecodeDelegateDefault='inkscape' TXTDelegateDefault='enscript' UniconvertorDelegateDefault='uniconvertor' +WebPDecodeDelegateDefault='dwebp' +WebPEncodeDelegateDefault='cwebp' WMFDecodeDelegateDefault='wmf2eps' WWWDecodeDelegateDefault='curl' XPSDelegateDefault='gxps' @@ -3172,28 +3248,37 @@ AC_PATH_PROG(AutotraceDecodeDelegate, "$AutotraceDecodeDelegateDefault", "$Autot AC_PATH_PROG(BlenderDecodeDelegate, "$BlenderDecodeDelegateDefault", "$BlenderDecodeDelegateDefault") AC_PATH_PROG(BZIPDelegate, "$BZIPDelegateDefault", "$BZIPDelegateDefault") AC_PATH_PROGS(BrowseDelegate, "$BrowseDelegateDefault" google-chrome firefox konqueror mozilla lynx, "$BrowseDelegateDefault") -AC_PATH_PROG(CGMDecodeDelegate, "$CGMDecodeDelegateDefault", "$CGMDecodeDelegateDefault") AC_PATH_PROG(CatDelegate, "$CatDelegateDefault", "$CatDelegateDefault") AC_PATH_PROG(DNGDecodeDelegate, "$DNGDecodeDelegateDefault", "$DNGDecodeDelegateDefault") -AC_PATH_PROG(GVCDecodeDelegate, "$GVCDecodeDelegateDefault", "$GVCDecodeDelegateDefault") +AC_PATH_PROG(DOCDecodeDelegate, "$DOCDecodeDelegateDefault", "$DOCDecodeDelegateDefault") AC_PATH_PROG(DVIDecodeDelegate, "$DVIDecodeDelegateDefault", "$DVIDecodeDelegateDefault") -AC_PATH_PROG(EchoDelegate, "$EchoDelegateDefault", "$EchoDelegateDefault") -AC_PATH_PROG(EditorDelegate, "$EditorDelegateDefault", "$EditorDelegateDefault") -AC_PATH_PROG(FIGDecodeDelegate, "$FIGDecodeDelegateDefault", "$FIGDecodeDelegateDefault") AC_PATH_PROG(ConvertDelegate, "$ConvertDelegateDefault", "$ConvertDelegateDefault") AC_PATH_PROG(DisplayDelegate, "$DisplayDelegateDefault", "$DisplayDelegateDefault") -AC_PATH_PROG(MogrifyDelegate, "$MogrifyDelegateDefault", "$MogrifyDelegateDefault") +AC_PATH_PROG(EchoDelegate, "$EchoDelegateDefault", "$EchoDelegateDefault") +AC_PATH_PROG(EditorDelegate, "$EditorDelegateDefault", "$EditorDelegateDefault") AC_PATH_PROG(GnuplotDecodeDelegate, "$GnuplotDecodeDelegateDefault", "$GnuplotDecodeDelegateDefault") +AC_PATH_PROG(GVCDecodeDelegate, "$GVCDecodeDelegateDefault", "$GVCDecodeDelegateDefault") AC_PATH_PROG(HPGLDecodeDelegate, "$HPGLDecodeDelegateDefault", "$HPGLDecodeDelegateDefault") AC_PATH_PROG(HTMLDecodeDelegate, "$HTMLDecodeDelegateDefault", "$HTMLDecodeDelegateDefault") AC_PATH_PROG(ILBMDecodeDelegate, "$ILBMDecodeDelegateDefault", "$ILBMDecodeDelegateDefault") AC_PATH_PROG(ILBMEncodeDelegate, "$ILBMEncodeDelegateDefault", "$ILBMEncodeDelegateDefault") +AC_PATH_PROG(JXRDecodeDelegate, "$JXRDecodeDelegateDefault", "$JXRDecodeDelegateDefault") +AC_PATH_PROG(JXREncodeDelegate, "$JXREncodeDelegateDefault", "$JXREncodeDelegateDefault") AC_PATH_PROG(LPDelegate, "$LPDelegateDefault", no) AC_PATH_PROG(LPRDelegate, "$LPRDelegateDefault", "$LPRDelegateDefault") AC_PATH_PROG(LaunchDelegate, "$LaunchDelegateDefault", "$LaunchDelegateDefault") AC_PATH_PROG(MANDelegate, "$MANDelegateDefault", "$MANDelegateDefault") +AC_PATH_PROG(MogrifyDelegate, "$MogrifyDelegateDefault", "$MogrifyDelegateDefault") AC_PATH_PROG(MPEGDecodeDelegate, "$MPEGDecodeDelegateDefault", "$MPEGDecodeDelegateDefault") +if test "$MPEGDecodeDelegate" == "$MPEGDecodeDelegateDefault" ; then + MPEGDecodeDelegateDefault='ffmpeg' + AC_PATH_PROG(MPEGDecodeDelegate, "$MPEGDecodeDelegateDefault", "$MPEGDecodeDelegateDefault") +fi; AC_PATH_PROG(MPEGEncodeDelegate, "$MPEGEncodeDelegateDefault", "$MPEGEncodeDelegateDefault") +if test "$MPEGEncodeDelegate" == "$MPEGEncodeDelegateDefault" ; then + MPEGEncodeDelegateDefault='ffmpeg' + AC_PATH_PROG(MPEGEncodeDelegate, "$MPEGEncodeDelegateDefault", "$MPEGEncodeDelegateDefault") +fi; AC_PATH_PROG(MrSIDDecodeDelegate, "$MrSIDDecodeDelegateDefault", "$MrSIDDecodeDelegateDefault") AC_PATH_PROG(MVDelegate, "$MVDelegateDefault", "$MVDelegateDefault") AC_PATH_PROG(PCLDelegate, "$PCLDelegateDefault", "$PCLDelegateDefault") @@ -3207,6 +3292,8 @@ AC_PATH_PROG(SCANDecodeDelegate, "$SCANDecodeDelegateDefault", "$SCANDecodeDeleg AC_PATH_PROG(SVGDecodeDelegate, "$SVGDecodeDelegateDefault", "$SVGDecodeDelegateDefault") AC_PATH_PROG(TXTDelegate, "$TXTDelegateDefault", "$TXTDelegateDefault") AC_PATH_PROG(UniconvertorDelegate, "$UniconvertorDelegateDefault", "$UniconvertorDelegateDefault") +AC_PATH_PROG(WebPDecodeDelegate, "$WebPDecodeDelegateDefault", "$WebPDecodeDelegateDefault") +AC_PATH_PROG(WebPEncodeDelegate, "$WebPEncodeDelegateDefault", "$WebPEncodeDelegateDefault") AC_PATH_PROG(WMFDecodeDelegate, "$WMFDecodeDelegateDefault", "$WMFDecodeDelegateDefault") AC_PATH_PROG(WWWDecodeDelegate, "$WWWDecodeDelegateDefault", "$WWWDecodeDelegateDefault") AC_PATH_PROG(XPSDelegate, "$XPSDelegateDefault", "$XPSDelegateDefault") @@ -3226,15 +3313,13 @@ DisplayDelegate="${BIN_DIR}/${DisplayDelegateDefault}" MogrifyDelegate="${BIN_DIR}/${MogrifyDelegateDefault}" # Set delegate booleans -have_ffmpeg='no'; if test "$MPEGDecodeDelegate" != "$MPEGDecodeDelegateDefault" ; then have_ffmpeg='yes'; fi -have_fig2dev='no' ; if test "$FIGDecodeDelegate" != "$FIGDecodeDelegateDefault" ; then have_fig2dev='yes'; fi +have_avconv='no'; if test "$MPEGDecodeDelegate" != "$MPEGDecodeDelegateDefault" ; then have_avconv='yes'; fi have_gs='no' ; if test "$PSDelegate" != "$PSDelegateDefault"; then have_gs='yes'; fi have_hp2xx='no' ; if test "$HPGLDecodeDelegate" != "$HPGLDecodeDelegateDefault" ; then have_hp2xx='yes'; fi have_ilbmtoppm='no' ; if test "$ILBMDecodeDelegate" != "$ILBMDecodeDelegateDefault" ; then have_ilbmtoppm='yes'; fi have_mrsid='no'; if test "$MrSIDDecodeDelegate" != "$MrSIDDecodeDelegateDefault" ; then have_mrsid='yes'; fi have_pcl='no' ; if test "$PCLDelegate" != "$PCLDelegateDefault"; then have_pcl='yes'; fi have_ppmtoilbm='no' ; if test "$ILBMEncodeDelegate" != "$ILBMEncodeDelegateDefault" ; then have_ppmtoilbm='yes'; fi -have_ralcgm='no' ; if test "$CGMDecodeDelegate" != "$CGMDecodeDelegateDefault" ; then have_ralcgm='yes'; fi have_xps='no' ; if test "$XPSDelegate" != "$XPSDelegateDefault"; then have_xps='yes'; fi # @@ -3340,19 +3425,22 @@ if test "$with_frozenpaths" != 'yes'; then BlenderDecodeDelegate="$BlenderDecodeDelegateDefault" BZIPDelegate="$BZIPDelegateDefault" BrowseDelegate="$BrowseDelegateDefault" - CGMDecodeDelegate="$CGMDecodeDelegateDefault" CatDelegate="$CatDelegateDefault" ConvertDelegate="$ConvertDelegateDefault" - GVCDecodeDelegate="$GVCDecodeDelegateDefault" + DisplayDelegate="$DisplayDelegateDefault" + DNGDecodeDelegate="$DNGDecodeDelegateDefault" + DOCDecodeDelegate="$DOCDecodeDelegateDefault" DVIDecodeDelegate="$DVIDecodeDelegateDefault" EchoDelegate="$EchoDelegateDefault" EditorDelegate="$EditorDelegateDefault" - FIGDecodeDelegate="$FIGDecodeDelegateDefault" GnuplotDecodeDelegate="$GnuplotDecodeDelegateDefault" + GVCDecodeDelegate="$GVCDecodeDelegateDefault" HPGLDecodeDelegate="$HPGLDecodeDelegateDefault" HTMLDecodeDelegate="$HTMLDecodeDelegateDefault" ILBMDecodeDelegate="$ILBMDecodeDelegateDefault" ILBMEncodeDelegate="$ILBMEncodeDelegateDefault" + JXRDecodeDelegate="$JXRDecodeDelegateDefault" + JXREncodeDelegate="$JXREncodeDelegateDefault" LPDelegate="$LPDelegateDefault" LaunchDelegate="$LaunchDelegateDefault" MANDelegate="$MANDelegateDefault" @@ -3373,6 +3461,8 @@ if test "$with_frozenpaths" != 'yes'; then ShowImageDelegate="$ShowImageDelegateDefault" TXTDelegate="$TXTDelegateDefault" UniconvertorDelegate="$UniconvertorDelegateDefault" + WebPDecodeDelegate="$WebPDecodeDelegateDefault" + WebPEncodeDelegate="$WebPEncodeDelegateDefault" WMFDecodeDelegate="$WMFDecodeDelegateDefault" WWWDecodeDelegate="$WWWDecodeDelegateDefault" XPSDelegate="$XPSDelegateDefault" @@ -3384,19 +3474,19 @@ AC_SUBST(AutotraceDecodeDelegate) AC_SUBST(BlenderDecodeDelegate) AC_SUBST(BZIPDelegate) AC_SUBST(BrowseDelegate) -AC_SUBST(CGMDecodeDelegate) AC_SUBST(CatDelegate) AC_SUBST(ConvertDelegate) AC_SUBST(GVCDecodeDelegate) AC_SUBST(DVIDecodeDelegate) AC_SUBST(EchoDelegate) AC_SUBST(EditorDelegate) -AC_SUBST(FIGDecodeDelegate) AC_SUBST(GnuplotDecodeDelegate) AC_SUBST(HPGLDecodeDelegate) AC_SUBST(HTMLDecodeDelegate) AC_SUBST(ILBMDecodeDelegate) AC_SUBST(ILBMEncodeDelegate) +AC_SUBST(JXRDecodeDelegate) +AC_SUBST(JXREncodeDelegate) AC_SUBST(LPDelegate) AC_SUBST(LaunchDelegate) AC_SUBST(MANDelegate) @@ -3416,6 +3506,8 @@ AC_SUBST(ShowImageDelegate) AC_SUBST(TXTDelegate) AC_SUBST(UniconvertorDelegate) AC_SUBST(WMFDecodeDelegate) +AC_SUBST(WebPDecodeDelegate) +AC_SUBST(WebPEncodeDelegate) AC_SUBST(WWWDecodeDelegate) AC_SUBST(XPSDelegate) AC_SUBST(ZipDelegate) @@ -3550,7 +3642,7 @@ GSColorDevice=pnmraw GSCMYKDevice=pam GSMonoDevice=pbmraw GSPDFDevice=pdfwrite -GSPSDevice=pswrite +GSPSDevice=ps2write GSEPSDevice=epswrite GSVersion='unknown' if test $have_gs = 'yes'; then @@ -3710,15 +3802,12 @@ fi if test "$have_djvu" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES djvu" fi -if test "$have_ffmpeg" = 'yes' ; then +if test "$have_avconv" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES mpeg" fi if test "$have_fftw" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES fftw" fi -if test "$have_fig2dev" = 'yes' && test "$have_ps" = 'yes' ; then - MAGICK_DELEGATES="$MAGICK_DELEGATES xfig" -fi if test "$have_fpx" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES fpx" fi @@ -3755,6 +3844,9 @@ fi if test "$have_openexr" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES openexr" fi +if test "$have_openjp2" = 'yes' ; then + MAGICK_DELEGATES="$MAGICK_DELEGATES openjp2" +fi if test "$have_pango" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES pango" fi @@ -3770,9 +3862,6 @@ fi if test "$have_ps" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES ps" fi -if test "$have_ralcgm" = 'yes' ; then - MAGICK_DELEGATES="$MAGICK_DELEGATES cgm" -fi if test "$have_ra_ppm" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES rad" fi @@ -3785,6 +3874,9 @@ fi if test "$have_ttf" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES ttf" fi +if test "$have_webp" = 'yes' ; then + MAGICK_DELEGATES="$MAGICK_DELEGATES webp" +fi if test "$have_wmf" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES wmf" fi @@ -3845,9 +3937,9 @@ fi # if test "$build_modules" != 'no'; then - MAGICK_DEP_LIBS="$LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS" + MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS" else - MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS" + MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $OPENJPEG_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS" fi AC_SUBST(MAGICK_DEP_LIBS) @@ -3884,7 +3976,7 @@ MAGICK_CXXFLAGS="$CXXFLAGS" MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/ */ /g'` MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/ */ /g'` MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS" -MAGICK_LIBS="-lMagickCore $MAGICK_DEP_LIBS" +MAGICK_LIBS="$MAGICK_DEP_LIBS" AC_SUBST(MAGICK_CFLAGS) AC_SUBST(MAGICK_CXXFLAGS) @@ -3960,6 +4052,7 @@ JPEG v1 --with-jpeg=$with_jpeg $have_jpeg JPEG-2000 --with-jp2=$with_jp2 $have_jp2 LCMS v1 --with-lcms=$with_lcms $have_lcms LCMS v2 --with-lcms2=$with_lcms2 $have_lcms2 +LIBJPEG2 --with-openjp2=$with_openjp2 $have_openjp2 LQR --with-lqr=$with_lqr $have_lqr LTDL --with-ltdl=$with_ltdl $have_ltdl LZMA --with-lzma=$with_lzma $have_lzma @@ -3989,12 +4082,11 @@ Options used to compile and link: VERSION = $PACKAGE_VERSION CC = $CC CFLAGS = $CFLAGS - CPPFLAGS = $MAGICK_CPPFLAGS - PCFLAGS = $MAGICK_PCFLAGS + CPPFLAGS = $CPPFLAGS + PCFLAGS = $PCFLAGS DEFS = $DEFS LDFLAGS = $LDFLAGS - MAGICK_LDFLAGS = $MAGICK_LDFLAGS - LIBS = $MAGICK_LIBS + LIBS = $LIBS CXX = $CXX CXXFLAGS = $CXXFLAGS FEATURES = $MAGICK_FEATURES