X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=configure;h=01757bc116b271c7295b8b98cf51bb1805a2bb70;hb=d05e1ecebe9955b82f403988992831254d5fa042;hp=63c58b36f5444701f6a2d1a4d6bd7ee0d71b33ba;hpb=6c1eef17fc5ba1c9cd003e56b036b2724a1e6f09;p=imagemagick diff --git a/configure b/configure index 63c58b36f..01757bc11 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for ImageMagick 6.6.9. +# Generated by GNU Autoconf 2.68 for ImageMagick 7.0.0-0. # # Report bugs to . # @@ -573,13 +573,13 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ImageMagick' -PACKAGE_TARNAME='ImageMagick-6.6.9' -PACKAGE_VERSION='6.6.9' -PACKAGE_STRING='ImageMagick 6.6.9' +PACKAGE_TARNAME='ImageMagick' +PACKAGE_VERSION='7.0.0-0' +PACKAGE_STRING='ImageMagick 7.0.0-0' PACKAGE_BUGREPORT='http://www.imagemagick.org' PACKAGE_URL='' -ac_unique_file="magick/MagickCore.h" +ac_unique_file="MagickCore/MagickCore.h" ac_config_libobj_dir=ltdl # Factoring default headers for most tests. ac_includes_default="\ @@ -721,6 +721,7 @@ BrowseDelegate BZIPDelegate BlenderDecodeDelegate AutotraceDecodeDelegate +SHAREARCH_PATH SHARE_PATH CONFIGURE_PATH DOCUMENTATION_PATH @@ -728,11 +729,13 @@ FILTER_PATH CODER_PATH LIBRARY_PATH EXECUTABLE_PATH +INCLUDE_PATH PERLMAINCC XML_LIBS XML_DELEGATE_FALSE XML_DELEGATE_TRUE xml2_config +WMF_LIBS_DEPS WMF_LIBS WMF_DELEGATE_FALSE WMF_DELEGATE_TRUE @@ -753,13 +756,20 @@ RSVG_CFLAGS PNG_LIBS PNG_DELEGATE_FALSE PNG_DELEGATE_TRUE +PANGOFT2_DELEGATE_FALSE +PANGOFT2_DELEGATE_TRUE +PANGO_DELEGATE_FALSE +PANGO_DELEGATE_TRUE +PANGO_LIBS +PANGO_CFLAGS OPENEXR_DELEGATE_FALSE OPENEXR_DELEGATE_TRUE OPENEXR_LIBS OPENEXR_CFLAGS -LZMA_LIBS LZMA_DELEGATE_FALSE LZMA_DELEGATE_TRUE +LZMA_LIBS +LZMA_CFLAGS LQR_DELEGATE_FALSE LQR_DELEGATE_TRUE LQR_LIBS @@ -911,6 +921,8 @@ PTHREAD_CFLAGS PTHREAD_LIBS PTHREAD_CC ax_pthread_config +SHAREARCH_DIR +INCLUDEARCH_DIR WinPathScript USING_CL_FALSE USING_CL_TRUE @@ -1006,6 +1018,7 @@ PACKAGE_LIB_VERSION_NUMBER PACKAGE_LIB_VERSION PACKAGE_CHANGE_DATE PACKAGE_RELEASE +PACKAGE_PERL_VERSION MAGICK_SVN_REVISION MAGICK_LIBRARY_VERSION_INFO MAGICK_LIBRARY_CURRENT_MIN @@ -1076,6 +1089,8 @@ with_gnu_ld with_dmalloc enable_bounds_checking enable_osx_universal_binary +with_includearch_dir +with_sharearch_dir with_threads enable_openmp enable_opencl @@ -1095,7 +1110,7 @@ enable_delegate_build enable_deprecated enable_installed enable_cipher -enable_embeddable +enable_zero_configuration enable_hdri enable_assert enable_maintainer_mode @@ -1136,6 +1151,7 @@ with_lcms2 with_lqr with_lzma with_openexr +with_pango with_png with_rsvg with_tiff @@ -1167,8 +1183,12 @@ GVC_CFLAGS GVC_LIBS LQR_CFLAGS LQR_LIBS +LZMA_CFLAGS +LZMA_LIBS OPENEXR_CFLAGS OPENEXR_LIBS +PANGO_CFLAGS +PANGO_LIBS RSVG_CFLAGS RSVG_LIBS CAIRO_SVG_CFLAGS @@ -1715,7 +1735,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ImageMagick 6.6.9 to adapt to many kinds of systems. +\`configure' configures ImageMagick 7.0.0-0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1763,8 +1783,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root - [DATAROOTDIR/doc/ImageMagick-6.6.9] + --docdir=DIR documentation root [DATAROOTDIR/doc/ImageMagick] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1791,7 +1810,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ImageMagick 6.6.9:";; + short | recursive ) echo "Configuration of ImageMagick 7.0.0-0:";; esac cat <<\_ACEOF @@ -1820,7 +1839,8 @@ Optional Features: MagickWand API's --disable-installed Formally install ImageMagick under PREFIX --disable-cipher disable enciphering and deciphering image pixels - --enable-embeddable enable self-contained, embeddable, + --enable-zero-configuration + enable self-contained, embeddable, zero-configuration ImageMagick --enable-hdri accurately represent the wide range of intensity levels found in real scenes @@ -1840,8 +1860,10 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-dmalloc use dmalloc, as in http://www.dmalloc.com/dmalloc.tar.gz + --includearch-dir=DIR ARCH specific include directory + --sharearch-dir=DIR ARCH specific config directory --without-threads disable threads support - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). @@ -1888,6 +1910,7 @@ Optional Packages: --without-lqr disable Liquid Rescale support --without-lzma disable LZMA support --without-openexr disable OpenEXR support + --without-pango disable PANGO support --without-png disable PNG support --without-rsvg disable RSVG support --without-tiff disable TIFF support @@ -1923,10 +1946,15 @@ Some influential environment variables: GVC_LIBS linker flags for GVC, overriding pkg-config LQR_CFLAGS C compiler flags for LQR, overriding pkg-config LQR_LIBS linker flags for LQR, overriding pkg-config + LZMA_CFLAGS C compiler flags for LZMA, overriding pkg-config + LZMA_LIBS linker flags for LZMA, overriding pkg-config OPENEXR_CFLAGS C compiler flags for OPENEXR, overriding pkg-config OPENEXR_LIBS linker flags for OPENEXR, overriding pkg-config + PANGO_CFLAGS + C compiler flags for PANGO, overriding pkg-config + PANGO_LIBS linker flags for PANGO, overriding pkg-config RSVG_CFLAGS C compiler flags for RSVG, overriding pkg-config RSVG_LIBS linker flags for RSVG, overriding pkg-config CAIRO_SVG_CFLAGS @@ -2000,7 +2028,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ImageMagick configure 6.6.9 +ImageMagick configure 7.0.0-0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2644,6 +2672,133 @@ $as_echo "$ac_res" >&6; } } # ac_fn_c_check_member +# ac_fn_c_find_intX_t LINENO BITS VAR +# ----------------------------------- +# Finds a signed integer type with width BITS, setting cache variable VAR +# accordingly. +ac_fn_c_find_intX_t () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5 +$as_echo_n "checking for int$2_t... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + # Order is important - never check a type that is potentially smaller + # than half of the expected target width. + for ac_type in int$2_t 'int' 'long int' \ + 'long long int' 'short int' 'signed char'; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default + enum { N = $2 / 2 - 1 }; +int +main () +{ +static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default + enum { N = $2 / 2 - 1 }; +int +main () +{ +static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) + < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + case $ac_type in #( + int$2_t) : + eval "$3=yes" ;; #( + *) : + eval "$3=\$ac_type" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if eval test \"x\$"$3"\" = x"no"; then : + +else + break +fi + done +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_find_intX_t + +# ac_fn_c_find_uintX_t LINENO BITS VAR +# ------------------------------------ +# Finds an unsigned integer type with width BITS, setting cache variable VAR +# accordingly. +ac_fn_c_find_uintX_t () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5 +$as_echo_n "checking for uint$2_t... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + # Order is important - never check a type that is potentially smaller + # than half of the expected target width. + for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \ + 'unsigned long long int' 'unsigned short int' 'unsigned char'; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + case $ac_type in #( + uint$2_t) : + eval "$3=yes" ;; #( + *) : + eval "$3=\$ac_type" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if eval test \"x\$"$3"\" = x"no"; then : + +else + break +fi + done +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_find_uintX_t + # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES # -------------------------------------------- # Tries to find the compile-time value of EXPR in a program that includes @@ -2916,7 +3071,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ImageMagick $as_me 6.6.9, which was +It was created by ImageMagick $as_me 7.0.0-0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3302,9 +3457,9 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ac_config_headers="$ac_config_headers config/config.h" -ac_config_commands="$ac_config_commands magick/magick-config.h" +ac_config_commands="$ac_config_commands MagickCore/magick-config.h" -ac_config_files="$ac_config_files config/configure.xml config/delegates.xml config/ImageMagick.rdf config/MagickCore.dox config/MagickWand.dox config/type-dejavu.xml config/type-ghostscript.xml config/type-windows.xml config/type.xml ImageMagick.spec Magick++/bin/Magick++-config magick/ImageMagick.pc Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc magick/Magick-config magick/MagickCore-config magick/MagickCore.pc magick/version.h Makefile magick.sh PerlMagick/Magick.pm PerlMagick/Makefile.PL PerlMagick/check.sh utilities/animate.1 utilities/compare.1 utilities/composite.1 utilities/conjure.1 utilities/convert.1 utilities/display.1 utilities/identify.1 utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 utilities/montage.1 utilities/stream.1 wand/MagickWand-config wand/MagickWand.pc wand/Wand-config wand/Wand.pc" +ac_config_files="$ac_config_files config/configure.xml config/delegates.xml config/ImageMagick.rdf config/MagickCore.dox config/MagickWand.dox config/type-dejavu.xml config/type-ghostscript.xml config/type-windows.xml config/type.xml 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 utilities/animate.1 utilities/compare.1 utilities/composite.1 utilities/conjure.1 utilities/convert.1 utilities/display.1 utilities/identify.1 utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 utilities/montage.1 utilities/stream.1 MagickWand/MagickWand-config MagickWand/MagickWand.pc" # @@ -3455,7 +3610,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE` MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE -MAGICK_SVN_REVISION=4443 +MAGICK_SVN_REVISION=6328 @@ -3878,6 +4033,18 @@ else fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=1;; +esac +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -3899,9 +4066,18 @@ fi # Define the identity of the package. - PACKAGE=$PACKAGE_NAME - VERSION="${PACKAGE_VERSION}${PACKAGE_VERSION_ADDENDUM}" + PACKAGE='ImageMagick' + VERSION='7.0.0-0' + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF # Some tools Automake needs. @@ -8087,6 +8263,38 @@ Please re-run configure with these options: ;; esac +# +# ARCH specific include directory +# + +# Check whether --with-includearch-dir was given. +if test "${with_includearch_dir+set}" = set; then : + withval=$with_includearch_dir; includearch_dir=$withval +else + includearch_dir=$INCLUDE_DIR +fi + + +eval "eval INCLUDEARCH_DIR=$includearch_dir" + + +# +# ARCH specific configuration directory +# + +# Check whether --with-sharearch-dir was given. +if test "${with_sharearch_dir+set}" = set; then : + withval=$with_sharearch_dir; sharearch_dir=$withval +else + sharearch_dir="${LIB_DIR}" +fi + + +eval "eval SHAREARCH_DIR=$sharearch_dir" +SHAREARCH_DIR="$sharearch_dir" + + +# # Enable support for threads # Check whether --with-threads was given. @@ -8101,7 +8309,6 @@ have_threads=no if test "$with_threads" != 'no'; then - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8167,7 +8374,7 @@ fi # which indicates that we try without any flags at all, and "pthread-config" # which is a program returning the flags for the Pth emulation library. -ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" +ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt lpthread pthread-config" # The ordering *is* (sometimes) important. Some notes on the # individual items follow: @@ -8203,9 +8410,9 @@ case "${host_cpu}-${host_os}" in ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" ;; - *-darwin*) - ax_pthread_flags="-pthread $ax_pthread_flags" - ;; + *-darwin*) + ax_pthread_flags="-pthread $ax_pthread_flags" + ;; esac if test x"$ax_pthread_ok" = xno; then @@ -8223,8 +8430,8 @@ $as_echo_n "checking whether pthreads work with $flag... " >&6; } PTHREAD_CFLAGS="$flag" ;; - pthread-config) - # Extract the first word of "pthread-config", so it can be a program name with args. + pthread-config) + # Extract the first word of "pthread-config", so it can be a program name with args. set dummy pthread-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -8262,10 +8469,10 @@ $as_echo "no" >&6; } fi - if test x"$ax_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; + if test x"$ax_pthread_config" = xno; then continue; fi + PTHREAD_CFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 @@ -8291,17 +8498,17 @@ $as_echo_n "checking for the pthreads library -l$flag... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - static void routine(void* a) {a=0;} - static void* start_routine(void* a) {return a;} + static void routine(void *a) { a = 0; } + static void *start_routine(void *a) { return a; } int main () { pthread_t th; pthread_attr_t attr; - pthread_create(&th,0,start_routine,0); - pthread_join(th, 0); - pthread_attr_init(&attr); - pthread_cleanup_push(routine, 0); - pthread_cleanup_pop(0); + pthread_create(&th, 0, start_routine, 0); + pthread_join(th, 0); + pthread_attr_init(&attr); + pthread_cleanup_push(routine, 0); + pthread_cleanup_pop(0) /* ; */ ; return 0; } @@ -8334,17 +8541,17 @@ if test "x$ax_pthread_ok" = xyes; then CFLAGS="$CFLAGS $PTHREAD_CFLAGS" # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 $as_echo_n "checking for joinable pthread attribute... " >&6; } - attr_name=unknown - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + attr_name=unknown + for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int main () { -int attr=$attr; return attr; +int attr = $attr; return attr /* ; */ ; return 0; } @@ -8354,7 +8561,7 @@ if ac_fn_c_try_link "$LINENO"; then : fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - done + done { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5 $as_echo "$attr_name" >&6; } if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then @@ -8378,11 +8585,46 @@ $as_echo "${flag}" >&6; } PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5 +$as_echo_n "checking for PTHREAD_PRIO_INHERIT... " >&6; } +if ${ax_cv_PTHREAD_PRIO_INHERIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include +int +main () +{ +int i = PTHREAD_PRIO_INHERIT; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_PTHREAD_PRIO_INHERIT=yes +else + ax_cv_PTHREAD_PRIO_INHERIT=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5 +$as_echo "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; } + if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"; then : + +$as_echo "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h + +fi + LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" # More AIX lossage: must compile with xlc_r or cc_r - if test x"$GCC" != xyes; then + if test x"$GCC" != xyes; then for ac_prog in xlc_r cc_r do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -8428,7 +8670,7 @@ test -n "$PTHREAD_CC" || PTHREAD_CC="${CC}" else PTHREAD_CC=$CC - fi + fi else PTHREAD_CC="$CC" fi @@ -8551,7 +8793,6 @@ fi # Enable support for OpenCL - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8617,7 +8858,7 @@ fi # which indicates that we try without any flags at all, and "pthread-config" # which is a program returning the flags for the Pth emulation library. -ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" +ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt lpthread pthread-config" # The ordering *is* (sometimes) important. Some notes on the # individual items follow: @@ -8653,9 +8894,9 @@ case "${host_cpu}-${host_os}" in ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" ;; - *-darwin*) - ax_pthread_flags="-pthread $ax_pthread_flags" - ;; + *-darwin*) + ax_pthread_flags="-pthread $ax_pthread_flags" + ;; esac if test x"$ax_pthread_ok" = xno; then @@ -8673,8 +8914,8 @@ $as_echo_n "checking whether pthreads work with $flag... " >&6; } PTHREAD_CFLAGS="$flag" ;; - pthread-config) - # Extract the first word of "pthread-config", so it can be a program name with args. + pthread-config) + # Extract the first word of "pthread-config", so it can be a program name with args. set dummy pthread-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -8712,10 +8953,10 @@ $as_echo "no" >&6; } fi - if test x"$ax_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; + if test x"$ax_pthread_config" = xno; then continue; fi + PTHREAD_CFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 @@ -8741,17 +8982,17 @@ $as_echo_n "checking for the pthreads library -l$flag... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - static void routine(void* a) {a=0;} - static void* start_routine(void* a) {return a;} + static void routine(void *a) { a = 0; } + static void *start_routine(void *a) { return a; } int main () { pthread_t th; pthread_attr_t attr; - pthread_create(&th,0,start_routine,0); - pthread_join(th, 0); - pthread_attr_init(&attr); - pthread_cleanup_push(routine, 0); - pthread_cleanup_pop(0); + pthread_create(&th, 0, start_routine, 0); + pthread_join(th, 0); + pthread_attr_init(&attr); + pthread_cleanup_push(routine, 0); + pthread_cleanup_pop(0) /* ; */ ; return 0; } @@ -8784,17 +9025,17 @@ if test "x$ax_pthread_ok" = xyes; then CFLAGS="$CFLAGS $PTHREAD_CFLAGS" # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 $as_echo_n "checking for joinable pthread attribute... " >&6; } - attr_name=unknown - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + attr_name=unknown + for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int main () { -int attr=$attr; return attr; +int attr = $attr; return attr /* ; */ ; return 0; } @@ -8804,7 +9045,7 @@ if ac_fn_c_try_link "$LINENO"; then : fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - done + done { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5 $as_echo "$attr_name" >&6; } if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then @@ -8828,11 +9069,46 @@ $as_echo "${flag}" >&6; } PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5 +$as_echo_n "checking for PTHREAD_PRIO_INHERIT... " >&6; } +if ${ax_cv_PTHREAD_PRIO_INHERIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include +int +main () +{ +int i = PTHREAD_PRIO_INHERIT; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_PTHREAD_PRIO_INHERIT=yes +else + ax_cv_PTHREAD_PRIO_INHERIT=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5 +$as_echo "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; } + if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"; then : + +$as_echo "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h + +fi + LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" # More AIX lossage: must compile with xlc_r or cc_r - if test x"$GCC" != xyes; then + if test x"$GCC" != xyes; then for ac_prog in xlc_r cc_r do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -8878,7 +9154,7 @@ test -n "$PTHREAD_CC" || PTHREAD_CC="${CC}" else PTHREAD_CC=$CC - fi + fi else PTHREAD_CC="$CC" fi @@ -9092,7 +9368,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext done - if test "X$ax_cv_check_cl_libcl" = Xno -a X$no_x = Xyes; then : + if test "X$ax_cv_check_cl_libcl" = Xno; then : LIBS='-Wl,-framework,OpenCL' cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9150,7 +9426,7 @@ CFLAGS="$CL_CFLAGS $CFLAGS" LIBS="$CL_LIBS $LIBS" if test "$enable_opencl" != no; then - if test "_OPENCL" = '1'; then + if test "X$ax_cv_check_cl_libcl" != Xno; then : MAGICK_FEATURES="OpenCL $MAGICK_FEATURES" fi fi @@ -9428,9 +9704,11 @@ fi LFS_CPPFLAGS='' if test "$enable_largefile" != no; then - if test "$ac_cv_sys_file_offset_bits" != 'no'; then - LFS_CPPFLAGS="$LFS_CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" - else + case $ac_cv_sys_file_offset_bits in + no) + # nothing to do here as the host supports LFS fine + ;; + unknown) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native large file support" >&5 $as_echo_n "checking for native large file support... " >&6; } if test "$cross_compiling" = yes; then : @@ -9456,17 +9734,21 @@ _ACEOF if ac_fn_c_try_run "$LINENO"; then : ac_cv_sys_file_offset_bits=64; $as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi + ;; + *) + LFS_CPPFLAGS="$LFS_CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" + ;; + esac if test "$ac_cv_sys_large_files" != 'no'; then LFS_CPPFLAGS="$LFS_CPPFLAGS -D_LARGE_FILES=1" fi @@ -9476,9 +9758,6 @@ fi fi -# -# Configure libtool & libltdl -# # Configure libtool enable_dlopen=yes @@ -9492,8 +9771,8 @@ esac -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -9794,6 +10073,11 @@ else lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -9833,7 +10117,7 @@ else # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -10259,7 +10543,7 @@ irix5* | irix6* | nonstopux*) lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -10896,13 +11180,13 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -11049,6 +11333,7 @@ for ac_symprfx in "" "_"; do # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -11437,7 +11722,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -11448,7 +11733,20 @@ sparc*-*solaris*) case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -12088,7 +12386,13 @@ else $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -12099,6 +12403,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -12131,6 +12436,7 @@ rm -f core conftest.err conftest.$ac_objext \ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -12152,7 +12458,9 @@ _LT_EOF echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -12597,7 +12905,22 @@ fi # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -12670,6 +12993,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + + @@ -13134,7 +13461,9 @@ lt_prog_compiler_static= case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -13225,18 +13554,33 @@ lt_prog_compiler_static= ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -13598,7 +13942,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -13848,8 +14191,7 @@ _LT_EOF xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -14228,6 +14570,7 @@ fi # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -14273,6 +14616,7 @@ fi hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -14301,10 +14645,6 @@ fi hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -14317,7 +14657,7 @@ fi ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -14356,7 +14696,6 @@ fi fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -14974,11 +15313,6 @@ esac - - - - - @@ -15074,7 +15408,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -15083,7 +15417,7 @@ aix3*) ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -15148,7 +15482,7 @@ beos*) ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -15287,7 +15621,7 @@ darwin* | rhapsody*) ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -15295,10 +15629,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -15306,7 +15636,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -15324,7 +15654,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -15344,17 +15674,18 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -15415,7 +15746,7 @@ hpux9* | hpux10* | hpux11*) ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -15431,7 +15762,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -15468,9 +15799,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15556,7 +15887,7 @@ netbsd*) ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -15625,7 +15956,7 @@ rdos*) ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15650,7 +15981,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -15674,7 +16005,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -15705,7 +16036,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15715,7 +16046,7 @@ tpf*) ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -16640,7 +16971,6 @@ export_dynamic_flag_spec_CXX= hardcode_direct_CXX=no hardcode_direct_absolute_CXX=no hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= hardcode_libdir_separator_CXX= hardcode_minus_L_CXX=no hardcode_shlibpath_var_CXX=unsupported @@ -17224,6 +17554,7 @@ fi hardcode_shlibpath_var_CXX=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec_CXX='' fi @@ -17268,7 +17599,7 @@ fi esac ;; - freebsd[12]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF ld_shlibs_CXX=no @@ -17944,6 +18275,7 @@ _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -18733,7 +19065,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' @@ -18883,8 +19217,6 @@ esac - - @@ -18913,7 +19245,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -18922,7 +19254,7 @@ aix3*) ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -18987,7 +19319,7 @@ beos*) ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -19124,7 +19456,7 @@ darwin* | rhapsody*) ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -19132,10 +19464,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -19143,7 +19471,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -19161,7 +19489,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -19181,17 +19509,18 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -19252,7 +19581,7 @@ hpux9* | hpux10* | hpux11*) ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -19268,7 +19597,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -19305,9 +19634,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -19393,7 +19722,7 @@ netbsd*) ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -19462,7 +19791,7 @@ rdos*) ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -19487,7 +19816,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -19511,7 +19840,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -19542,7 +19871,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -19552,7 +19881,7 @@ tpf*) ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -19691,6 +20020,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + ac_config_commands="$ac_config_commands libtool" @@ -19718,6 +20049,8 @@ else module=yes eval libltdl_cv_shlibext=$shrext_cmds +module=no +eval libltdl_cv_shrext=$shrext_cmds fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libltdl_cv_shlibext" >&5 @@ -19728,6 +20061,13 @@ cat >>confdefs.h <<_ACEOF #define LT_MODULE_EXT "$libltdl_cv_shlibext" _ACEOF +fi +if test "$libltdl_cv_shrext" != "$libltdl_cv_shlibext"; then + +cat >>confdefs.h <<_ACEOF +#define LT_SHARED_EXT "$libltdl_cv_shrext" +_ACEOF + fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variable specifies run-time module search path" >&5 @@ -20912,19 +21252,20 @@ $as_echo "#define CIPHER_SUPPORT 1" >>confdefs.h fi -# Build an embeddable version of ImageMagick. -# Check whether --enable-embeddable was given. -if test "${enable_embeddable+set}" = set; then : - enableval=$enable_embeddable; enable_embeddable=$enableval +# Build a zero-configuration version of ImageMagick. +# Check whether --enable-zero-configuration was given. +if test "${enable_zero_configuration+set}" = set; then : + enableval=$enable_zero_configuration; enable_zero_configuration=$enableval else - enable_embeddable='no' + enable_zero_configuration='no' fi -if test "$enable_embeddable" = 'yes'; then +if test "$enable_zero_configuration" = 'yes'; then -$as_echo "#define EMBEDDABLE_SUPPORT 1" >>confdefs.h +$as_echo "#define ZERO_CONFIGURATION_SUPPORT 1" >>confdefs.h + MAGICK_FEATURES="Zero-Configuration $MAGICK_FEATURES" fi # Build a high dynamic range version of ImageMagick. @@ -20960,9 +21301,7 @@ $as_echo "#define NDEBUG 1" >>confdefs.h fi -# Add configure option --enable-maintainer-mode which enables dependency -# checking and generation useful to package maintainers. This is made an -# option to avoid confusing end users. +# Don't emit "rebuild rules" for configure, Makefile.ins, etc. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } @@ -20987,7 +21326,6 @@ fi - # Enable ccmalloc memory debugging support # Check whether --enable-ccmalloc was given. if test "${enable_ccmalloc+set}" = set; then : @@ -21080,9 +21418,6 @@ case "${with_quantum_depth}" in 64 ) ;; * ) as_fn_error 16 "\"Pixel quantum depth must have value of 8" "$LINENO" 5 ;; esac -if test "$enable_hdri" = 'yes'; then - with_quantum_depth=16 -fi QUANTUM_DEPTH="$with_quantum_depth" cat >>confdefs.h <<_ACEOF @@ -21563,7 +21898,7 @@ fi # Check additional headers -for ac_header in 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 +for ac_header in arm/limits.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h OS.h process.h stdarg.h sys/ipc.h sys/resource.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h wchar.h xlocale.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -22261,73 +22596,237 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h esac -# Define mode_t to a suitable type, if standard headers do not define it. -ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" -if test "x$ac_cv_type_mode_t" = xyes; then : +# Define to a suitable type, if standard headers do not define it. +ac_fn_c_find_intX_t "$LINENO" "8" "ac_cv_c_int8_t" +case $ac_cv_c_int8_t in #( + no|yes) ;; #( + *) -else +cat >>confdefs.h <<_ACEOF +#define int8_t $ac_cv_c_int8_t +_ACEOF +;; +esac + +ac_fn_c_find_intX_t "$LINENO" "16" "ac_cv_c_int16_t" +case $ac_cv_c_int16_t in #( + no|yes) ;; #( + *) cat >>confdefs.h <<_ACEOF -#define mode_t int +#define int16_t $ac_cv_c_int16_t _ACEOF +;; +esac -fi +ac_fn_c_find_intX_t "$LINENO" "32" "ac_cv_c_int32_t" +case $ac_cv_c_int32_t in #( + no|yes) ;; #( + *) + +cat >>confdefs.h <<_ACEOF +#define int32_t $ac_cv_c_int32_t +_ACEOF +;; +esac +ac_fn_c_find_intX_t "$LINENO" "64" "ac_cv_c_int64_t" +case $ac_cv_c_int64_t in #( + no|yes) ;; #( + *) + +cat >>confdefs.h <<_ACEOF +#define int64_t $ac_cv_c_int64_t +_ACEOF +;; +esac -# Define off_t to a suitable type, if standard headers do not define it. -ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" -if test "x$ac_cv_type_off_t" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 +$as_echo_n "checking for long long int... " >&6; } +if ${ac_cv_type_long_long_int+:} false; then : + $as_echo_n "(cached) " >&6 else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -cat >>confdefs.h <<_ACEOF -#define off_t long int + /* For now, do not test the preprocessor; as of 2007 there are too many + implementations with broken preprocessors. Perhaps this can + be revisited in 2012. In the meantime, code should not expect + #if to work with literals wider than 32 bits. */ + /* Test literals. */ + long long int ll = 9223372036854775807ll; + long long int nll = -9223372036854775807LL; + unsigned long long int ull = 18446744073709551615ULL; + /* Test constant expressions. */ + typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) + ? 1 : -1)]; + typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 + ? 1 : -1)]; + int i = 63; +int +main () +{ +/* Test availability of runtime routines for shift and division. */ + long long int llmax = 9223372036854775807ll; + unsigned long long int ullmax = 18446744073709551615ull; + return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) + | (llmax / ll) | (llmax % ll) + | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) + | (ullmax / ull) | (ullmax % ull)); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + if test "$cross_compiling" = yes; then : + ac_cv_type_long_long_int=yes +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #ifndef LLONG_MAX + # define HALF \ + (1LL << (sizeof (long long int) * CHAR_BIT - 2)) + # define LLONG_MAX (HALF - 1 + HALF) + #endif +int +main () +{ +long long int n = 1; + int i; + for (i = 0; ; i++) + { + long long int m = n << i; + if (m >> i != n) + return 1; + if (LLONG_MAX / 2 < m) + break; + } + return 0; + ; + return 0; +} _ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_type_long_long_int=yes +else + ac_cv_type_long_long_int=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +else + ac_cv_type_long_long_int=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5 +$as_echo "$ac_cv_type_long_long_int" >&6; } + if test $ac_cv_type_long_long_int = yes; then + +$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h + + fi -# Define pid_t to a suitable type, if standard headers do not define it. -ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" -if test "x$ac_cv_type_pid_t" = xyes; then : + + ac_fn_c_check_type "$LINENO" "intmax_t" "ac_cv_type_intmax_t" "$ac_includes_default" +if test "x$ac_cv_type_intmax_t" = xyes; then : + +$as_echo "#define HAVE_INTMAX_T 1" >>confdefs.h else + test $ac_cv_type_long_long_int = yes \ + && ac_type='long long int' \ + || ac_type='long int' cat >>confdefs.h <<_ACEOF -#define pid_t int +#define intmax_t $ac_type _ACEOF fi -# Define size_t to a suitable type, if standard headers do not define it. -ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = xyes; then : + + ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default" +if test "x$ac_cv_type_intptr_t" = xyes; then : + +$as_echo "#define HAVE_INTPTR_T 1" >>confdefs.h else + for ac_type in 'int' 'long int' 'long long int'; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : cat >>confdefs.h <<_ACEOF -#define size_t unsigned int +#define intptr_t $ac_type _ACEOF + ac_type= +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test -z "$ac_type" && break + done fi -# Define ssize_t to a suitable type, if standard headers do not define it. -ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" -if test "x$ac_cv_type_ssize_t" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double" >&5 +$as_echo_n "checking for long double... " >&6; } +if ${ac_cv_type_long_double+:} false; then : + $as_echo_n "(cached) " >&6 else + if test "$GCC" = yes; then + ac_cv_type_long_double=yes + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* The Stardent Vistra knows sizeof (long double), but does + not support it. */ + long double foo = 0.0L; +int +main () +{ +static int test_array [1 - 2 * !(/* On Ultrix 4.3 cc, long double is 4 and double is 8. */ + sizeof (double) <= sizeof (long double))]; +test_array [0] = 0 -cat >>confdefs.h <<_ACEOF -#define ssize_t int + ; + return 0; +} _ACEOF - +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_type_long_double=yes +else + ac_cv_type_long_double=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_double" >&5 +$as_echo "$ac_cv_type_long_double" >&6; } + if test $ac_cv_type_long_double = yes; then +$as_echo "#define HAVE_LONG_DOUBLE 1" >>confdefs.h + + fi -# If the C compiler supports a working long double type with more range -# or precision than the double type, define HAVE_LONG_DOUBLE. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double with more range or precision than double" >&5 $as_echo_n "checking for long double with more range or precision than double... " >&6; } @@ -22380,6 +22879,434 @@ $as_echo "#define HAVE_LONG_DOUBLE_WIDER 1" >>confdefs.h fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 +$as_echo_n "checking for long long int... " >&6; } +if ${ac_cv_type_long_long_int+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + /* For now, do not test the preprocessor; as of 2007 there are too many + implementations with broken preprocessors. Perhaps this can + be revisited in 2012. In the meantime, code should not expect + #if to work with literals wider than 32 bits. */ + /* Test literals. */ + long long int ll = 9223372036854775807ll; + long long int nll = -9223372036854775807LL; + unsigned long long int ull = 18446744073709551615ULL; + /* Test constant expressions. */ + typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) + ? 1 : -1)]; + typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 + ? 1 : -1)]; + int i = 63; +int +main () +{ +/* Test availability of runtime routines for shift and division. */ + long long int llmax = 9223372036854775807ll; + unsigned long long int ullmax = 18446744073709551615ull; + return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) + | (llmax / ll) | (llmax % ll) + | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) + | (ullmax / ull) | (ullmax % ull)); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + if test "$cross_compiling" = yes; then : + ac_cv_type_long_long_int=yes +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #ifndef LLONG_MAX + # define HALF \ + (1LL << (sizeof (long long int) * CHAR_BIT - 2)) + # define LLONG_MAX (HALF - 1 + HALF) + #endif +int +main () +{ +long long int n = 1; + int i; + for (i = 0; ; i++) + { + long long int m = n << i; + if (m >> i != n) + return 1; + if (LLONG_MAX / 2 < m) + break; + } + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_type_long_long_int=yes +else + ac_cv_type_long_long_int=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +else + ac_cv_type_long_long_int=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5 +$as_echo "$ac_cv_type_long_long_int" >&6; } + if test $ac_cv_type_long_long_int = yes; then + +$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h + + fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5 +$as_echo_n "checking for mbstate_t... " >&6; } +if ${ac_cv_type_mbstate_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +# include +int +main () +{ +mbstate_t x; return sizeof x; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_type_mbstate_t=yes +else + ac_cv_type_mbstate_t=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5 +$as_echo "$ac_cv_type_mbstate_t" >&6; } + if test $ac_cv_type_mbstate_t = yes; then + +$as_echo "#define HAVE_MBSTATE_T 1" >>confdefs.h + + else + +$as_echo "#define mbstate_t int" >>confdefs.h + + fi +ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" +if test "x$ac_cv_type_mode_t" = xyes; then : + +else + +cat >>confdefs.h <<_ACEOF +#define mode_t int +_ACEOF + +fi + +ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" +if test "x$ac_cv_type_off_t" = xyes; then : + +else + +cat >>confdefs.h <<_ACEOF +#define off_t long int +_ACEOF + +fi + +ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" +if test "x$ac_cv_type_pid_t" = xyes; then : + +else + +cat >>confdefs.h <<_ACEOF +#define pid_t int +_ACEOF + +fi + +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +if test "x$ac_cv_type_size_t" = xyes; then : + +else + +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int +_ACEOF + +fi + +ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" +if test "x$ac_cv_type_ssize_t" = xyes; then : + +else + +cat >>confdefs.h <<_ACEOF +#define ssize_t int +_ACEOF + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 +$as_echo_n "checking for uid_t in sys/types.h... " >&6; } +if ${ac_cv_type_uid_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "uid_t" >/dev/null 2>&1; then : + ac_cv_type_uid_t=yes +else + ac_cv_type_uid_t=no +fi +rm -f conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 +$as_echo "$ac_cv_type_uid_t" >&6; } +if test $ac_cv_type_uid_t = no; then + +$as_echo "#define uid_t int" >>confdefs.h + + +$as_echo "#define gid_t int" >>confdefs.h + +fi + +ac_fn_c_find_uintX_t "$LINENO" "8" "ac_cv_c_uint8_t" +case $ac_cv_c_uint8_t in #( + no|yes) ;; #( + *) + +$as_echo "#define _UINT8_T 1" >>confdefs.h + + +cat >>confdefs.h <<_ACEOF +#define uint8_t $ac_cv_c_uint8_t +_ACEOF +;; + esac + +ac_fn_c_find_uintX_t "$LINENO" "16" "ac_cv_c_uint16_t" +case $ac_cv_c_uint16_t in #( + no|yes) ;; #( + *) + + +cat >>confdefs.h <<_ACEOF +#define uint16_t $ac_cv_c_uint16_t +_ACEOF +;; + esac + +ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t" +case $ac_cv_c_uint32_t in #( + no|yes) ;; #( + *) + +$as_echo "#define _UINT32_T 1" >>confdefs.h + + +cat >>confdefs.h <<_ACEOF +#define uint32_t $ac_cv_c_uint32_t +_ACEOF +;; + esac + +ac_fn_c_find_uintX_t "$LINENO" "64" "ac_cv_c_uint64_t" +case $ac_cv_c_uint64_t in #( + no|yes) ;; #( + *) + +$as_echo "#define _UINT64_T 1" >>confdefs.h + + +cat >>confdefs.h <<_ACEOF +#define uint64_t $ac_cv_c_uint64_t +_ACEOF +;; + esac + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5 +$as_echo_n "checking for unsigned long long int... " >&6; } +if ${ac_cv_type_unsigned_long_long_int+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + /* For now, do not test the preprocessor; as of 2007 there are too many + implementations with broken preprocessors. Perhaps this can + be revisited in 2012. In the meantime, code should not expect + #if to work with literals wider than 32 bits. */ + /* Test literals. */ + long long int ll = 9223372036854775807ll; + long long int nll = -9223372036854775807LL; + unsigned long long int ull = 18446744073709551615ULL; + /* Test constant expressions. */ + typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) + ? 1 : -1)]; + typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 + ? 1 : -1)]; + int i = 63; +int +main () +{ +/* Test availability of runtime routines for shift and division. */ + long long int llmax = 9223372036854775807ll; + unsigned long long int ullmax = 18446744073709551615ull; + return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) + | (llmax / ll) | (llmax % ll) + | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) + | (ullmax / ull) | (ullmax % ull)); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_type_unsigned_long_long_int=yes +else + ac_cv_type_unsigned_long_long_int=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5 +$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; } + if test $ac_cv_type_unsigned_long_long_int = yes; then + +$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h + + fi + + + + ac_fn_c_check_type "$LINENO" "uintmax_t" "ac_cv_type_uintmax_t" "$ac_includes_default" +if test "x$ac_cv_type_uintmax_t" = xyes; then : + +$as_echo "#define HAVE_UINTMAX_T 1" >>confdefs.h + +else + test $ac_cv_type_unsigned_long_long_int = yes \ + && ac_type='unsigned long long int' \ + || ac_type='unsigned long int' + +cat >>confdefs.h <<_ACEOF +#define uintmax_t $ac_type +_ACEOF + +fi + + + + ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default" +if test "x$ac_cv_type_uintptr_t" = xyes; then : + +$as_echo "#define HAVE_UINTPTR_T 1" >>confdefs.h + +else + for ac_type in 'unsigned int' 'unsigned long int' \ + 'unsigned long long int'; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +cat >>confdefs.h <<_ACEOF +#define uintptr_t $ac_type +_ACEOF + + ac_type= +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test -z "$ac_type" && break + done +fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5 +$as_echo_n "checking for unsigned long long int... " >&6; } +if ${ac_cv_type_unsigned_long_long_int+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + /* For now, do not test the preprocessor; as of 2007 there are too many + implementations with broken preprocessors. Perhaps this can + be revisited in 2012. In the meantime, code should not expect + #if to work with literals wider than 32 bits. */ + /* Test literals. */ + long long int ll = 9223372036854775807ll; + long long int nll = -9223372036854775807LL; + unsigned long long int ull = 18446744073709551615ULL; + /* Test constant expressions. */ + typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) + ? 1 : -1)]; + typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 + ? 1 : -1)]; + int i = 63; +int +main () +{ +/* Test availability of runtime routines for shift and division. */ + long long int llmax = 9223372036854775807ll; + unsigned long long int ullmax = 18446744073709551615ull; + return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) + | (llmax / ll) | (llmax % ll) + | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) + | (ullmax / ull) | (ullmax % ull)); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_type_unsigned_long_long_int=yes +else + ac_cv_type_unsigned_long_long_int=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5 +$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; } + if test $ac_cv_type_unsigned_long_long_int = yes; then + +$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h + + fi + + # If the C type char is unsigned, define __CHAR_UNSIGNED__, unless the # C compiler predefines it. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5 @@ -22845,29 +23772,29 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for signed 8-bit type" >&5 $as_echo_n "checking for signed 8-bit type... " >&6; } INT8_T='signed char' -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INT8_T" >&5 -$as_echo "$INT8_T" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: $INT8_T" >&5 +$as_echo "$as_me: $INT8_T" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned 8-bit type" >&5 $as_echo_n "checking for unsigned 8-bit type... " >&6; } UINT8_T='unsigned char' -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINT8_T" >&5 -$as_echo "$UINT8_T" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: $UINT8_T" >&5 +$as_echo "$as_me: $UINT8_T" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for signed 16-bit type" >&5 $as_echo_n "checking for signed 16-bit type... " >&6; } INT16_T='signed short' -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INT16_T" >&5 -$as_echo "$INT16_T" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: $INT16_T" >&5 +$as_echo "$as_me: $INT16_T" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned 16-bit type" >&5 $as_echo_n "checking for unsigned 16-bit type... " >&6; } UINT16_T='unsigned short' -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINT16_T" >&5 -$as_echo "$UINT16_T" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: $UINT16_T" >&5 +$as_echo "$as_me: $UINT16_T" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for signed 32-bit type" >&5 @@ -22881,8 +23808,8 @@ elif test $ac_cv_sizeof_signed_long -eq 4; then INT32_T='signed long' INT32_F='"l"' fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INT32_T" >&5 -$as_echo "$INT32_T" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: $INT32_T" >&5 +$as_echo "$as_me: $INT32_T" >&6;} @@ -22897,8 +23824,8 @@ elif test $ac_cv_sizeof_unsigned_long -eq 4; then UINT32_T='unsigned long' UINT32_F='"l"' fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINT32_T" >&5 -$as_echo "$UINT32_T" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: $UINT32_T" >&5 +$as_echo "$as_me: $UINT32_T" >&6;} @@ -22913,13 +23840,13 @@ elif test $ac_cv_sizeof_signed_long_long -eq 8; then INT64_T='signed long long' INT64_F='"ll"' fi -case "${build_os}" in +case "${host_os}" in mingw* ) INT64_F='"I64"' ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INT64_T" >&5 -$as_echo "$INT64_T" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: $INT64_T" >&5 +$as_echo "$as_me: $INT64_T" >&6;} @@ -22934,13 +23861,13 @@ elif test $ac_cv_sizeof_unsigned_long_long -eq 8; then UINT64_T='unsigned long long' UINT64_F='"ll"' fi -case "${build_os}" in +case "${host_os}" in mingw* ) UINT64_F='"I64"' ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINT64_T" >&5 -$as_echo "$UINT64_T" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: $UINT64_T" >&5 +$as_echo "$as_me: $UINT64_T" >&6;} @@ -22955,8 +23882,8 @@ elif test "$UINT32_T" != 'none'; then UINTMAX_T=$UINT32_T UINTMAX_F=$UINT32_F fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINTMAX_T" >&5 -$as_echo "$UINTMAX_T" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: $UINTMAX_T" >&5 +$as_echo "$as_me: $UINTMAX_T" >&6;} @@ -22971,8 +23898,8 @@ elif test $ac_cv_sizeof_unsigned_long_long -eq $ac_cv_sizeof_unsigned_intp; then UINTPTR_T='unsigned long long' UINTPTR_F='"ll"' fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINTPTR_T" >&5 -$as_echo "$UINTPTR_T" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: $UINTPTR_T" >&5 +$as_echo "$as_me: $UINTPTR_T" >&6;} @@ -22990,11 +23917,11 @@ main () } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether our compiler supports __FUNCTION__" >&5 $as_echo_n "checking whether our compiler supports __FUNCTION__... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -23009,14 +23936,14 @@ main () } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} $as_echo "#define __func__ __FUNCTION__" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} $as_echo "#define __func__ __FILE__" >>confdefs.h @@ -23938,6 +24865,98 @@ fi fi +ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" +if test "x$ac_cv_have_decl_strerror_r" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRERROR_R $ac_have_decl +_ACEOF + +for ac_func in strerror_r +do : + ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r" +if test "x$ac_cv_func_strerror_r" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRERROR_R 1 +_ACEOF + +fi +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5 +$as_echo_n "checking whether strerror_r returns char *... " >&6; } +if ${ac_cv_func_strerror_r_char_p+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ac_cv_func_strerror_r_char_p=no + if test $ac_cv_have_decl_strerror_r = yes; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ + + char buf[100]; + char x = *strerror_r (0, buf, sizeof buf); + char *p = strerror_r (0, buf, sizeof buf); + return !p || x; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_func_strerror_r_char_p=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + else + # strerror_r is not declared. Choose between + # systems that have relatively inaccessible declarations for the + # function. BeOS and DEC UNIX 4.0 fall in this category, but the + # former has a strerror_r that returns char*, while the latter + # has a strerror_r that returns `int'. + # This test should segfault on the DEC system. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default + extern char *strerror_r (); +int +main () +{ +char buf[100]; + char x = *strerror_r (0, buf, sizeof buf); + return ! isalpha (x); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_strerror_r_char_p=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5 +$as_echo "$ac_cv_func_strerror_r_char_p" >&6; } +if test $ac_cv_func_strerror_r_char_p = yes; then + +$as_echo "#define STRERROR_R_CHAR_P 1" >>confdefs.h + +fi + for ac_func in vprintf do : ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" @@ -24005,7 +25024,7 @@ fi LIBS="$MATH_LIBS $LIBS" -for ac_func in atoll atexit cabs carg cimag creal clock ctime_r directio _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep _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 strerror_r 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 usleep utime vsprintf vsnprintf waitpid _wfopen _wstat +for ac_func in acosh asinh atanh atoll atexit cabs carg cimag creal clock ctime_r directio _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r 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 do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -24094,15 +25113,15 @@ clockid_t clockType = CLOCK_REALTIME; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} $as_echo "#define HAVE_CLOCK_REALTIME 1" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -24872,8 +25891,8 @@ $as_echo_n "checking whether C++ compiler is sufficient for Magick++... " >&6; } else have_magick_plus_plus='no (failed tests)' fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_magick_plus_plus" >&5 -$as_echo "$have_magick_plus_plus" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: $have_magick_plus_plus" >&5 +$as_echo "$as_me: $have_magick_plus_plus" >&6;} LIBS="$OLIBS" fi if test "$have_magick_plus_plus" = 'yes'; then @@ -24897,7 +25916,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 wmf/include xml/include zlib; do + for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include lzma magick png tiff/libtiff ttf/include wand webp wmf/include xml/include zlib; do if test -d "$builddir/$dir"; then CPPFLAGS="$CPPFLAGS -I$builddir/$dir" else @@ -24908,7 +25927,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 wmf/src xml zlib; do + for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick png tiff/libtiff ttf/objs wand webp wmf/src xml zlib; do if test -d "$builddir/$dir/.libs"; then LDFLAGS="$LDFLAGS -L$builddir/$dir/.libs" else @@ -25003,7 +26022,54 @@ _ACEOF GOMP_LIBS='' if test "$enable_openmp" != 'no'; then if test "${GCC}" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOMP_parallel_start in -lgomp" >&5 + # Open64 (passes for GCC but uses different OpenMP implementation) + if test "x$GOMP_LIBS" = x ; then + if $CC --version 2>&1 | grep Open64 > /dev/null ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for omp_get_num_procs in -lopenmp" >&5 +$as_echo_n "checking for omp_get_num_procs in -lopenmp... " >&6; } +if ${ac_cv_lib_openmp_omp_get_num_procs+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lopenmp $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char omp_get_num_procs (); +int +main () +{ +return omp_get_num_procs (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_openmp_omp_get_num_procs=yes +else + ac_cv_lib_openmp_omp_get_num_procs=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_openmp_omp_get_num_procs" >&5 +$as_echo "$ac_cv_lib_openmp_omp_get_num_procs" >&6; } +if test "x$ac_cv_lib_openmp_omp_get_num_procs" = xyes; then : + GOMP_LIBS="-lopenmp" +fi + + fi + fi + # GCC + if test "x$GOMP_LIBS" = x ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOMP_parallel_start in -lgomp" >&5 $as_echo_n "checking for GOMP_parallel_start in -lgomp... " >&6; } if ${ac_cv_lib_gomp_GOMP_parallel_start+:} false; then : $as_echo_n "(cached) " >&6 @@ -25042,9 +26108,12 @@ $as_echo "$ac_cv_lib_gomp_GOMP_parallel_start" >&6; } if test "x$ac_cv_lib_gomp_GOMP_parallel_start" = xyes; then : GOMP_LIBS="-lgomp" fi - # gcc + + fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_mp_register_warn in -lmtsk" >&5 + # Sun CC + if test "x$GOMP_LIBS" = x ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_mp_register_warn in -lmtsk" >&5 $as_echo_n "checking for sunw_mp_register_warn in -lmtsk... " >&6; } if ${ac_cv_lib_mtsk_sunw_mp_register_warn+:} false; then : $as_echo_n "(cached) " >&6 @@ -25083,7 +26152,10 @@ $as_echo "$ac_cv_lib_mtsk_sunw_mp_register_warn" >&6; } if test "x$ac_cv_lib_mtsk_sunw_mp_register_warn" = xyes; then : GOMP_LIBS="-lmtsk" fi - # solaris cc + + fi + # AIX xlc + if test "x$GOMP_LIBS" = x ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _xlsmpFlush in -lxlsmp" >&5 $as_echo_n "checking for _xlsmpFlush in -lxlsmp... " >&6; } if ${ac_cv_lib_xlsmp__xlsmpFlush+:} false; then : @@ -25123,7 +26195,10 @@ $as_echo "$ac_cv_lib_xlsmp__xlsmpFlush" >&6; } if test "x$ac_cv_lib_xlsmp__xlsmpFlush" = xyes; then : GOMP_LIBS="-lxlsmp" fi - # AIX xlc + + fi + # SGI IRIX 6.5 MIPSpro C/C++ + if test "x$GOMP_LIBS" = x ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mp_destroy in -lmp" >&5 $as_echo_n "checking for mp_destroy in -lmp... " >&6; } if ${ac_cv_lib_mp_mp_destroy+:} false; then : @@ -25163,7 +26238,8 @@ $as_echo "$ac_cv_lib_mp_mp_destroy" >&6; } if test "x$ac_cv_lib_mp_mp_destroy" = xyes; then : GOMP_LIBS="-lmp" fi - # SGI IRIX 6.5 MIPSpro C/C++ + + fi fi LIBS="$GOMP_LIBS $LIBS" fi @@ -25317,8 +26393,8 @@ UMEM_LIBS='' if test "$with_umem" != 'no'; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UMEM support " >&5 $as_echo_n "checking for UMEM support ... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} failed=0 passed=0 ac_fn_c_check_header_mongrel "$LINENO" "umem.h" "ac_cv_header_umem_h" "$ac_includes_default" @@ -25417,8 +26493,8 @@ fi $as_echo_n "checking if umem memory allocation library is complete... " >&6; } if test $passed -gt 0; then if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no -- some components failed test" >&5 +$as_echo "$as_me: no -- some components failed test" >&6;} have_umem='no (failed tests)' else UMEM_LIBS='-lumem' @@ -25426,13 +26502,13 @@ $as_echo "no -- some components failed test" >&6; } $as_echo "#define HasUMEM 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} have_umem='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} fi fi if test "$have_umem" = 'yes'; then @@ -25575,12 +26651,12 @@ fi have_bzlib='no' if test "$with_bzlib" != 'no'; then BZLIB_LIBS='' - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZLIB" >&5 $as_echo_n "checking for BZLIB... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} failed=0 passed=0 found_libbz=0 @@ -25683,8 +26759,8 @@ fi $as_echo_n "checking if BZLIB package is complete... " >&6; } if test $passed -gt 0; then if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no -- some components failed test" >&5 +$as_echo "$as_me: no -- some components failed test" >&6;} have_bzlib='no (failed tests)' else BZLIB_LIBS='-lbz2' @@ -25692,13 +26768,13 @@ $as_echo "no -- some components failed test" >&6; } $as_echo "#define BZLIB_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} have_bzlib='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} fi fi if test "$have_bzlib" = 'yes'; then @@ -26402,12 +27478,12 @@ fi fi if test "$no_x" != 'yes'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5 $as_echo_n "checking for X11... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} LDFLAGS="$LDFLAGS $X_LIBS" X11_LIBS="$X_PRE_LIBS -lX11 $X_EXTRA_LIBS" LIBS="$X11_LIBS $LIBS" @@ -26622,12 +27698,12 @@ fi have_zlib='no' ZLIB_LIBS='' if test "$with_zlib" != 'no' || test "$with_png" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZLIB" >&5 $as_echo_n "checking for ZLIB... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} ZLIB_LIBS='' failed=0 passed=0 @@ -26903,8 +27979,8 @@ fi $as_echo_n "checking if ZLIB package is complete... " >&6; } if test $passed -gt 0; then if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no -- some components failed test" >&5 +$as_echo "$as_me: no -- some components failed test" >&6;} have_zlib='no (failed tests)' else ZLIB_LIBS='-lz' @@ -26912,13 +27988,13 @@ $as_echo "no -- some components failed test" >&6; } $as_echo "#define ZLIB_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} have_zlib='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} fi fi if test "$have_zlib" = 'yes'; then @@ -27002,8 +28078,8 @@ AUTOTRACE_CFLAGS="" AUTOTRACE_LIBS="" AUTOTRACE_PKG="" if test "x$with_autotrace" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AUTOTRACE" >&5 @@ -27071,8 +28147,8 @@ else $as_echo "yes" >&6; } have_autotrace=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} fi if test "$have_autotrace" = 'yes'; then @@ -27116,12 +28192,12 @@ fi have_dps='no' DPS_LIBS='' if test "$with_dps" != 'no' && test "$with_x" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPS" >&5 $as_echo_n "checking for DPS... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} failed=0 passed=0 PERSIST_CPPFLAGS="$CPPFLAGS" @@ -27283,8 +28359,8 @@ fi $as_echo_n "checking if DPS package is complete... " >&6; } if test $passed -gt 0; then if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no -- some components failed test" >&5 +$as_echo "$as_me: no -- some components failed test" >&6;} have_dps='no (failed tests)' CPPFLAGS="$PERSIST_CPPFLAGS" else @@ -27293,13 +28369,13 @@ $as_echo "no -- some components failed test" >&6; } $as_echo "#define DPS_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} have_dps='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} CPPFLAGS=$PERSIST_CPPFLAGS fi fi @@ -27333,12 +28409,12 @@ fi have_djvu='no' DJVU_LIBS='' if test "$with_djvu" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DJVU" >&5 $as_echo_n "checking for DJVU... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} failed=0 passed=0 ac_fn_c_check_header_mongrel "$LINENO" "libdjvu/ddjvuapi.h" "ac_cv_header_libdjvu_ddjvuapi_h" "$ac_includes_default" @@ -27395,8 +28471,8 @@ fi $as_echo_n "checking if DJVU package is complete... " >&6; } if test $passed -gt 0; then if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no -- some components failed test" >&5 +$as_echo "$as_me: no -- some components failed test" >&6;} have_djvu='no (failed tests)' else DJVU_LIBS='-ldjvulibre' @@ -27404,13 +28480,13 @@ $as_echo "no -- some components failed test" >&6; } $as_echo "#define DJVU_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} have_djvu='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} fi fi if test "$have_djvu" = 'yes'; then @@ -27460,12 +28536,12 @@ fi have_fftw='no' FFTW_LIBS='' if test "$with_fftw" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFTW" >&5 $as_echo_n "checking for FFTW... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} failed=0 passed=0 ac_fn_c_check_header_mongrel "$LINENO" "fftw3.h" "ac_cv_header_fftw3_h" "$ac_includes_default" @@ -27522,8 +28598,8 @@ fi $as_echo_n "checking if FFTW package is complete... " >&6; } if test $passed -gt 0; then if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no -- some components failed test" >&5 +$as_echo "$as_me: no -- some components failed test" >&6;} have_fftw='no (failed tests)' else FFTW_LIBS='-lfftw3' @@ -27531,13 +28607,13 @@ $as_echo "no -- some components failed test" >&6; } $as_echo "#define FFTW_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} have_fftw='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} fi fi if test "$have_fftw" = 'yes'; then @@ -27570,12 +28646,12 @@ fi have_fpx='no' FPX_LIBS='' if test "$with_fpx" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FlashPIX" >&5 $as_echo_n "checking for FlashPIX... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} failed=0 passed=0 ac_ext=cpp @@ -27645,22 +28721,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu $as_echo_n "checking if FlashPIX package is complete... " >&6; } if test $passed -gt 0; then if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no -- some components failed test" >&5 +$as_echo "$as_me: no -- some components failed test" >&6;} have_fpx='no (failed tests)' else FPX_LIBS='-lfpx' $as_echo "#define FPX_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} have_fpx='yes' PERLMAINCC="$CXX" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} fi fi if test "$have_fpx" = 'yes'; then @@ -27695,8 +28771,8 @@ FONTCONFIG_CFLAGS="" FONTCONFIG_LIBS="" FONTCONFIG_PKG="" if test "x$with_fontconfig" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FONTCONFIG" >&5 @@ -27764,8 +28840,8 @@ else $as_echo "yes" >&6; } have_fontconfig=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} fi if test "$have_fontconfig" = 'yes'; then @@ -27809,40 +28885,46 @@ fi have_freetype='no' FREETYPE_LIBS='' if test "$with_freetype" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FreeType 2.0" >&5 -$as_echo_n "checking for FreeType 2.0... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FreeType 2.0 " >&5 +$as_echo_n "checking for FreeType 2.0 ... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} failed=0 passed=0 - PERSIST_LIBS="$LIBS" + PERSIST_LDFLAGS="$LDFLAGS" PERSIST_CPPFLAGS="$CPPFLAGS" - if test "$enable_delegate_build" != 'no' && test -d "$builddir/freetype/include"; then - : - else - freetype_config='' - for ac_prog in freetype-config -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 + 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 + # Extract the first word of "freetype-config", so it can be a program name with args. +set dummy freetype-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_freetype_config+:} false; then : +if ${ac_cv_path_freetype_config+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$freetype_config"; then - ac_cv_prog_freetype_config="$freetype_config" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $freetype_config in + [\\/]* | ?:[\\/]*) + ac_cv_path_freetype_config="$freetype_config" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_freetype_config="$ac_prog" + ac_cv_path_freetype_config="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -27850,9 +28932,10 @@ done done IFS=$as_save_IFS + ;; +esac fi -fi -freetype_config=$ac_cv_prog_freetype_config +freetype_config=$ac_cv_path_freetype_config if test -n "$freetype_config"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $freetype_config" >&5 $as_echo "$freetype_config" >&6; } @@ -27861,19 +28944,16 @@ else $as_echo "no" >&6; } fi - - test -n "$freetype_config" && break -done - if test -n "$freetype_config"; then - freetype_cflags=`$freetype_config --cflags` - freetype_libs=`$freetype_config --libs` - LIBS="$LIBS $freetype_libs" - CPPFLAGS="$freetype_cflags $CPPFLAGS" - fi + 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 if test "$FREETYPE_LIBS" = ''; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5 $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; } if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then : $as_echo_n "(cached) " >&6 @@ -27913,12 +28993,12 @@ if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then : FREETYPE_LIBS='-lfreetype' fi - if test "$FREETYPE_LIBS" != ''; then - passed=`expr $passed + 1` - else - failed=`expr $failed + 1` - LIBS="$PERSIST_LIBS" - fi + if test "$FREETYPE_LIBS" != ''; then + passed=`expr $passed + 1` + else + failed=`expr $failed + 1` + LDFLAGS="$PERSIST_LDFLAGS" + fi fi ac_fn_c_check_header_mongrel "$LINENO" "ft2build.h" "ac_cv_header_ft2build_h" "$ac_includes_default" @@ -27938,38 +29018,38 @@ else fi - if test "$ac_cv_header_ft2build_h" = 'yes' || test "$have_freetype_h" = 'yes'; then - passed=`expr $passed + 1` + if test "$have_freetype_h" = 'yes'; then + passed=`expr $passed + 1` else - failed=`expr $failed + 1` - CPPFLAGS="$PERSIST_CPPFLAGS" + failed=`expr $failed + 1` + CPPFLAGS="$PERSIST_CPPFLAGS" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if FreeType package is complete" >&5 $as_echo_n "checking if FreeType package is complete... " >&6; } if test $passed -gt 0; then - if test $failed -gt 0; then - FREETYPE_LIBS='' - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } - have_freetype='no (failed tests)' - else - LIBS="$FREETYPE_LIBS $LIBS" + if test $failed -gt 0; then + FREETYPE_LIBS='' + { $as_echo "$as_me:${as_lineno-$LINENO}: no -- some components failed test" >&5 +$as_echo "$as_me: no -- some components failed test" >&6;} + have_freetype='no (failed tests)' + else + LIBS="$FREETYPE_LIBS $LIBS" $as_echo "#define FREETYPE_DELEGATE 1" >>confdefs.h - if test "$ac_cv_header_ft2build_h" = 'yes'; then + if test "$ac_cv_header_ft2build_h" = 'yes'; then $as_echo "#define HAVE_FT2BUILD_H 1" >>confdefs.h - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - have_freetype='yes' fi + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} + have_freetype='yes' + fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} fi fi if test "$have_freetype" = 'yes'; then @@ -27983,7 +29063,6 @@ fi - # # Check for Ghostscript library or framework. # @@ -28007,12 +29086,12 @@ fi have_gslib='no' GS_LIBS='' if test "$with_gslib" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ghostscript" >&5 $as_echo_n "checking for Ghostscript... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} framework=0 failed=0 passed=0 @@ -28118,18 +29197,18 @@ fi $as_echo_n "checking if Ghostscript package is complete... " >&6; } if test $passed -gt 0; then if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no -- some components failed test" >&5 +$as_echo "$as_me: no -- some components failed test" >&6;} have_gslib='no (failed tests)' else if test $framework -gt 0; then GS_LIBS='-framework Ghostscript' gslib_framework='yes' - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, using framework." >&5 -$as_echo "yes, using framework." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes, using framework." >&5 +$as_echo "$as_me: yes, using framework." >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, using library." >&5 -$as_echo "yes, using library." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes, using library." >&5 +$as_echo "$as_me: yes, using library." >&6;} GS_LIBS='-lgs' fi LIBS="$GS_LIBS $LIBS" @@ -28139,8 +29218,8 @@ $as_echo "#define GS_DELEGATE 1" >>confdefs.h have_gslib='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} fi fi if test "$have_gslib" = 'yes'; then @@ -28209,8 +29288,8 @@ fi GVC_PKG="" if test "x$with_gvc" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GVC" >&5 @@ -28278,8 +29357,8 @@ else $as_echo "yes" >&6; } have_gvc=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} fi if test "$have_gvc" = 'yes'; then @@ -28319,12 +29398,12 @@ fi have_jbig='no' JBIG_LIBS='' if test "$with_jbig" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JBIG" >&5 $as_echo_n "checking for JBIG... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} failed=0 passed=0 ac_fn_c_check_header_mongrel "$LINENO" "jbig.h" "ac_cv_header_jbig_h" "$ac_includes_default" @@ -28381,8 +29460,8 @@ fi $as_echo_n "checking if JBIG package is complete... " >&6; } if test $passed -gt 0; then if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no -- some components failed test" >&5 +$as_echo "$as_me: no -- some components failed test" >&6;} have_jbig='no (failed tests)' else JBIG_LIBS='-ljbig' @@ -28390,13 +29469,13 @@ $as_echo "no -- some components failed test" >&6; } $as_echo "#define JBIG_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} have_jbig='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} fi fi if test "$have_jbig" = 'yes'; then @@ -28429,12 +29508,12 @@ fi have_jpeg='no' JPEG_LIBS='' if test "$with_jpeg" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JPEG" >&5 $as_echo_n "checking for JPEG... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} failed=0 passed=0 ac_fn_c_check_header_mongrel "$LINENO" "jconfig.h" "ac_cv_header_jconfig_h" "$ac_includes_default" @@ -28552,8 +29631,8 @@ fi $as_echo_n "checking if JPEG package is complete... " >&6; } if test $passed -gt 0; then if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no -- some components failed test" >&5 +$as_echo "$as_me: no -- some components failed test" >&6;} have_jpeg='no (failed tests)' else JPEG_LIBS='-ljpeg' @@ -28561,13 +29640,13 @@ $as_echo "no -- some components failed test" >&6; } $as_echo "#define JPEG_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} have_jpeg='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} fi fi if test "$have_jpeg" = 'yes'; then @@ -28600,12 +29679,12 @@ fi have_jp2='no' JP2_LIBS='' if test "$with_jp2" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JPEG Version 2" >&5 $as_echo_n "checking for JPEG Version 2... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} failed=0 passed=0 ac_fn_c_check_header_mongrel "$LINENO" "jasper/jasper.h" "ac_cv_header_jasper_jasper_h" "$ac_includes_default" @@ -28662,8 +29741,8 @@ fi $as_echo_n "checking if JPEG version 2 support package is complete... " >&6; } if test $passed -gt 0; then if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no -- some components failed test" >&5 +$as_echo "$as_me: no -- some components failed test" >&6;} have_jp2='no (failed tests)' else JP2_LIBS='-ljasper' @@ -28671,13 +29750,13 @@ $as_echo "no -- some components failed test" >&6; } $as_echo "#define JP2_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} have_jp2='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} fi fi if test "$have_jp2" = 'yes'; then @@ -28723,12 +29802,12 @@ fi have_lcms2='no' LCMS_LIBS='' if test "$with_lcms2" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCMS v2" >&5 $as_echo_n "checking for LCMS v2... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} failed=0 passed=0 have_lcms_header='no' @@ -28814,19 +29893,19 @@ fi $as_echo_n "checking if LCMS v2 package is complete... " >&6; } if test $passed -gt 0; then if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no -- some components failed test" >&5 +$as_echo "$as_me: no -- some components failed test" >&6;} have_lcms2='no (failed tests)' else LCMS_LIBS='-llcms2' LIBS="$LCMS_LIBS $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} have_lcms2='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} fi fi @@ -28839,12 +29918,12 @@ fi have_lcms='no' if test "$with_lcms" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCMS v1.1X" >&5 $as_echo_n "checking for LCMS v1.1X... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} failed=0 passed=0 have_lcms_header='no' @@ -28932,19 +30011,19 @@ fi $as_echo_n "checking if LCMS package is complete... " >&6; } if test $passed -gt 0; then if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no -- some components failed test" >&5 +$as_echo "$as_me: no -- some components failed test" >&6;} have_lcms='no (failed tests)' else LCMS_LIBS='-llcms' LIBS="$LCMS_LIBS $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} have_lcms='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} fi fi @@ -28986,8 +30065,8 @@ LQR_CFLAGS="" LQR_LIBS="" LQR_PKG="" if test "x$with_lqr" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LQR" >&5 @@ -29055,8 +30134,8 @@ else $as_echo "yes" >&6; } have_lqr=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} fi if test "$have_lqr" = 'yes'; then @@ -29091,92 +30170,90 @@ if test "$with_lzma" != 'yes' ; then DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-lzma=$with_lzma " fi -# -# Check for LZMA -# -have_lzma='no' -LZMA_LIBS='' -if test "$with_lzma" != 'no' || test "$with_tiff" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LZMA" >&5 +LZMA_PKG="" +if test "x$with_lzma" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LZMA" >&5 $as_echo_n "checking for LZMA... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } - failed=0 - passed=0 - ac_fn_c_check_header_mongrel "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default" -if test "x$ac_cv_header_lzma_h" = xyes; then : - passed=`expr $passed + 1` + +if test -n "$LZMA_CFLAGS"; then + pkg_cv_LZMA_CFLAGS="$LZMA_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblzma >= 2.9.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "liblzma >= 2.9.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LZMA_CFLAGS=`$PKG_CONFIG --cflags "liblzma >= 2.9.0" 2>/dev/null` else - failed=`expr $failed + 1` + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LZMA_LIBS"; then + pkg_cv_LZMA_LIBS="$LZMA_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblzma >= 2.9.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "liblzma >= 2.9.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LZMA_LIBS=`$PKG_CONFIG --libs "liblzma >= 2.9.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_code in -llzma" >&5 -$as_echo_n "checking for lzma_code in -llzma... " >&6; } -if ${ac_cv_lib_lzma_lzma_code+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-llzma $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char lzma_code (); -int -main () -{ -return lzma_code (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_lzma_lzma_code=yes +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - ac_cv_lib_lzma_lzma_code=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + _pkg_short_errors_supported=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_code" >&5 -$as_echo "$ac_cv_lib_lzma_lzma_code" >&6; } -if test "x$ac_cv_lib_lzma_lzma_code" = xyes; then : - passed=`expr $passed + 1` + if test $_pkg_short_errors_supported = yes; then + LZMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "liblzma >= 2.9.0" 2>&1` + else + LZMA_PKG_ERRORS=`$PKG_CONFIG --print-errors "liblzma >= 2.9.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LZMA_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_lzma=no +elif test $pkg_failed = untried; then + have_lzma=no else - failed=`expr $failed + 1` + LZMA_CFLAGS=$pkg_cv_LZMA_CFLAGS + LZMA_LIBS=$pkg_cv_LZMA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_lzma=yes +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if LZMA package is complete" >&5 -$as_echo_n "checking if LZMA package is complete... " >&6; } - if test $passed -gt 0; then - if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } - have_lzma='no (failed tests)' - else - LZMA_LIBS='-llzma' - LIBS="$LZMA_LIBS $LIBS" +if test "$have_lzma" = 'yes'; then $as_echo "#define LZMA_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - have_lzma='yes' + if test "$with_modules" = 'no'; then + CPPFLAGS="$LZMA_CFLAGS $CPPFLAGS" fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi fi + if test "$have_lzma" = 'yes'; then LZMA_DELEGATE_TRUE= LZMA_DELEGATE_FALSE='#' @@ -29188,6 +30265,7 @@ fi + # # Check for the OpenEXR delegate library. # @@ -29209,8 +30287,8 @@ OPENEXR_CFLAGS="" OPENEXR_LIBS="" OPENEXR_PKG="" if test "x$with_openexr" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENEXR" >&5 @@ -29278,8 +30356,8 @@ else $as_echo "yes" >&6; } have_openexr=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} fi if test "$have_openexr" = 'yes'; then @@ -29303,6 +30381,208 @@ fi +# +# Check for PANGO delegate library. +# + +# Check whether --with-pango was given. +if test "${with_pango+set}" = set; then : + withval=$with_pango; with_pango=$withval +else + with_pango=$have_x +fi + + +if test "$with_pango" != 'yes'; then + DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-pango=$with_pango " +fi + +have_pango='no' +have_pangoft2='no' +PANGO_CFLAGS="" +PANGO_LIBS="" +PANGO_PKG="" +if test "x$with_pango" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&6; } + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5 +$as_echo_n "checking for PANGO... " >&6; } + +if test -n "$PANGO_CFLAGS"; then + pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoft2 >= 1.28.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "pangoft2 >= 1.28.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangoft2 >= 1.28.1" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$PANGO_LIBS"; then + pkg_cv_PANGO_LIBS="$PANGO_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoft2 >= 1.28.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "pangoft2 >= 1.28.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PANGO_LIBS=`$PKG_CONFIG --libs "pangoft2 >= 1.28.1" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pangoft2 >= 1.28.1" 2>&1` + else + PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors "pangoft2 >= 1.28.1" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PANGO_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_pangoft2=no +elif test $pkg_failed = untried; then + have_pangoft2=no +else + PANGO_CFLAGS=$pkg_cv_PANGO_CFLAGS + PANGO_LIBS=$pkg_cv_PANGO_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_pangoft2=yes +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5 +$as_echo_n "checking for PANGO... " >&6; } + +if test -n "$PANGO_CFLAGS"; then + pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= 1.28.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "pango >= 1.28.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.28.1" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$PANGO_LIBS"; then + pkg_cv_PANGO_LIBS="$PANGO_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= 1.28.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "pango >= 1.28.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PANGO_LIBS=`$PKG_CONFIG --libs "pango >= 1.28.1" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= 1.28.1" 2>&1` + else + PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= 1.28.1" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PANGO_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_pango=no +elif test $pkg_failed = untried; then + have_pango=no +else + PANGO_CFLAGS=$pkg_cv_PANGO_CFLAGS + PANGO_LIBS=$pkg_cv_PANGO_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_pango=yes +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } +fi + +if test "$have_pango" = 'yes'; then + +$as_echo "#define PANGO_DELEGATE 1" >>confdefs.h + + if test "$with_modules" = 'no'; then + CPPFLAGS="$PANGO_CFLAGS $CPPFLAGS" + fi +fi + +if test "$have_pangoft2" = 'yes'; then + +$as_echo "#define PANGOFT2_DELEGATE 1" >>confdefs.h + + if test "$with_modules" = 'no'; then + CPPFLAGS="$PANGOFT2_CFLAGS $CPPFLAGS" + fi +fi + + if test "$have_pango" = 'yes'; then + PANGO_DELEGATE_TRUE= + PANGO_DELEGATE_FALSE='#' +else + PANGO_DELEGATE_TRUE='#' + PANGO_DELEGATE_FALSE= +fi + + if test "$have_pangoft2" = 'yes'; then + PANGOFT2_DELEGATE_TRUE= + PANGOFT2_DELEGATE_FALSE='#' +else + PANGOFT2_DELEGATE_TRUE='#' + PANGOFT2_DELEGATE_FALSE= +fi + + + + + # # Check for PNG delegate library. # @@ -29321,16 +30601,17 @@ fi have_png='no' PNG_LIBS='' -if test "$with_png" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PNG" >&5 -$as_echo_n "checking for PNG... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } - failed=0 - passed=0 - ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default" + +if test "$with_png" != 'no' -a "$have_zlib" != 'no' ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PNG support " >&5 +$as_echo_n "checking for PNG support ... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} + failed=0 + passed=0 + ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default" if test "x$ac_cv_header_png_h" = xyes; then : passed=`expr $passed + 1` else @@ -29338,7 +30619,284 @@ else fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_get_io_ptr in -lpng" >&5 + + if test $passed -gt 0; then + for var in 5 4 2 '' ; do + if test "$have_png" = 'no' ; then + if test "x${var}" = 'x' ; then + pnglib='png' + else + pnglib="png1${var}" + fi + +# Test for compatible LIBPNG library + failed=0 + passed=0 + if test "$with_png" = 'yes' -o "$with_png" = "libpng1${var}" ; then + if test "${pnglib}" != 'png' ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPNG1${var} support " >&5 +$as_echo_n "checking for LIBPNG1${var} support ... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include + +int +main () +{ + +#if PNG_LIBPNG_VER_MINOR != ${var} +#error LIBPNG library must be version 1${var}! +Kaboom, Kaboom +#endif +return 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_libpng_ok='yes' +else + ac_cv_libpng_ok='no' +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test "$ac_cv_libpng_ok" = 'yes' ; then + passed=`expr $passed + 1` + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} + else + failed=`expr $failed + 1` + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} + fi + else + passed=`expr $passed + 1` + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} + fi + fi + + if test $passed -gt 0 -a $failed -le 0; then + if test "1${var}" = '15' ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_get_io_ptr in -lpng15" >&5 +$as_echo_n "checking for png_get_io_ptr in -lpng15... " >&6; } +if ${ac_cv_lib_png15_png_get_io_ptr+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpng15 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char png_get_io_ptr (); +int +main () +{ +return png_get_io_ptr (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_png15_png_get_io_ptr=yes +else + ac_cv_lib_png15_png_get_io_ptr=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png15_png_get_io_ptr" >&5 +$as_echo "$ac_cv_lib_png15_png_get_io_ptr" >&6; } +if test "x$ac_cv_lib_png15_png_get_io_ptr" = xyes; then : + passed=`expr $passed + 1` +else + failed=`expr $failed + 1` +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_longjmp in -lpng15" >&5 +$as_echo_n "checking for png_longjmp in -lpng15... " >&6; } +if ${ac_cv_lib_png15_png_longjmp+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpng15 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char png_longjmp (); +int +main () +{ +return png_longjmp (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_png15_png_longjmp=yes +else + ac_cv_lib_png15_png_longjmp=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png15_png_longjmp" >&5 +$as_echo "$ac_cv_lib_png15_png_longjmp" >&6; } +if test "x$ac_cv_lib_png15_png_longjmp" = xyes; then : + passed=`expr $passed + 1` +else + failed=`expr $failed + 1` +fi + + fi + if test "1${var}" = '14' ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_get_io_ptr in -lpng14" >&5 +$as_echo_n "checking for png_get_io_ptr in -lpng14... " >&6; } +if ${ac_cv_lib_png14_png_get_io_ptr+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpng14 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char png_get_io_ptr (); +int +main () +{ +return png_get_io_ptr (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_png14_png_get_io_ptr=yes +else + ac_cv_lib_png14_png_get_io_ptr=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png14_png_get_io_ptr" >&5 +$as_echo "$ac_cv_lib_png14_png_get_io_ptr" >&6; } +if test "x$ac_cv_lib_png14_png_get_io_ptr" = xyes; then : + passed=`expr $passed + 1` +else + failed=`expr $failed + 1` +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_get_io_state in -lpng14" >&5 +$as_echo_n "checking for png_get_io_state in -lpng14... " >&6; } +if ${ac_cv_lib_png14_png_get_io_state+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpng14 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char png_get_io_state (); +int +main () +{ +return png_get_io_state (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_png14_png_get_io_state=yes +else + ac_cv_lib_png14_png_get_io_state=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png14_png_get_io_state" >&5 +$as_echo "$ac_cv_lib_png14_png_get_io_state" >&6; } +if test "x$ac_cv_lib_png14_png_get_io_state" = xyes; then : + passed=`expr $passed + 1` +else + failed=`expr $failed + 1` +fi + + fi + if test "1${var}" = '12' ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_get_io_ptr in -lpng12" >&5 +$as_echo_n "checking for png_get_io_ptr in -lpng12... " >&6; } +if ${ac_cv_lib_png12_png_get_io_ptr+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpng12 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char png_get_io_ptr (); +int +main () +{ +return png_get_io_ptr (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_png12_png_get_io_ptr=yes +else + ac_cv_lib_png12_png_get_io_ptr=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png12_png_get_io_ptr" >&5 +$as_echo "$ac_cv_lib_png12_png_get_io_ptr" >&6; } +if test "x$ac_cv_lib_png12_png_get_io_ptr" = xyes; then : + passed=`expr $passed + 1` +else + failed=`expr $failed + 1` +fi + + fi + if test "1${var}" = '1' ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_get_io_ptr in -lpng" >&5 $as_echo_n "checking for png_get_io_ptr in -lpng... " >&6; } if ${ac_cv_lib_png_png_get_io_ptr+:} false; then : $as_echo_n "(cached) " >&6 @@ -29380,28 +30938,33 @@ else failed=`expr $failed + 1` fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PNG package is complete" >&5 -$as_echo_n "checking if PNG package is complete... " >&6; } - if test $passed -gt 0; then - if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } - have_png='no (failed tests)' - else - PNG_LIBS='-lpng' - LIBS="$PNG_LIBS $LIBS" + fi + if test $passed -gt 0 -a $failed -le 0 ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ${pnglib} package is complete" >&5 +$as_echo_n "checking if ${pnglib} package is complete... " >&6; } + if test $passed -gt 0 ; then + if test $failed -gt 0 ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: no -- some components failed test" >&5 +$as_echo "$as_me: no -- some components failed test" >&6;} + have_png='no (failed tests)' + else + PNG_LIBS="-l${pnglib}" + LIBS="$PNG_LIBS $LIBS" $as_echo "#define PNG_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - have_png='yes' + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} + have_png='yes' + fi + fi + fi fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi + fi + done + fi fi + if test "$have_png" = 'yes'; then PNG_DELEGATE_TRUE= PNG_DELEGATE_FALSE='#' @@ -29413,6 +30976,7 @@ fi + # # Check for RSVG delegate library. # @@ -29435,8 +30999,8 @@ RSVG_CFLAGS="" RSVG_LIBS="" RSVG_PKG="" if test "x$with_rsvg" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSVG" >&5 @@ -29504,8 +31068,8 @@ else $as_echo "yes" >&6; } have_rsvg=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO_SVG" >&5 @@ -29573,8 +31137,8 @@ else $as_echo "yes" >&6; } have_cairo=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} fi if test "$have_rsvg" = 'yes'; then @@ -29634,12 +31198,12 @@ fi have_tiff='no' TIFF_LIBS='' if test "$with_tiff" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFF" >&5 $as_echo_n "checking for TIFF... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} failed=0 passed=0 ac_fn_c_check_header_mongrel "$LINENO" "tiff.h" "ac_cv_header_tiff_h" "$ac_includes_default" @@ -29742,48 +31306,6 @@ else failed=`expr $failed + 1` fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFIsBigEndian in -ltiff" >&5 -$as_echo_n "checking for TIFFIsBigEndian in -ltiff... " >&6; } -if ${ac_cv_lib_tiff_TIFFIsBigEndian+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ltiff $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char TIFFIsBigEndian (); -int -main () -{ -return TIFFIsBigEndian (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_tiff_TIFFIsBigEndian=yes -else - ac_cv_lib_tiff_TIFFIsBigEndian=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFIsBigEndian" >&5 -$as_echo "$ac_cv_lib_tiff_TIFFIsBigEndian" >&6; } -if test "x$ac_cv_lib_tiff_TIFFIsBigEndian" = xyes; then : - passed=`expr $passed + 1` -else - failed=`expr $failed + 1` -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFIsByteSwapped in -ltiff" >&5 $as_echo_n "checking for TIFFIsByteSwapped in -ltiff... " >&6; } if ${ac_cv_lib_tiff_TIFFIsByteSwapped+:} false; then : @@ -29914,8 +31436,8 @@ fi $as_echo_n "checking if TIFF package is complete... " >&6; } if test $passed -gt 0; then if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no -- some components failed test" >&5 +$as_echo "$as_me: no -- some components failed test" >&6;} have_tiff='no (failed tests)' else TIFF_LIBS='-ltiff' @@ -29923,8 +31445,8 @@ $as_echo "no -- some components failed test" >&6; } $as_echo "#define TIFF_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} have_tiff='yes' for ac_header in tiffconf.h do : @@ -29939,8 +31461,9 @@ fi done for ac_func in TIFFIsCODECConfigured TIFFMergeFieldInfo \ - TIFFReadEXIFDirectory TIFFSetErrorHandlerExt TIFFSetTagExtender \ - TIFFSetWarningHandlerExt TIFFSwabArrayOfTriples + TIFFIsBigEndian TIFFReadEXIFDirectory TIFFSetErrorHandlerExt \ + TIFFSetTagExtender TIFFSetWarningHandlerExt \ + TIFFSwabArrayOfTriples do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -29954,8 +31477,8 @@ done fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} fi fi if test "$have_tiff" = 'yes'; then @@ -29988,12 +31511,12 @@ fi have_webp='no' WEBP_LIBS='' if test "$with_webp" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBP" >&5 $as_echo_n "checking for WEBP... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} failed=0 passed=0 ac_fn_c_check_header_mongrel "$LINENO" "webp/decode.h" "ac_cv_header_webp_decode_h" "$ac_includes_default" @@ -30050,8 +31573,8 @@ fi $as_echo_n "checking if WEBP package is complete... " >&6; } if test $passed -gt 0; then if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no -- some components failed test" >&5 +$as_echo "$as_me: no -- some components failed test" >&6;} have_webp='no (failed tests)' else WEBP_LIBS='-lwebp' @@ -30059,13 +31582,13 @@ $as_echo "no -- some components failed test" >&6; } $as_echo "#define WEBP_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} have_webp='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} fi fi if test "$have_webp" = 'yes'; then @@ -30113,6 +31636,8 @@ fi have_wmf='no' WMF_LIBS='' +WMF_LIBS_DEPS='' +OLIBS="$LIBS" if test "$with_wmf" != 'no'; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 $as_echo "-------------------------------------------------------------" >&6; } @@ -30120,23 +31645,25 @@ $as_echo "-------------------------------------------------------------" >&6; } $as_echo_n "checking for WMF... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 $as_echo "" >&6; } - failed=0 - passed=0 - ac_fn_c_check_header_mongrel "$LINENO" "libwmf/eps.h" "ac_cv_header_libwmf_eps_h" "$ac_includes_default" -if test "x$ac_cv_header_libwmf_eps_h" = xyes; then : - passed=`expr $passed + 1` -else - failed=`expr $failed + 1` + have_libwmf='no' + have_libwmflite='no' + have_libwmf_ipa_h='no' + + ac_fn_c_check_header_compile "$LINENO" "libwmf/ipa.h" "ac_cv_header_libwmf_ipa_h" "$FT2BUILD_H +" +if test "x$ac_cv_header_libwmf_ipa_h" = xyes; then : + have_libwmf_ipa_h='yes' fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wmf_eps_function in -lwmf" >&5 -$as_echo_n "checking for wmf_eps_function in -lwmf... " >&6; } -if ${ac_cv_lib_wmf_wmf_eps_function+:} false; then : + if test "$have_libwmf_ipa_h" = 'yes'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wmf_lite_create in -lwmflite" >&5 +$as_echo_n "checking for wmf_lite_create in -lwmflite... " >&6; } +if ${ac_cv_lib_wmflite_wmf_lite_create+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lwmf "-lwmflite" $LIBS" +LIBS="-lwmflite $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30146,49 +31673,106 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char wmf_eps_function (); +char wmf_lite_create (); int main () { -return wmf_eps_function (); +return wmf_lite_create (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_wmf_wmf_eps_function=yes + ac_cv_lib_wmflite_wmf_lite_create=yes else - ac_cv_lib_wmf_wmf_eps_function=no + ac_cv_lib_wmflite_wmf_lite_create=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wmf_wmf_eps_function" >&5 -$as_echo "$ac_cv_lib_wmf_wmf_eps_function" >&6; } -if test "x$ac_cv_lib_wmf_wmf_eps_function" = xyes; then : - passed=`expr $passed + 1` -else - failed=`expr $failed + 1` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wmflite_wmf_lite_create" >&5 +$as_echo "$ac_cv_lib_wmflite_wmf_lite_create" >&6; } +if test "x$ac_cv_lib_wmflite_wmf_lite_create" = xyes; then : + have_libwmflite='yes' fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if WMF package is complete" >&5 -$as_echo_n "checking if WMF package is complete... " >&6; } - if test $passed -gt 0; then - if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } - have_wmf='no (failed tests)' - else - WMF_LIBS='-lwmf -lwmflite' + if test "$have_libwmflite" = 'yes'; then + +$as_echo "#define WMFLITE_DELEGATE 1" >>confdefs.h + + WMF_LIBS='-lwmflite' LIBS="$WMF_LIBS $LIBS" + have_wmf='yes' + else + WMF_LIBS_DEPS='' + WMF_CONFIG_LIBS=`libwmf-config --libs` + for lib in xml2 expat freetype jpeg png z; do + testlib="-l${lib}" + echo "$WMF_CONFIG_LIBS" | grep -- "$testlib" > /dev/null && WMF_LIBS_DEPS="$WMF_LIBS_DEPS $testlib" + done + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wmf_api_create in -lwmf" >&5 +$as_echo_n "checking for wmf_api_create in -lwmf... " >&6; } +if ${ac_cv_lib_wmf_wmf_api_create+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lwmf $WMF_LIBS_DEPS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char wmf_api_create (); +int +main () +{ +return wmf_api_create (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_wmf_wmf_api_create=yes +else + ac_cv_lib_wmf_wmf_api_create=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wmf_wmf_api_create" >&5 +$as_echo "$ac_cv_lib_wmf_wmf_api_create" >&6; } +if test "x$ac_cv_lib_wmf_wmf_api_create" = xyes; then : + have_libwmf='yes' +fi + + if test "$have_libwmf" = 'yes'; then $as_echo "#define WMF_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - have_wmf='yes' + WMF_LIBS='-lwmf' + LIBS="$WMF_LIBS $LIBS" + have_wmf='yes' + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "no -- some components failed test" >&6; } + have_wmf='no (failed tests)' + have_wmflite='no (failed tests)' + LIBS="$OLIBS" + WMF_LIBS='' + fi fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if WMF package is complete" >&5 +$as_echo_n "checking if WMF package is complete... " >&6; } + if test "$have_wmf" = 'yes'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -30226,35 +31810,35 @@ fi have_xml='no' XML_LIBS='' if test "$with_xml" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML" >&5 $as_echo_n "checking for XML... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} PERSIST_LDFLAGS=$LDFLAGS PERSIST_CPPFLAGS=$CPPFLAGS xml2_config='' - for ac_prog in xml2-config -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 + # Extract the first word of "xml2-config", so it can be a program name with args. +set dummy xml2-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_xml2_config+:} false; then : +if ${ac_cv_path_xml2_config+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$xml2_config"; then - ac_cv_prog_xml2_config="$xml2_config" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $xml2_config in + [\\/]* | ?:[\\/]*) + ac_cv_path_xml2_config="$xml2_config" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_xml2_config="$ac_prog" + ac_cv_path_xml2_config="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -30262,9 +31846,10 @@ done done IFS=$as_save_IFS + ;; +esac fi -fi -xml2_config=$ac_cv_prog_xml2_config +xml2_config=$ac_cv_path_xml2_config if test -n "$xml2_config"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xml2_config" >&5 $as_echo "$xml2_config" >&6; } @@ -30273,9 +31858,6 @@ else $as_echo "no" >&6; } fi - - test -n "$xml2_config" && break -done if test -n "$xml2_config"; then # Debian installs libxml headers under /usr/include/libxml2/libxml with # the shared library installed under /usr/lib, whereas the package @@ -30298,9 +31880,9 @@ else fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlParseExternalEntity in -lxml2" >&5 -$as_echo_n "checking for xmlParseExternalEntity in -lxml2... " >&6; } -if ${ac_cv_lib_xml2_xmlParseExternalEntity+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlSAXVersion in -lxml2" >&5 +$as_echo_n "checking for xmlSAXVersion in -lxml2... " >&6; } +if ${ac_cv_lib_xml2_xmlSAXVersion+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -30314,27 +31896,111 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char xmlParseExternalEntity (); +char xmlSAXVersion (); int main () { -return xmlParseExternalEntity (); +return xmlSAXVersion (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_xml2_xmlParseExternalEntity=yes + ac_cv_lib_xml2_xmlSAXVersion=yes else - ac_cv_lib_xml2_xmlParseExternalEntity=no + ac_cv_lib_xml2_xmlSAXVersion=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_xmlParseExternalEntity" >&5 -$as_echo "$ac_cv_lib_xml2_xmlParseExternalEntity" >&6; } -if test "x$ac_cv_lib_xml2_xmlParseExternalEntity" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_xmlSAXVersion" >&5 +$as_echo "$ac_cv_lib_xml2_xmlSAXVersion" >&6; } +if test "x$ac_cv_lib_xml2_xmlSAXVersion" = xyes; then : + passed=`expr $passed + 1` +else + failed=`expr $failed + 1` +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlParseChunk in -lxml2" >&5 +$as_echo_n "checking for xmlParseChunk in -lxml2... " >&6; } +if ${ac_cv_lib_xml2_xmlParseChunk+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lxml2 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char xmlParseChunk (); +int +main () +{ +return xmlParseChunk (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_xml2_xmlParseChunk=yes +else + ac_cv_lib_xml2_xmlParseChunk=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_xmlParseChunk" >&5 +$as_echo "$ac_cv_lib_xml2_xmlParseChunk" >&6; } +if test "x$ac_cv_lib_xml2_xmlParseChunk" = xyes; then : + passed=`expr $passed + 1` +else + failed=`expr $failed + 1` +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlCreatePushParserCtxt in -lxml2" >&5 +$as_echo_n "checking for xmlCreatePushParserCtxt in -lxml2... " >&6; } +if ${ac_cv_lib_xml2_xmlCreatePushParserCtxt+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lxml2 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char xmlCreatePushParserCtxt (); +int +main () +{ +return xmlCreatePushParserCtxt (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_xml2_xmlCreatePushParserCtxt=yes +else + ac_cv_lib_xml2_xmlCreatePushParserCtxt=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_xmlCreatePushParserCtxt" >&5 +$as_echo "$ac_cv_lib_xml2_xmlCreatePushParserCtxt" >&6; } +if test "x$ac_cv_lib_xml2_xmlCreatePushParserCtxt" = xyes; then : passed=`expr $passed + 1` else failed=`expr $failed + 1` @@ -30344,8 +32010,8 @@ fi $as_echo_n "checking if XML package is complete... " >&6; } if test $passed -gt 0; then if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no -- some components failed test" >&5 +$as_echo "$as_me: no -- some components failed test" >&6;} have_xml='no (failed tests)' LDFLAGS="$PERSIST_LDFLAGS" CPPFLAGS="$PERSIST_CPPFLAGS" @@ -30355,13 +32021,13 @@ $as_echo "no -- some components failed test" >&6; } $as_echo "#define XML_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 +$as_echo "$as_me: yes" >&6;} have_xml='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 +$as_echo "$as_me: no" >&6;} fi fi if test "$have_xml" = 'yes'; then @@ -30383,6 +32049,22 @@ fi # Configure install Paths # +# Path to ImageMagick header files +INCLUDE_RELATIVE_PATH="ImageMagick" +INCLUDE_PATH="${INCLUDEARCH_DIR}/${INCLUDE_RELATIVE_PATH}" +DEFINE_INCLUDE_PATH="${INCLUDEARCH_DIR}/${INCLUDE_RELATIVE_PATH}/" +case "${build_os}" in + mingw* ) + DEFINE_INCLUDE_PATH=`$WinPathScript "$DEFINE_INCLUDE_PATH" 1` + ;; +esac + +cat >>confdefs.h <<_ACEOF +#define INCLUDE_PATH "$DEFINE_INCLUDE_PATH" +_ACEOF + + + # Subdirectory under lib to place ImageMagick lib files LIBRARY_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}" @@ -30482,7 +32164,7 @@ _ACEOF -# Subdirectory to place ImageMagick configuration files +# Subdirectory to place architecture-dependent configuration files CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}" cat >>confdefs.h <<_ACEOF @@ -30503,7 +32185,7 @@ _ACEOF -# Subdirectory to place ImageMagick configuration files +# Subdirectory to place architecture-independent configuration files SHARE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}" cat >>confdefs.h <<_ACEOF @@ -30524,18 +32206,39 @@ _ACEOF +# Subdirectory to place architecture-dependent configuration files +SHAREARCH_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/config" + +cat >>confdefs.h <<_ACEOF +#define SHAREARCH_RELATIVE_PATH "$SHAREARCH_RELATIVE_PATH" +_ACEOF + +SHAREARCH_PATH="${SHAREARCH_DIR}/${SHAREARCH_RELATIVE_PATH}" +DEFINE_SHAREARCH_PATH="${SHAREARCH_DIR}/${SHAREARCH_RELATIVE_PATH}/" +case "${build_os}" in + mingw* ) + DEFINE_SHAREARCH_PATH=`$WinPathScript "$DEFINE_SHAREARCH_PATH" 1` + ;; +esac + +cat >>confdefs.h <<_ACEOF +#define SHAREARCH_PATH "$DEFINE_SHAREARCH_PATH" +_ACEOF + + + # # program_transform_name is formed for use in a Makefile, so create a # modified version for use in a shell script. configure_transform_name=`echo ${program_transform_name} | sed 's,\\$\\$,$,'` # Default delegate definitions -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ImageMagick delegate programs" >&5 $as_echo_n "checking for ImageMagick delegate programs... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} AutotraceDecodeDelegateDefault='autotrace' BlenderDecodeDelegateDefault='blender' BZIPDelegateDefault='bzip2' @@ -32444,11 +34147,11 @@ else fi if test "${dejavu_font_dir}x" != 'x'; then type_include_files="${type_include_files} "'' - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dejavu_font_dir" >&5 -$as_echo "$dejavu_font_dir" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: $dejavu_font_dir" >&5 +$as_echo "$as_me: $dejavu_font_dir" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found!" >&5 -$as_echo "not found!" >&6; }; + { $as_echo "$as_me:${as_lineno-$LINENO}: not found!" >&5 +$as_echo "$as_me: not found!" >&6;}; fi @@ -32508,11 +34211,11 @@ else fi if test "${ghostscript_font_dir}x" != 'x'; then type_include_files="${type_include_files} "'' - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ghostscript_font_dir" >&5 -$as_echo "$ghostscript_font_dir" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: $ghostscript_font_dir" >&5 +$as_echo "$as_me: $ghostscript_font_dir" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found!" >&5 -$as_echo "not found!" >&6; }; + { $as_echo "$as_me:${as_lineno-$LINENO}: not found!" >&5 +$as_echo "$as_me: not found!" >&6;}; fi case "${build_os}" in @@ -32883,18 +34586,18 @@ fi # GhostPCL related configuration. # PCLColorDevice=ppmraw -PCLCMYKDevice=bmpsep8 +PCLCMYKDevice=pamcmyk32 PCLMonoDevice=pbmraw if test -z "$PCLVersion"; then PCLVersion='unknown' fi if test $have_pcl = 'yes'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCL" >&5 $as_echo_n "checking for PCL... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} # PCLColorDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcl color device" >&5 $as_echo_n "checking for pcl color device... " >&6; } @@ -32903,8 +34606,8 @@ $as_echo_n "checking for pcl color device... " >&6; } else PCLColorDevice=ppmraw fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCLColorDevice" >&5 -$as_echo "$PCLColorDevice" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: $PCLColorDevice" >&5 +$as_echo "$as_me: $PCLColorDevice" >&6;} # PCLCMYKDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcl CMYK device" >&5 @@ -32914,8 +34617,8 @@ $as_echo_n "checking for pcl CMYK device... " >&6; } else PCLCMYKDevice=$PCLColorDevice fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCLCMYKDevice" >&5 -$as_echo "$PCLCMYKDevice" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: $PCLCMYKDevice" >&5 +$as_echo "$as_me: $PCLCMYKDevice" >&6;} # PCLMonoDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcl mono device" >&5 @@ -32925,8 +34628,8 @@ $as_echo_n "checking for pcl mono device... " >&6; } else PCLMonoDevice=$PCLColorDevice fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCLMonoDevice" >&5 -$as_echo "$PCLMonoDevice" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: $PCLMonoDevice" >&5 +$as_echo "$as_me: $PCLMonoDevice" >&6;} fi @@ -32944,12 +34647,12 @@ if test -z "$XPSVersion"; then XPSVersion='unknown' fi if test $have_xps = 'yes'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPS" >&5 $as_echo_n "checking for XPS... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} # XPSColorDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xps color device" >&5 $as_echo_n "checking for xps color device... " >&6; } @@ -32958,8 +34661,8 @@ $as_echo_n "checking for xps color device... " >&6; } else XPSColorDevice=ppmraw fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XPSColorDevice" >&5 -$as_echo "$XPSColorDevice" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: $XPSColorDevice" >&5 +$as_echo "$as_me: $XPSColorDevice" >&6;} # XPSCMYKDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xps CMYK device" >&5 @@ -32969,8 +34672,8 @@ $as_echo_n "checking for xps CMYK device... " >&6; } else XPSCMYKDevice=$XPSColorDevice fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XPSCMYKDevice" >&5 -$as_echo "$XPSCMYKDevice" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: $XPSCMYKDevice" >&5 +$as_echo "$as_me: $XPSCMYKDevice" >&6;} # XPSMonoDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xps mono device" >&5 @@ -32980,8 +34683,8 @@ $as_echo_n "checking for xps mono device... " >&6; } else XPSMonoDevice=$XPSColorDevice fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XPSMonoDevice" >&5 -$as_echo "$XPSMonoDevice" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: $XPSMonoDevice" >&5 +$as_echo "$as_me: $XPSMonoDevice" >&6;} fi @@ -33001,12 +34704,12 @@ GSPSDevice=pswrite GSEPSDevice=epswrite GSVersion='unknown' if test $have_gs = 'yes'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ghostscript" >&5 $as_echo_n "checking for Ghostscript... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ghostscript version" >&5 $as_echo_n "checking for Ghostscript version... " >&6; } if GSVersion=`$PSDelegate --version`; then @@ -33014,8 +34717,8 @@ $as_echo_n "checking for Ghostscript version... " >&6; } else GSVersion=`$PSDelegate --help | sed -e '1q' | awk '{ print $3 }'` fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSVersion" >&5 -$as_echo "$GSVersion" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: $GSVersion" >&5 +$as_echo "$as_me: $GSVersion" >&6;} # GSAlphaDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs alpha device" >&5 @@ -33025,8 +34728,8 @@ $as_echo_n "checking for gs alpha device... " >&6; } else GSAlphaDevice=pnmraw fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSAlphaDevice" >&5 -$as_echo "$GSAlphaDevice" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: $GSAlphaDevice" >&5 +$as_echo "$as_me: $GSAlphaDevice" >&6;} # GSColorDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs color device" >&5 @@ -33036,8 +34739,8 @@ $as_echo_n "checking for gs color device... " >&6; } else GSColorDevice=pnmraw fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSColorDevice" >&5 -$as_echo "$GSColorDevice" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: $GSColorDevice" >&5 +$as_echo "$as_me: $GSColorDevice" >&6;} # GSCMYKDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs CMYK device" >&5 @@ -33047,8 +34750,8 @@ $as_echo_n "checking for gs CMYK device... " >&6; } else GSCMYKDevice=bmpsep8 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSCMYKDevice" >&5 -$as_echo "$GSCMYKDevice" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: $GSCMYKDevice" >&5 +$as_echo "$as_me: $GSCMYKDevice" >&6;} # GSMonoDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs mono device" >&5 @@ -33058,8 +34761,8 @@ $as_echo_n "checking for gs mono device... " >&6; } else GSMonoDevice=$GSColorDevice fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSMonoDevice" >&5 -$as_echo "$GSMonoDevice" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: $GSMonoDevice" >&5 +$as_echo "$as_me: $GSMonoDevice" >&6;} # GSPDFDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs PDF writing device" >&5 @@ -33069,8 +34772,8 @@ $as_echo_n "checking for gs PDF writing device... " >&6; } else GSPDFDevice=nodevice fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSPDFDevice" >&5 -$as_echo "$GSPDFDevice" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: $GSPDFDevice" >&5 +$as_echo "$as_me: $GSPDFDevice" >&6;} # GSPSDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs PS writing device" >&5 @@ -33080,8 +34783,8 @@ $as_echo_n "checking for gs PS writing device... " >&6; } else GSPSDevice=nodevice fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSPSDevice" >&5 -$as_echo "$GSPSDevice" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: $GSPSDevice" >&5 +$as_echo "$as_me: $GSPSDevice" >&6;} # GSEPSDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs EPS writing device" >&5 @@ -33091,8 +34794,8 @@ $as_echo_n "checking for gs EPS writing device... " >&6; } else GSEPSDevice=nodevice fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSEPSDevice" >&5 -$as_echo "$GSEPSDevice" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: $GSEPSDevice" >&5 +$as_echo "$as_me: $GSEPSDevice" >&6;} fi @@ -33112,12 +34815,12 @@ fi # If name/path of desired PERL interpreter is specified, look for that one first have_perl='no' if test "$with_perl" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Perl" >&5 $as_echo_n "checking for Perl... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} if test "$with_perl" != 'yes'; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl" >&5 $as_echo_n "checking for perl... " >&6; } @@ -33301,7 +35004,7 @@ if test $with_perl_static = 'yes'; then libtool_objdir=$objdir # Linker search path to library, followed by -lMagickCore - MAGICKCORE_PATH="${builddir}/magick/${libtool_objdir}" + MAGICKCORE_PATH="${builddir}/MagickCore/${libtool_objdir}" fi @@ -33485,7 +35188,7 @@ fi if test "$with_modules" != 'no'; then MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS" 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 $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS" + MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS" fi @@ -33538,21 +35241,17 @@ ac_config_commands="$ac_config_commands default" ac_config_commands="$ac_config_commands MagickCore-config.in" -ac_config_commands="$ac_config_commands Magick-config.in" - ac_config_commands="$ac_config_commands MagickWand-config.in" -ac_config_commands="$ac_config_commands Wand-config.in" - ac_config_commands="$ac_config_commands Magick++-config.in" ac_config_commands="$ac_config_commands PerlMagick/check.sh.in" -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Update ImageMagick configuration" >&5 -$as_echo "Update ImageMagick configuration" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 +$as_echo "$as_me: -------------------------------------------------------------" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Update ImageMagick configuration" >&5 +$as_echo "$as_me: Update ImageMagick configuration" >&6;} cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -33832,6 +35531,14 @@ if test -z "${OPENEXR_DELEGATE_TRUE}" && test -z "${OPENEXR_DELEGATE_FALSE}"; th as_fn_error $? "conditional \"OPENEXR_DELEGATE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${PANGO_DELEGATE_TRUE}" && test -z "${PANGO_DELEGATE_FALSE}"; then + as_fn_error $? "conditional \"PANGO_DELEGATE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${PANGOFT2_DELEGATE_TRUE}" && test -z "${PANGOFT2_DELEGATE_FALSE}"; then + as_fn_error $? "conditional \"PANGOFT2_DELEGATE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${PNG_DELEGATE_TRUE}" && test -z "${PNG_DELEGATE_FALSE}"; then as_fn_error $? "conditional \"PNG_DELEGATE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -34293,7 +36000,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ImageMagick $as_me 6.6.9, which was +This file was extended by ImageMagick $as_me 7.0.0-0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -34359,7 +36066,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ImageMagick config.status 6.6.9 +ImageMagick config.status 7.0.0-0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -34506,6 +36213,7 @@ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -34580,7 +36288,6 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -34652,7 +36359,6 @@ with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' @@ -34699,6 +36405,7 @@ LD \ AS \ DLLTOOL \ OBJDUMP \ +PATH_SEPARATOR \ NM \ LN_S \ lt_SP2NL \ @@ -34742,7 +36449,6 @@ with_gnu_ld \ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -34776,7 +36482,6 @@ with_gnu_ld_CXX \ allow_undefined_flag_CXX \ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ exclude_expsyms_CXX \ include_expsyms_CXX \ @@ -34869,7 +36574,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "config/config.h") CONFIG_HEADERS="$CONFIG_HEADERS config/config.h" ;; - "magick/magick-config.h") CONFIG_COMMANDS="$CONFIG_COMMANDS magick/magick-config.h" ;; + "MagickCore/magick-config.h") CONFIG_COMMANDS="$CONFIG_COMMANDS MagickCore/magick-config.h" ;; "config/configure.xml") CONFIG_FILES="$CONFIG_FILES config/configure.xml" ;; "config/delegates.xml") CONFIG_FILES="$CONFIG_FILES config/delegates.xml" ;; "config/ImageMagick.rdf") CONFIG_FILES="$CONFIG_FILES config/ImageMagick.rdf" ;; @@ -34881,13 +36586,12 @@ do "config/type.xml") CONFIG_FILES="$CONFIG_FILES config/type.xml" ;; "ImageMagick.spec") CONFIG_FILES="$CONFIG_FILES ImageMagick.spec" ;; "Magick++/bin/Magick++-config") CONFIG_FILES="$CONFIG_FILES Magick++/bin/Magick++-config" ;; - "magick/ImageMagick.pc") CONFIG_FILES="$CONFIG_FILES magick/ImageMagick.pc" ;; + "MagickCore/ImageMagick.pc") CONFIG_FILES="$CONFIG_FILES MagickCore/ImageMagick.pc" ;; "Magick++/lib/ImageMagick++.pc") CONFIG_FILES="$CONFIG_FILES Magick++/lib/ImageMagick++.pc" ;; "Magick++/lib/Magick++.pc") CONFIG_FILES="$CONFIG_FILES Magick++/lib/Magick++.pc" ;; - "magick/Magick-config") CONFIG_FILES="$CONFIG_FILES magick/Magick-config" ;; - "magick/MagickCore-config") CONFIG_FILES="$CONFIG_FILES magick/MagickCore-config" ;; - "magick/MagickCore.pc") CONFIG_FILES="$CONFIG_FILES magick/MagickCore.pc" ;; - "magick/version.h") CONFIG_FILES="$CONFIG_FILES magick/version.h" ;; + "MagickCore/MagickCore-config") CONFIG_FILES="$CONFIG_FILES MagickCore/MagickCore-config" ;; + "MagickCore/MagickCore.pc") CONFIG_FILES="$CONFIG_FILES MagickCore/MagickCore.pc" ;; + "MagickCore/version.h") CONFIG_FILES="$CONFIG_FILES MagickCore/version.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "magick.sh") CONFIG_FILES="$CONFIG_FILES magick.sh" ;; "PerlMagick/Magick.pm") CONFIG_FILES="$CONFIG_FILES PerlMagick/Magick.pm" ;; @@ -34905,17 +36609,13 @@ do "utilities/mogrify.1") CONFIG_FILES="$CONFIG_FILES utilities/mogrify.1" ;; "utilities/montage.1") CONFIG_FILES="$CONFIG_FILES utilities/montage.1" ;; "utilities/stream.1") CONFIG_FILES="$CONFIG_FILES utilities/stream.1" ;; - "wand/MagickWand-config") CONFIG_FILES="$CONFIG_FILES wand/MagickWand-config" ;; - "wand/MagickWand.pc") CONFIG_FILES="$CONFIG_FILES wand/MagickWand.pc" ;; - "wand/Wand-config") CONFIG_FILES="$CONFIG_FILES wand/Wand-config" ;; - "wand/Wand.pc") CONFIG_FILES="$CONFIG_FILES wand/Wand.pc" ;; + "MagickWand/MagickWand-config") CONFIG_FILES="$CONFIG_FILES MagickWand/MagickWand-config" ;; + "MagickWand/MagickWand.pc") CONFIG_FILES="$CONFIG_FILES MagickWand/MagickWand.pc" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "MagickCore-config.in") CONFIG_COMMANDS="$CONFIG_COMMANDS MagickCore-config.in" ;; - "Magick-config.in") CONFIG_COMMANDS="$CONFIG_COMMANDS Magick-config.in" ;; "MagickWand-config.in") CONFIG_COMMANDS="$CONFIG_COMMANDS MagickWand-config.in" ;; - "Wand-config.in") CONFIG_COMMANDS="$CONFIG_COMMANDS Wand-config.in" ;; "Magick++-config.in") CONFIG_COMMANDS="$CONFIG_COMMANDS Magick++-config.in" ;; "PerlMagick/check.sh.in") CONFIG_COMMANDS="$CONFIG_COMMANDS PerlMagick/check.sh.in" ;; @@ -35513,7 +37213,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in - "magick/magick-config.h":C) ac_prefix_conf_OUT=`echo magick/magick-config.h` + "MagickCore/magick-config.h":C) ac_prefix_conf_OUT=`echo MagickCore/magick-config.h` ac_prefix_conf_DEF=`echo _$ac_prefix_conf_OUT | sed -e "y:abcdefghijklmnopqrstuvwxyz:ABCDEFGHIJKLMNOPQRSTUVWXYZ:" -e "s/[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g"` ac_prefix_conf_PKG=`echo MagickCore` ac_prefix_conf_LOW=`echo _$ac_prefix_conf_PKG | sed -e "y:ABCDEFGHIJKLMNOPQRSTUVWXYZ-:abcdefghijklmnopqrstuvwxyz_:"` @@ -35719,8 +37419,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -35798,6 +37498,9 @@ pic_mode=$pic_mode # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -36078,10 +37781,6 @@ no_undefined_flag=$lt_no_undefined_flag # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -36424,10 +38123,6 @@ no_undefined_flag=$lt_no_undefined_flag_CXX # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX @@ -36503,10 +38198,8 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX _LT_EOF ;; - "MagickCore-config.in":C) chmod +x magick/MagickCore-config ;; - "Magick-config.in":C) chmod +x magick/Magick-config ;; - "MagickWand-config.in":C) chmod +x wand/MagickWand-config ;; - "Wand-config.in":C) chmod +x wand/Wand-config ;; + "MagickCore-config.in":C) chmod +x MagickCore/MagickCore-config ;; + "MagickWand-config.in":C) chmod +x MagickWand/MagickWand-config ;; "Magick++-config.in":C) chmod +x Magick++/bin/Magick++-config ;; "PerlMagick/check.sh.in":C) chmod +x PerlMagick/check.sh ;; @@ -36565,7 +38258,7 @@ if test "${windows_font_dir}x" != 'x'; then result_windows_font_dir=${windows_font_dir} fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: +{ $as_echo "$as_me:${as_lineno-$LINENO}: ImageMagick is configured as follows. Please verify that this configuration matches your expectations. @@ -36607,6 +38300,7 @@ LQR --with-lqr=$with_lqr $have_lqr LZMA --with-lzma=$with_lzma $have_lzma Magick++ --with-magick-plus-plus=$with_magick_plus_plus $have_magick_plus_plus OpenEXR --with-openexr=$with_openexr $have_openexr +PANGO --with-pango=$with_pango $have_pango PERL --with-perl=$with_perl $have_perl PNG --with-png=$with_png $have_png RSVG --with-rsvg=$with_rsvg $have_rsvg @@ -36640,7 +38334,7 @@ Options used to compile and link: CXXFLAGS = $CXXFLAGS FEATURES = $MAGICK_FEATURES " >&5 -$as_echo " +$as_echo "$as_me: ImageMagick is configured as follows. Please verify that this configuration matches your expectations. @@ -36682,6 +38376,7 @@ LQR --with-lqr=$with_lqr $have_lqr LZMA --with-lzma=$with_lzma $have_lzma Magick++ --with-magick-plus-plus=$with_magick_plus_plus $have_magick_plus_plus OpenEXR --with-openexr=$with_openexr $have_openexr +PANGO --with-pango=$with_pango $have_pango PERL --with-perl=$with_perl $have_perl PNG --with-png=$with_png $have_png RSVG --with-rsvg=$with_rsvg $have_rsvg @@ -36714,4 +38409,4 @@ Options used to compile and link: CXX = $CXX CXXFLAGS = $CXXFLAGS FEATURES = $MAGICK_FEATURES -" >&6; } +" >&6;}