From ad38abe548f6704423b94e7d1b3d8ed912dc2f5d Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 23 Dec 2012 23:03:21 +0000 Subject: [PATCH] --- Magick++/Makefile.am | 10 +- MagickCore/magick-baseconfig.h | 4 +- MagickCore/version.h | 4 +- Makefile.in | 18 +- PerlMagick/Makefile.am | 4 +- config/config.h.in | 4 +- configure | 650 ++++++++++++++++----------------- configure.ac | 330 +++++++++-------- filters/Makefile.am | 2 +- 9 files changed, 511 insertions(+), 515 deletions(-) diff --git a/Magick++/Makefile.am b/Magick++/Makefile.am index 28d684d66..e312a5b94 100644 --- a/Magick++/Makefile.am +++ b/Magick++/Makefile.am @@ -12,8 +12,8 @@ MAGICKPP_LDADD = $(MAGICKPP_LIBS) $(top_builddir)/MagickCore/libMagickCore-@MAGI MAGICKPP_CHECK_PGRMS = $(MAGICKPP_CHECK_PGRMS_OPT) MAGICKPP_MANS = $(MAGICKPP_MANS_OPT) MAGICKPP_PKGCONFIG = $(MAGICKPP_PKGCONFIG_OPT) -MAGICKPP_SCRPTS = $(MAGICKPP_SCRIPTS_OPT) -MAGICKPP_TESTS = $(MAGICKPP_TEST_SCRIPTS_OPT) +MAGICKPP_SCRPTS = $(MAGICKPP_SCRPTS_OPT) +MAGICKPP_TESTS = $(MAGICKPP_TEST_SCRPTS_OPT) MAGICKPP_TOP_INCHEADERS = $(MAGICKPP_TOP_INCHEADERS_OPT) MAGICKPP_INCHEADERS = $(MAGICKPP_INCHEADERS_OPT) else @@ -28,7 +28,7 @@ MAGICKPP_TOP_INCHEADERS = MAGICKPP_INCHEADERS = endif -MAGICKPP_SCRIPTS_OPT = \ +MAGICKPP_SCRPTS_OPT = \ Magick++/bin/Magick++-config MAGICKPP_MANS_OPT = \ @@ -40,7 +40,7 @@ MAGICKPP_PKGCONFIG_OPT = \ Magick++/lib/Magick++-@MAGICK_ABI_SUFFIX@.pc \ Magick++/lib/ImageMagick++-@MAGICK_ABI_SUFFIX@.pc -MAGICKPP_TEST_SCRIPTS_OPT = \ +MAGICKPP_TEST_SCRPTS_OPT = \ Magick++/tests/tests.tap \ Magick++/demo/demos.tap @@ -60,7 +60,7 @@ MAGICKPP_EXTRA_DIST = \ Magick++/demo/smile.miff \ Magick++/demo/smile_anim.miff \ Magick++/demo/tile.miff \ - $(MAGICKPP_TEST_SCRIPTS_OPT) \ + $(MAGICKPP_TEST_SCRPTS_OPT) \ Magick++/tests/test_image.miff \ Magick++/tests/test_image_anim.miff diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h index 3e6027acd..f79c9cf2f 100644 --- a/MagickCore/magick-baseconfig.h +++ b/MagickCore/magick-baseconfig.h @@ -1239,12 +1239,12 @@ #define MAGICKCORE_SELECT_TYPE_ARG5 (struct timeval *) #endif -/* Configure directory name without ABI part. */ +/* Sharearch directory name without ABI part. */ #ifndef MAGICKCORE_SHAREARCH_BASEDIRNAME #define MAGICKCORE_SHAREARCH_BASEDIRNAME "config" #endif -/* Configure directory dirname */ +/* Sharearch directory dirname */ /* #undef SHAREARCH_DIRNAME */ /* Directory where architecture-independent configuration files live. */ diff --git a/MagickCore/version.h b/MagickCore/version.h index b35ec613d..0eb23557c 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2013 ImageMagick Studio LLC" -#define MagickSVNRevision "10354:10361M" +#define MagickSVNRevision "10354:10369M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 8,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 8 #define MagickLibMinInterface 8 -#define MagickReleaseDate "2012-12-22" +#define MagickReleaseDate "2012-12-23" #define MagickChangeDate "20121005" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "HDRI OpenMP" diff --git a/Makefile.in b/Makefile.in index a2001eae2..92e9bc574 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2421,7 +2421,7 @@ am__set_TESTS_bases = \ bases=`echo $$bases` RECHECK_LOGS = $(TEST_LOGS) @WITH_MAGICK_PLUS_PLUS_TRUE@am__EXEEXT_5 = \ -@WITH_MAGICK_PLUS_PLUS_TRUE@ $(MAGICKPP_TEST_SCRIPTS_OPT) +@WITH_MAGICK_PLUS_PLUS_TRUE@ $(MAGICKPP_TEST_SCRPTS_OPT) am__EXEEXT_6 = TEST_SUITE_LOG = test-suite.log am__test_logs1 = $(TESTS:=.log) @@ -4593,14 +4593,14 @@ MAGICKWAND_CLEANFILES = @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_PKGCONFIG = @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_PKGCONFIG = $(MAGICKPP_PKGCONFIG_OPT) @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_SCRPTS = -@WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_SCRPTS = $(MAGICKPP_SCRIPTS_OPT) +@WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_SCRPTS = $(MAGICKPP_SCRPTS_OPT) @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_TESTS = -@WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_TESTS = $(MAGICKPP_TEST_SCRIPTS_OPT) +@WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_TESTS = $(MAGICKPP_TEST_SCRPTS_OPT) @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_TOP_INCHEADERS = @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_TOP_INCHEADERS = $(MAGICKPP_TOP_INCHEADERS_OPT) @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_INCHEADERS = @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_INCHEADERS = $(MAGICKPP_INCHEADERS_OPT) -MAGICKPP_SCRIPTS_OPT = \ +MAGICKPP_SCRPTS_OPT = \ Magick++/bin/Magick++-config MAGICKPP_MANS_OPT = \ @@ -4612,7 +4612,7 @@ MAGICKPP_PKGCONFIG_OPT = \ Magick++/lib/Magick++-@MAGICK_ABI_SUFFIX@.pc \ Magick++/lib/ImageMagick++-@MAGICK_ABI_SUFFIX@.pc -MAGICKPP_TEST_SCRIPTS_OPT = \ +MAGICKPP_TEST_SCRPTS_OPT = \ Magick++/tests/tests.tap \ Magick++/demo/demos.tap @@ -4632,7 +4632,7 @@ MAGICKPP_EXTRA_DIST = \ Magick++/demo/smile.miff \ Magick++/demo/smile_anim.miff \ Magick++/demo/tile.miff \ - $(MAGICKPP_TEST_SCRIPTS_OPT) \ + $(MAGICKPP_TEST_SCRPTS_OPT) \ Magick++/tests/test_image.miff \ Magick++/tests/test_image_anim.miff @@ -4782,7 +4782,7 @@ MAGICKCORE_FILTER_SRCS = \ @WITH_MODULES_FALSE@filters_LTLIBRARIES = @WITH_MODULES_TRUE@filters_LTLIBRARIES = \ -@WITH_MODULES_TRUE@ filters/analyze.la +@WITH_MODULES_TRUE@ filters/analyze.la ${MATH_LIBS} # analyze filter module @@ -4934,8 +4934,8 @@ TESTS_CLEANFILES = \ @WITH_PERL_TRUE@PERLMAGICK_DISTCLEAN_LOCAL_TARGETS = clean-perl @WITH_PERL_TRUE@PERLMAGICK_MAINTAINER_CLEAN_LOCAL_TARGETS = distclean-local @WITH_PERL_TRUE@PERLMAGICK_TESTS = PerlMagick/check.sh -@WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLMAGICK_CHECKSCRIPTS = perl-build -@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@PERLMAGICK_CHECKSCRIPTS = +@WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLMAGICK_CHECKSCRPTS = perl-build +@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@PERLMAGICK_CHECKSCRPTS = @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLSTATICNAME = PerlMagick # Pkgconfig directory diff --git a/PerlMagick/Makefile.am b/PerlMagick/Makefile.am index c50aa506f..41345201b 100644 --- a/PerlMagick/Makefile.am +++ b/PerlMagick/Makefile.am @@ -43,7 +43,7 @@ PERLMAGICK_TESTS = PerlMagick/check.sh if WITH_PERL_DYNAMIC -PERLMAGICK_CHECKSCRIPTS = +PERLMAGICK_CHECKSCRPTS = $(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER) cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) @@ -68,7 +68,7 @@ if WITH_PERL_STATIC PERLSTATICNAME=PerlMagick -PERLMAGICK_CHECKSCRIPTS = perl-build +PERLMAGICK_CHECKSCRPTS = perl-build $(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER) cd $(PERLMAGICK) && @PERL@ Makefile.PL MAP_TARGET=$(PERLSTATICNAME) $(PERL_MAKE_OPTIONS) && $(MAKE) Makefile ; $(MAKE) Makefile diff --git a/config/config.h.in b/config/config.h.in index aeac865ed..db3e56b57 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -826,10 +826,10 @@ /* Define to the type of arg 5 for `select'. */ #undef SELECT_TYPE_ARG5 -/* Configure directory name without ABI part. */ +/* Sharearch directory name without ABI part. */ #undef SHAREARCH_BASEDIRNAME -/* Configure directory dirname */ +/* Sharearch directory dirname */ #undef SHAREARCH_DIRNAME /* Directory where architecture-independent configuration files live. */ diff --git a/configure b/configure index 3a631d8d1..be501ef13 100755 --- a/configure +++ b/configure @@ -3649,7 +3649,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=10354:10361M +MAGICK_SVN_REVISION=10354:10369M @@ -8900,7 +8900,6 @@ fi eval "eval SHAREARCH_DIR=$sharearch_dir" -SHAREARCH_DIR="$sharearch_dir" # @@ -10346,11 +10345,11 @@ _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}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -23459,29 +23458,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}: $INT8_T" >&5 -$as_echo "$as_me: $INT8_T" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INT8_T" >&5 +$as_echo "$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}: $UINT8_T" >&5 -$as_echo "$as_me: $UINT8_T" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINT8_T" >&5 +$as_echo "$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}: $INT16_T" >&5 -$as_echo "$as_me: $INT16_T" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INT16_T" >&5 +$as_echo "$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}: $UINT16_T" >&5 -$as_echo "$as_me: $UINT16_T" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINT16_T" >&5 +$as_echo "$UINT16_T" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for signed 32-bit type" >&5 @@ -23495,8 +23494,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}: $INT32_T" >&5 -$as_echo "$as_me: $INT32_T" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INT32_T" >&5 +$as_echo "$INT32_T" >&6; } @@ -23511,8 +23510,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}: $UINT32_T" >&5 -$as_echo "$as_me: $UINT32_T" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINT32_T" >&5 +$as_echo "$UINT32_T" >&6; } @@ -23532,8 +23531,8 @@ case "${host_os}" in INT64_F='"I64"' ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: $INT64_T" >&5 -$as_echo "$as_me: $INT64_T" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INT64_T" >&5 +$as_echo "$INT64_T" >&6; } @@ -23553,8 +23552,8 @@ case "${host_os}" in UINT64_F='"I64"' ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: $UINT64_T" >&5 -$as_echo "$as_me: $UINT64_T" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINT64_T" >&5 +$as_echo "$UINT64_T" >&6; } @@ -23569,8 +23568,8 @@ elif test "$UINT32_T" != 'none'; then UINTMAX_T=$UINT32_T UINTMAX_F=$UINT32_F fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: $UINTMAX_T" >&5 -$as_echo "$as_me: $UINTMAX_T" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINTMAX_T" >&5 +$as_echo "$UINTMAX_T" >&6; } @@ -23585,8 +23584,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}: $UINTPTR_T" >&5 -$as_echo "$as_me: $UINTPTR_T" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINTPTR_T" >&5 +$as_echo "$UINTPTR_T" >&6; } @@ -23604,11 +23603,11 @@ main () } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "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 @@ -23623,14 +23622,14 @@ main () } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } $as_echo "#define __func__ __FUNCTION__" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } $as_echo "#define __func__ __FILE__" >>confdefs.h @@ -24800,15 +24799,15 @@ clockid_t clockType = CLOCK_REALTIME; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } $as_echo "#define HAVE_CLOCK_REALTIME 1" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -25580,8 +25579,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}: $have_magick_plus_plus" >&5 -$as_echo "$as_me: $have_magick_plus_plus" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_magick_plus_plus" >&5 +$as_echo "$have_magick_plus_plus" >&6; } LIBS="$OLIBS" fi if test "$have_magick_plus_plus" = 'yes'; then @@ -26082,8 +26081,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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } failed=0 passed=0 ac_fn_c_check_header_mongrel "$LINENO" "umem.h" "ac_cv_header_umem_h" "$ac_includes_default" @@ -26182,8 +26181,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}: no -- some components failed test" >&5 -$as_echo "$as_me: no -- some components failed test" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "no -- some components failed test" >&6; } have_umem='no (failed tests)' else UMEM_LIBS='-lumem' @@ -26191,13 +26190,13 @@ $as_echo "$as_me: no -- some components failed test" >&6;} $as_echo "#define HasUMEM 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_umem='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test "$have_umem" = 'yes'; then @@ -26340,12 +26339,12 @@ fi have_bzlib='no' if test "$with_bzlib" != 'no'; then BZLIB_LIBS='' - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } failed=0 passed=0 found_libbz=0 @@ -26448,8 +26447,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}: no -- some components failed test" >&5 -$as_echo "$as_me: no -- some components failed test" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "no -- some components failed test" >&6; } have_bzlib='no (failed tests)' else BZLIB_LIBS='-lbz2' @@ -26457,13 +26456,13 @@ $as_echo "$as_me: no -- some components failed test" >&6;} $as_echo "#define BZLIB_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_bzlib='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test "$have_bzlib" = 'yes'; then @@ -27167,12 +27166,12 @@ fi fi if test "$no_x" != 'yes'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } LDFLAGS="$LDFLAGS $X_LIBS" X11_LIBS="$X_PRE_LIBS -lX11 $X_EXTRA_LIBS" LIBS="$X11_LIBS $LIBS" @@ -27387,12 +27386,12 @@ fi have_zlib='no' ZLIB_LIBS='' if test "$with_zlib" != 'no' || test "$with_png" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } ZLIB_LIBS='' failed=0 passed=0 @@ -27668,8 +27667,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}: no -- some components failed test" >&5 -$as_echo "$as_me: no -- some components failed test" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "no -- some components failed test" >&6; } have_zlib='no (failed tests)' else ZLIB_LIBS='-lz' @@ -27677,13 +27676,13 @@ $as_echo "$as_me: no -- some components failed test" >&6;} $as_echo "#define ZLIB_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_zlib='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test "$have_zlib" = 'yes'; then @@ -27701,12 +27700,12 @@ with_ltdl='yes' have_ltdl='no' LTDL_LIBS='' if test "$build_modules" != 'no' ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libltdl" >&5 $as_echo_n "checking for libltdl... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } failed=0 passed=0 ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default" @@ -27867,8 +27866,8 @@ AUTOTRACE_CFLAGS="" AUTOTRACE_LIBS="" AUTOTRACE_PKG="" if test "x$with_autotrace" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&6; } pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AUTOTRACE" >&5 @@ -27936,8 +27935,8 @@ else $as_echo "yes" >&6; } have_autotrace=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } fi if test "$have_autotrace" = 'yes'; then @@ -27981,12 +27980,12 @@ fi have_dps='no' DPS_LIBS='' if test "$with_dps" != 'no' && test "$with_x" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } failed=0 passed=0 PERSIST_CPPFLAGS="$CPPFLAGS" @@ -28148,8 +28147,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}: no -- some components failed test" >&5 -$as_echo "$as_me: no -- some components failed test" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "no -- some components failed test" >&6; } have_dps='no (failed tests)' CPPFLAGS="$PERSIST_CPPFLAGS" else @@ -28158,13 +28157,13 @@ $as_echo "$as_me: no -- some components failed test" >&6;} $as_echo "#define DPS_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_dps='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } CPPFLAGS=$PERSIST_CPPFLAGS fi fi @@ -28198,12 +28197,12 @@ fi have_djvu='no' DJVU_LIBS='' if test "$with_djvu" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } failed=0 passed=0 ac_fn_c_check_header_mongrel "$LINENO" "libdjvu/ddjvuapi.h" "ac_cv_header_libdjvu_ddjvuapi_h" "$ac_includes_default" @@ -28260,8 +28259,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}: no -- some components failed test" >&5 -$as_echo "$as_me: no -- some components failed test" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "no -- some components failed test" >&6; } have_djvu='no (failed tests)' else DJVU_LIBS='-ldjvulibre' @@ -28269,13 +28268,13 @@ $as_echo "$as_me: no -- some components failed test" >&6;} $as_echo "#define DJVU_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_djvu='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test "$have_djvu" = 'yes'; then @@ -28325,12 +28324,12 @@ fi have_fftw='no' FFTW_LIBS='' if test "$with_fftw" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } failed=0 passed=0 ac_fn_c_check_header_mongrel "$LINENO" "fftw3.h" "ac_cv_header_fftw3_h" "$ac_includes_default" @@ -28387,8 +28386,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}: no -- some components failed test" >&5 -$as_echo "$as_me: no -- some components failed test" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "no -- some components failed test" >&6; } have_fftw='no (failed tests)' else FFTW_LIBS='-lfftw3' @@ -28396,13 +28395,13 @@ $as_echo "$as_me: no -- some components failed test" >&6;} $as_echo "#define FFTW_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_fftw='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test "$have_fftw" = 'yes'; then @@ -28435,12 +28434,12 @@ fi have_fpx='no' FPX_LIBS='' if test "$with_fpx" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } failed=0 passed=0 ac_ext=cpp @@ -28510,22 +28509,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}: no -- some components failed test" >&5 -$as_echo "$as_me: no -- some components failed test" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "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}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_fpx='yes' PERLMAINCC="$CXX" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test "$have_fpx" = 'yes'; then @@ -28560,8 +28559,8 @@ FONTCONFIG_CFLAGS="" FONTCONFIG_LIBS="" FONTCONFIG_PKG="" if test "x$with_fontconfig" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&6; } pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FONTCONFIG" >&5 @@ -28629,8 +28628,8 @@ else $as_echo "yes" >&6; } have_fontconfig=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } fi if test "$have_fontconfig" = 'yes'; then @@ -28674,12 +28673,12 @@ fi have_freetype='no' FREETYPE_LIBS='' if test "$with_freetype" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } failed=0 passed=0 PERSIST_LDFLAGS="$LDFLAGS" @@ -28819,8 +28818,8 @@ $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}: no -- some components failed test" >&5 -$as_echo "$as_me: no -- some components failed test" >&6;} + { $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" @@ -28832,13 +28831,13 @@ $as_echo "#define FREETYPE_DELEGATE 1" >>confdefs.h $as_echo "#define HAVE_FT2BUILD_H 1" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_freetype='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test "$have_freetype" = 'yes'; then @@ -28875,12 +28874,12 @@ fi have_gslib='no' GS_LIBS='' if test "$with_gslib" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } framework=0 failed=0 passed=0 @@ -28986,18 +28985,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}: no -- some components failed test" >&5 -$as_echo "$as_me: no -- some components failed test" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "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}: yes, using framework." >&5 -$as_echo "$as_me: yes, using framework." >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, using framework." >&5 +$as_echo "yes, using framework." >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: yes, using library." >&5 -$as_echo "$as_me: yes, using library." >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, using library." >&5 +$as_echo "yes, using library." >&6; } GS_LIBS='-lgs' fi LIBS="$GS_LIBS $LIBS" @@ -29007,8 +29006,8 @@ $as_echo "#define GS_DELEGATE 1" >>confdefs.h have_gslib='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test "$have_gslib" = 'yes'; then @@ -29077,8 +29076,8 @@ fi GVC_PKG="" if test "x$with_gvc" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&6; } pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GVC" >&5 @@ -29146,8 +29145,8 @@ else $as_echo "yes" >&6; } have_gvc=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } fi if test "$have_gvc" = 'yes'; then @@ -29187,12 +29186,12 @@ fi have_jbig='no' JBIG_LIBS='' if test "$with_jbig" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } failed=0 passed=0 ac_fn_c_check_header_mongrel "$LINENO" "jbig.h" "ac_cv_header_jbig_h" "$ac_includes_default" @@ -29249,8 +29248,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}: no -- some components failed test" >&5 -$as_echo "$as_me: no -- some components failed test" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "no -- some components failed test" >&6; } have_jbig='no (failed tests)' else JBIG_LIBS='-ljbig' @@ -29258,13 +29257,13 @@ $as_echo "$as_me: no -- some components failed test" >&6;} $as_echo "#define JBIG_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_jbig='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test "$have_jbig" = 'yes'; then @@ -29297,12 +29296,12 @@ fi have_jpeg='no' JPEG_LIBS='' if test "$with_jpeg" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } failed=0 passed=0 ac_fn_c_check_header_mongrel "$LINENO" "jconfig.h" "ac_cv_header_jconfig_h" "$ac_includes_default" @@ -29420,8 +29419,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}: no -- some components failed test" >&5 -$as_echo "$as_me: no -- some components failed test" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "no -- some components failed test" >&6; } have_jpeg='no (failed tests)' else JPEG_LIBS='-ljpeg' @@ -29429,13 +29428,13 @@ $as_echo "$as_me: no -- some components failed test" >&6;} $as_echo "#define JPEG_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_jpeg='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test "$have_jpeg" = 'yes'; then @@ -29468,12 +29467,12 @@ fi have_jp2='no' JP2_LIBS='' if test "$with_jp2" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } failed=0 passed=0 ac_fn_c_check_header_mongrel "$LINENO" "jasper/jasper.h" "ac_cv_header_jasper_jasper_h" "$ac_includes_default" @@ -29530,8 +29529,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}: no -- some components failed test" >&5 -$as_echo "$as_me: no -- some components failed test" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "no -- some components failed test" >&6; } have_jp2='no (failed tests)' else JP2_LIBS='-ljasper' @@ -29539,13 +29538,13 @@ $as_echo "$as_me: no -- some components failed test" >&6;} $as_echo "#define JP2_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_jp2='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test "$have_jp2" = 'yes'; then @@ -29591,12 +29590,12 @@ fi have_lcms2='no' LCMS_LIBS='' if test "$with_lcms2" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } failed=0 passed=0 have_lcms_header='no' @@ -29682,19 +29681,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}: no -- some components failed test" >&5 -$as_echo "$as_me: no -- some components failed test" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "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}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_lcms2='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi @@ -29707,12 +29706,12 @@ fi have_lcms='no' if test "$with_lcms" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } failed=0 passed=0 have_lcms_header='no' @@ -29800,19 +29799,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}: no -- some components failed test" >&5 -$as_echo "$as_me: no -- some components failed test" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "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}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_lcms='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi @@ -29854,8 +29853,8 @@ LQR_CFLAGS="" LQR_LIBS="" LQR_PKG="" if test "x$with_lqr" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&6; } pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LQR" >&5 @@ -29923,8 +29922,8 @@ else $as_echo "yes" >&6; } have_lqr=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } fi if test "$have_lqr" = 'yes'; then @@ -29961,8 +29960,8 @@ fi LZMA_PKG="" if test "x$with_lzma" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&6; } pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LZMA" >&5 @@ -30030,8 +30029,8 @@ else $as_echo "yes" >&6; } have_lzma=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } fi if test "$have_lzma" = 'yes'; then @@ -30076,8 +30075,8 @@ OPENEXR_CFLAGS="" OPENEXR_LIBS="" OPENEXR_PKG="" if test "x$with_openexr" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&6; } pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENEXR" >&5 @@ -30145,8 +30144,8 @@ else $as_echo "yes" >&6; } have_openexr=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } fi if test "$have_openexr" = 'yes'; then @@ -30392,12 +30391,12 @@ have_png='no' PNG_LIBS='' 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}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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;} + { $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" @@ -30453,17 +30452,17 @@ 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;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else failed=`expr $failed + 1` - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi else passed=`expr $passed + 1` - { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi fi @@ -30733,8 +30732,8 @@ fi $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;} + { $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="-l${pnglib}" @@ -30742,8 +30741,8 @@ $as_echo "$as_me: no -- some components failed test" >&6;} $as_echo "#define PNG_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_png='yes' fi fi @@ -30788,8 +30787,8 @@ RSVG_CFLAGS="" RSVG_LIBS="" RSVG_PKG="" if test "x$with_rsvg" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&6; } pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSVG" >&5 @@ -30857,8 +30856,8 @@ else $as_echo "yes" >&6; } have_rsvg=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO_SVG" >&5 @@ -30926,8 +30925,8 @@ else $as_echo "yes" >&6; } have_cairo=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } fi if test "$have_rsvg" = 'yes'; then @@ -30987,12 +30986,12 @@ fi have_tiff='no' TIFF_LIBS='' if test "$with_tiff" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } failed=0 passed=0 ac_fn_c_check_header_mongrel "$LINENO" "tiff.h" "ac_cv_header_tiff_h" "$ac_includes_default" @@ -31225,8 +31224,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}: no -- some components failed test" >&5 -$as_echo "$as_me: no -- some components failed test" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "no -- some components failed test" >&6; } have_tiff='no (failed tests)' else TIFF_LIBS='-ltiff' @@ -31234,8 +31233,8 @@ $as_echo "$as_me: no -- some components failed test" >&6;} $as_echo "#define TIFF_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_tiff='yes' for ac_header in tiffconf.h do : @@ -31266,8 +31265,8 @@ done fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test "$have_tiff" = 'yes'; then @@ -31300,12 +31299,12 @@ fi have_webp='no' WEBP_LIBS='' if test "$with_webp" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } failed=0 passed=0 ac_fn_c_check_header_mongrel "$LINENO" "webp/decode.h" "ac_cv_header_webp_decode_h" "$ac_includes_default" @@ -31362,8 +31361,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}: no -- some components failed test" >&5 -$as_echo "$as_me: no -- some components failed test" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "no -- some components failed test" >&6; } have_webp='no (failed tests)' else WEBP_LIBS='-lwebp' @@ -31371,13 +31370,13 @@ $as_echo "$as_me: no -- some components failed test" >&6;} $as_echo "#define WEBP_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_webp='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test "$have_webp" = 'yes'; then @@ -31599,12 +31598,12 @@ fi have_xml='no' XML_LIBS='' if test "$with_xml" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } PERSIST_LDFLAGS=$LDFLAGS PERSIST_CPPFLAGS=$CPPFLAGS xml2_config='' @@ -31799,8 +31798,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}: no -- some components failed test" >&5 -$as_echo "$as_me: no -- some components failed test" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "no -- some components failed test" >&6; } have_xml='no (failed tests)' LDFLAGS="$PERSIST_LDFLAGS" CPPFLAGS="$PERSIST_CPPFLAGS" @@ -31810,13 +31809,13 @@ $as_echo "$as_me: no -- some components failed test" >&6;} $as_echo "#define XML_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: yes" >&5 -$as_echo "$as_me: yes" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } have_xml='yes' fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: no" >&5 -$as_echo "$as_me: no" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi if test "$have_xml" = 'yes'; then @@ -32047,12 +32046,12 @@ SHAREARCH_PATH="${LIBRARY_PATH}/${SHAREARCH_RELATIVE_PATH}" configure_transform_name=`echo ${program_transform_name} | sed 's,\\$\\$,$,'` # Default delegate definitions -{ $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } AutotraceDecodeDelegateDefault='autotrace' BlenderDecodeDelegateDefault='blender' BZIPDelegateDefault='bzip2' @@ -33924,11 +33923,11 @@ else fi if test "${dejavu_font_dir}x" != 'x'; then type_include_files="${type_include_files} "'' - { $as_echo "$as_me:${as_lineno-$LINENO}: $dejavu_font_dir" >&5 -$as_echo "$as_me: $dejavu_font_dir" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dejavu_font_dir" >&5 +$as_echo "$dejavu_font_dir" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: not found!" >&5 -$as_echo "$as_me: not found!" >&6;}; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found!" >&5 +$as_echo "not found!" >&6; }; fi @@ -33988,11 +33987,11 @@ else fi if test "${ghostscript_font_dir}x" != 'x'; then type_include_files="${type_include_files} "'' - { $as_echo "$as_me:${as_lineno-$LINENO}: $ghostscript_font_dir" >&5 -$as_echo "$as_me: $ghostscript_font_dir" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ghostscript_font_dir" >&5 +$as_echo "$ghostscript_font_dir" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: not found!" >&5 -$as_echo "$as_me: not found!" >&6;}; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found!" >&5 +$as_echo "not found!" >&6; }; fi case "${build_os}" in @@ -34366,12 +34365,12 @@ if test -z "$PCLVersion"; then PCLVersion='unknown' fi if test $have_pcl = 'yes'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } # PCLColorDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcl color device" >&5 $as_echo_n "checking for pcl color device... " >&6; } @@ -34380,8 +34379,8 @@ $as_echo_n "checking for pcl color device... " >&6; } else PCLColorDevice=ppmraw fi - { $as_echo "$as_me:${as_lineno-$LINENO}: $PCLColorDevice" >&5 -$as_echo "$as_me: $PCLColorDevice" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCLColorDevice" >&5 +$as_echo "$PCLColorDevice" >&6; } # PCLCMYKDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcl CMYK device" >&5 @@ -34391,8 +34390,8 @@ $as_echo_n "checking for pcl CMYK device... " >&6; } else PCLCMYKDevice=$PCLColorDevice fi - { $as_echo "$as_me:${as_lineno-$LINENO}: $PCLCMYKDevice" >&5 -$as_echo "$as_me: $PCLCMYKDevice" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCLCMYKDevice" >&5 +$as_echo "$PCLCMYKDevice" >&6; } # PCLMonoDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcl mono device" >&5 @@ -34402,8 +34401,8 @@ $as_echo_n "checking for pcl mono device... " >&6; } else PCLMonoDevice=$PCLColorDevice fi - { $as_echo "$as_me:${as_lineno-$LINENO}: $PCLMonoDevice" >&5 -$as_echo "$as_me: $PCLMonoDevice" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCLMonoDevice" >&5 +$as_echo "$PCLMonoDevice" >&6; } fi @@ -34421,12 +34420,12 @@ if test -z "$XPSVersion"; then XPSVersion='unknown' fi if test $have_xps = 'yes'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } # XPSColorDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xps color device" >&5 $as_echo_n "checking for xps color device... " >&6; } @@ -34435,8 +34434,8 @@ $as_echo_n "checking for xps color device... " >&6; } else XPSColorDevice=ppmraw fi - { $as_echo "$as_me:${as_lineno-$LINENO}: $XPSColorDevice" >&5 -$as_echo "$as_me: $XPSColorDevice" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XPSColorDevice" >&5 +$as_echo "$XPSColorDevice" >&6; } # XPSCMYKDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xps CMYK device" >&5 @@ -34446,8 +34445,8 @@ $as_echo_n "checking for xps CMYK device... " >&6; } else XPSCMYKDevice=$XPSColorDevice fi - { $as_echo "$as_me:${as_lineno-$LINENO}: $XPSCMYKDevice" >&5 -$as_echo "$as_me: $XPSCMYKDevice" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XPSCMYKDevice" >&5 +$as_echo "$XPSCMYKDevice" >&6; } # XPSMonoDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xps mono device" >&5 @@ -34457,8 +34456,8 @@ $as_echo_n "checking for xps mono device... " >&6; } else XPSMonoDevice=$XPSColorDevice fi - { $as_echo "$as_me:${as_lineno-$LINENO}: $XPSMonoDevice" >&5 -$as_echo "$as_me: $XPSMonoDevice" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XPSMonoDevice" >&5 +$as_echo "$XPSMonoDevice" >&6; } fi @@ -34478,12 +34477,12 @@ GSPSDevice=pswrite GSEPSDevice=epswrite GSVersion='unknown' if test $have_gs = 'yes'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&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 @@ -34491,8 +34490,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}: $GSVersion" >&5 -$as_echo "$as_me: $GSVersion" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSVersion" >&5 +$as_echo "$GSVersion" >&6; } # GSAlphaDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs alpha device" >&5 @@ -34502,8 +34501,8 @@ $as_echo_n "checking for gs alpha device... " >&6; } else GSAlphaDevice=pnmraw fi - { $as_echo "$as_me:${as_lineno-$LINENO}: $GSAlphaDevice" >&5 -$as_echo "$as_me: $GSAlphaDevice" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSAlphaDevice" >&5 +$as_echo "$GSAlphaDevice" >&6; } # GSColorDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs color device" >&5 @@ -34513,8 +34512,8 @@ $as_echo_n "checking for gs color device... " >&6; } else GSColorDevice=pnmraw fi - { $as_echo "$as_me:${as_lineno-$LINENO}: $GSColorDevice" >&5 -$as_echo "$as_me: $GSColorDevice" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSColorDevice" >&5 +$as_echo "$GSColorDevice" >&6; } # GSCMYKDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs CMYK device" >&5 @@ -34524,8 +34523,8 @@ $as_echo_n "checking for gs CMYK device... " >&6; } else GSCMYKDevice=bmpsep8 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: $GSCMYKDevice" >&5 -$as_echo "$as_me: $GSCMYKDevice" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSCMYKDevice" >&5 +$as_echo "$GSCMYKDevice" >&6; } # GSMonoDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs mono device" >&5 @@ -34535,8 +34534,8 @@ $as_echo_n "checking for gs mono device... " >&6; } else GSMonoDevice=$GSColorDevice fi - { $as_echo "$as_me:${as_lineno-$LINENO}: $GSMonoDevice" >&5 -$as_echo "$as_me: $GSMonoDevice" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSMonoDevice" >&5 +$as_echo "$GSMonoDevice" >&6; } # GSPDFDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs PDF writing device" >&5 @@ -34546,8 +34545,8 @@ $as_echo_n "checking for gs PDF writing device... " >&6; } else GSPDFDevice=nodevice fi - { $as_echo "$as_me:${as_lineno-$LINENO}: $GSPDFDevice" >&5 -$as_echo "$as_me: $GSPDFDevice" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSPDFDevice" >&5 +$as_echo "$GSPDFDevice" >&6; } # GSPSDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs PS writing device" >&5 @@ -34557,8 +34556,8 @@ $as_echo_n "checking for gs PS writing device... " >&6; } else GSPSDevice=nodevice fi - { $as_echo "$as_me:${as_lineno-$LINENO}: $GSPSDevice" >&5 -$as_echo "$as_me: $GSPSDevice" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSPSDevice" >&5 +$as_echo "$GSPSDevice" >&6; } # GSEPSDevice { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs EPS writing device" >&5 @@ -34568,8 +34567,8 @@ $as_echo_n "checking for gs EPS writing device... " >&6; } else GSEPSDevice=nodevice fi - { $as_echo "$as_me:${as_lineno-$LINENO}: $GSEPSDevice" >&5 -$as_echo "$as_me: $GSEPSDevice" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSEPSDevice" >&5 +$as_echo "$GSEPSDevice" >&6; } fi @@ -34589,12 +34588,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}: -------------------------------------------------------------" >&5 -$as_echo "$as_me: -------------------------------------------------------------" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&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}: " >&5 -$as_echo "$as_me: " >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&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; } @@ -34786,7 +34785,6 @@ fi MAGICK_DELEGATES='' if test "$have_autotrace" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES autotrace" - MAGICK_FEATURES="$MAGICK_FEATURES Autotrace" fi if test "$have_bzlib" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES bzlib" @@ -35082,10 +35080,10 @@ 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}: -------------------------------------------------------------" >&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;} +{ $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; } 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 @@ -38073,7 +38071,7 @@ if test "${windows_font_dir}x" != 'x'; then result_windows_font_dir=${windows_font_dir} fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ImageMagick is configured as follows. Please verify that this configuration matches your expectations. @@ -38151,7 +38149,7 @@ Options used to compile and link: FEATURES = $MAGICK_FEATURES DELEGATES = $MAGICK_DELEGATES " >&5 -$as_echo "$as_me: +$as_echo " ImageMagick is configured as follows. Please verify that this configuration matches your expectations. @@ -38228,4 +38226,4 @@ Options used to compile and link: CXXFLAGS = $CXXFLAGS FEATURES = $MAGICK_FEATURES DELEGATES = $MAGICK_DELEGATES -" >&6;} +" >&6; } diff --git a/configure.ac b/configure.ac index 7901ee338..2693736a8 100755 --- a/configure.ac +++ b/configure.ac @@ -135,7 +135,7 @@ AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl # Ensure that make can run correctly AM_SANITY_CHECK -AM_INIT_AUTOMAKE([1.12 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip]) +AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip]) # Enable support for silent build rules m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -413,7 +413,6 @@ AC_ARG_WITH([sharearch-dir], [sharearch_dir="${LIB_DIR}"]) eval "eval SHAREARCH_DIR=$sharearch_dir" -SHAREARCH_DIR="$sharearch_dir" AC_SUBST(SHAREARCH_DIR) # @@ -484,8 +483,8 @@ if test "$enable_largefile" != no; then exit(!(sizeof(off_t) == 8)); }])], [ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64) - AC_MSG_NOTICE([yes])], - [AC_MSG_NOTICE([no])]) + AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no])]) ;; *) LFS_CPPFLAGS="$LFS_CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" @@ -959,22 +958,22 @@ AC_CHECK_SIZEOF(unsigned int*) AC_MSG_CHECKING(for signed 8-bit type) INT8_T='signed char' -AC_MSG_NOTICE($INT8_T) +AC_MSG_RESULT($INT8_T) AC_SUBST(INT8_T) AC_MSG_CHECKING(for unsigned 8-bit type) UINT8_T='unsigned char' -AC_MSG_NOTICE($UINT8_T) +AC_MSG_RESULT($UINT8_T) AC_SUBST(UINT8_T) AC_MSG_CHECKING(for signed 16-bit type) INT16_T='signed short' -AC_MSG_NOTICE($INT16_T) +AC_MSG_RESULT($INT16_T) AC_SUBST(INT16_T) AC_MSG_CHECKING(for unsigned 16-bit type) UINT16_T='unsigned short' -AC_MSG_NOTICE($UINT16_T) +AC_MSG_RESULT($UINT16_T) AC_SUBST(UINT16_T) AC_MSG_CHECKING(for signed 32-bit type) @@ -987,7 +986,7 @@ elif test $ac_cv_sizeof_signed_long -eq 4; then INT32_T='signed long' INT32_F='"l"' fi -AC_MSG_NOTICE($INT32_T) +AC_MSG_RESULT($INT32_T) AC_SUBST(INT32_T) AC_SUBST(INT32_F) @@ -1001,7 +1000,7 @@ elif test $ac_cv_sizeof_unsigned_long -eq 4; then UINT32_T='unsigned long' UINT32_F='"l"' fi -AC_MSG_NOTICE($UINT32_T) +AC_MSG_RESULT($UINT32_T) AC_SUBST(UINT32_T) AC_SUBST(UINT32_F) @@ -1020,7 +1019,7 @@ case "${host_os}" in INT64_F='"I64"' ;; esac -AC_MSG_NOTICE($INT64_T) +AC_MSG_RESULT($INT64_T) AC_SUBST(INT64_T) AC_SUBST(INT64_F) @@ -1039,7 +1038,7 @@ case "${host_os}" in UINT64_F='"I64"' ;; esac -AC_MSG_NOTICE($UINT64_T) +AC_MSG_RESULT($UINT64_T) AC_SUBST(UINT64_T) AC_SUBST(UINT64_F) @@ -1053,7 +1052,7 @@ elif test "$UINT32_T" != 'none'; then UINTMAX_T=$UINT32_T UINTMAX_F=$UINT32_F fi -AC_MSG_NOTICE($UINTMAX_T) +AC_MSG_RESULT($UINTMAX_T) AC_SUBST(UINTMAX_T) AC_SUBST(UINTMAX_F) @@ -1067,22 +1066,22 @@ elif test $ac_cv_sizeof_unsigned_long_long -eq $ac_cv_sizeof_unsigned_intp; then UINTPTR_T='unsigned long long' UINTPTR_F='"ll"' fi -AC_MSG_NOTICE($UINTPTR_T) +AC_MSG_RESULT($UINTPTR_T) AC_SUBST(UINTPTR_T) AC_SUBST(UINTPTR_F) AC_MSG_CHECKING([whether our compiler supports __func__]) AC_TRY_COMPILE([], [{ const char *func = __func__; return(func != 0 ? 0 : 1); }], - AC_MSG_NOTICE([yes]), - AC_MSG_NOTICE([no]) + AC_MSG_RESULT([yes]), + AC_MSG_RESULT([no]) AC_MSG_CHECKING([whether our compiler supports __FUNCTION__]) AC_TRY_COMPILE([], [{ const char *func = __FUNCTION__; return(func != 0 ? 0 : 1); }], - AC_MSG_NOTICE([yes]) + AC_MSG_RESULT([yes]) AC_DEFINE(__func__, __FUNCTION__, [Define to appropriate substitue if compiler does not have __func__]), - AC_MSG_NOTICE([no]) + AC_MSG_RESULT([no]) AC_DEFINE(__func__, __FILE__, [Define to appropriate substitue if compiler does not have __func__]))) @@ -1125,11 +1124,11 @@ AC_SEARCH_LIBS(clock_gettime, rt, [[#include ]], [[clockid_t clockType = CLOCK_REALTIME;]])], [ - AC_MSG_NOTICE(yes) + AC_MSG_RESULT(yes) AC_DEFINE([HAVE_CLOCK_REALTIME],[1], [Define to 1 if clock_gettime supports CLOCK_REALTIME.]) ], - AC_MSG_NOTICE(no) + AC_MSG_RESULT(no) ) ], [ @@ -1186,7 +1185,7 @@ if test "$with_magick_plus_plus" = 'yes'; then else have_magick_plus_plus='no (failed tests)' fi - AC_MSG_NOTICE([$have_magick_plus_plus]) + AC_MSG_RESULT([$have_magick_plus_plus]) LIBS="$OLIBS" fi AM_CONDITIONAL(WITH_MAGICK_PLUS_PLUS, test "$have_magick_plus_plus" = 'yes') @@ -1357,7 +1356,7 @@ have_umem='no' UMEM_LIBS='' if test "$with_umem" != 'no'; then AC_MSG_CHECKING(for UMEM support ) - AC_MSG_NOTICE() + AC_MSG_RESULT() failed=0 passed=0 AC_CHECK_HEADER(umem.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`) @@ -1366,17 +1365,17 @@ if test "$with_umem" != 'no'; then AC_MSG_CHECKING(if umem memory allocation library is complete) if test $passed -gt 0; then if test $failed -gt 0; then - AC_MSG_NOTICE(no -- some components failed test) + AC_MSG_RESULT(no -- some components failed test) have_umem='no (failed tests)' else UMEM_LIBS='-lumem' LIBS="$UMEM_LIBS $LIBS" AC_DEFINE(HasUMEM,1,Define if you have umem memory allocation library) - AC_MSG_NOTICE(yes) + AC_MSG_RESULT(yes) have_umem='yes' fi else - AC_MSG_NOTICE(no) + AC_MSG_RESULT(no) fi fi AM_CONDITIONAL(HasUMEM, test "$have_umem" = 'yes') @@ -1432,9 +1431,9 @@ fi have_bzlib='no' if test "$with_bzlib" != 'no'; then BZLIB_LIBS='' - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for BZLIB]) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) failed=0 passed=0 found_libbz=0 @@ -1451,17 +1450,17 @@ if test "$with_bzlib" != 'no'; then AC_MSG_CHECKING(if BZLIB package is complete) if test $passed -gt 0; then if test $failed -gt 0; then - AC_MSG_NOTICE(no -- some components failed test) + AC_MSG_RESULT(no -- some components failed test) have_bzlib='no (failed tests)' else BZLIB_LIBS='-lbz2' LIBS="$BZLIB_LIBS $LIBS" AC_DEFINE(BZLIB_DELEGATE,1,Define if you have the bzip2 library) - AC_MSG_NOTICE(yes) + AC_MSG_RESULT(yes) have_bzlib='yes' fi else - AC_MSG_NOTICE(no) + AC_MSG_RESULT(no) fi fi AM_CONDITIONAL(BZLIB_DELEGATE, test "$have_bzlib" = 'yes') @@ -1476,9 +1475,9 @@ XEXT_LIBS='' XT_LIBS='' AC_PATH_XTRA if test "$no_x" != 'yes'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for X11]) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) LDFLAGS="$LDFLAGS $X_LIBS" X11_LIBS="$X_PRE_LIBS -lX11 $X_EXTRA_LIBS" LIBS="$X11_LIBS $LIBS" @@ -1537,9 +1536,9 @@ have_zlib='no' ZLIB_LIBS='' dnl PNG requires zlib so enable zlib check if PNG is requested if test "$with_zlib" != 'no' || test "$with_png" != 'no'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for ZLIB]) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) ZLIB_LIBS='' failed=0 passed=0 @@ -1554,17 +1553,17 @@ if test "$with_zlib" != 'no' || test "$with_png" != 'no'; then AC_MSG_CHECKING([if ZLIB package is complete]) if test $passed -gt 0; then if test $failed -gt 0; then - AC_MSG_NOTICE([no -- some components failed test]) + AC_MSG_RESULT([no -- some components failed test]) have_zlib='no (failed tests)' else ZLIB_LIBS='-lz' LIBS="$ZLIB_LIBS $LIBS" AC_DEFINE(ZLIB_DELEGATE,1,Define if you have zlib compression library) - AC_MSG_NOTICE([yes]) + AC_MSG_RESULT([yes]) have_zlib='yes' fi else - AC_MSG_NOTICE([no]) + AC_MSG_RESULT([no]) fi fi AM_CONDITIONAL(ZLIB_DELEGATE, test "$have_zlib" = 'yes') @@ -1575,9 +1574,9 @@ with_ltdl='yes' have_ltdl='no' LTDL_LIBS='' if test "$build_modules" != 'no' ; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for libltdl]) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) failed=0 passed=0 AC_CHECK_HEADER([ltdl.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) @@ -1633,9 +1632,9 @@ AUTOTRACE_CFLAGS="" AUTOTRACE_LIBS="" AUTOTRACE_PKG="" if test "x$with_autotrace" = "xyes"; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) PKG_CHECK_MODULES(AUTOTRACE,[autotrace >= 0.31.1], have_autotrace=yes, have_autotrace=no) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) fi if test "$have_autotrace" = 'yes'; then @@ -1668,9 +1667,9 @@ fi have_dps='no' DPS_LIBS='' if test "$with_dps" != 'no' && test "$with_x" != 'no'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for DPS]) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) failed=0 passed=0 PERSIST_CPPFLAGS="$CPPFLAGS" @@ -1701,18 +1700,18 @@ if test "$with_dps" != 'no' && test "$with_x" != 'no'; then AC_MSG_CHECKING([if DPS package is complete]) if test $passed -gt 0; then if test $failed -gt 0; then - AC_MSG_NOTICE([no -- some components failed test]) + AC_MSG_RESULT([no -- some components failed test]) have_dps='no (failed tests)' CPPFLAGS="$PERSIST_CPPFLAGS" else DPS_LIBS="-ldpstk -ldps ${LIBDPS_XT}" LIBS="$DPS_LIBS $LIBS" AC_DEFINE(DPS_DELEGATE,1,Define if you have Display Postscript) - AC_MSG_NOTICE([yes]) + AC_MSG_RESULT([yes]) have_dps='yes' fi else - AC_MSG_NOTICE([no]) + AC_MSG_RESULT([no]) CPPFLAGS=$PERSIST_CPPFLAGS fi fi @@ -1737,9 +1736,9 @@ fi have_djvu='no' DJVU_LIBS='' if test "$with_djvu" != 'no'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for DJVU]) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) failed=0 passed=0 AC_CHECK_HEADER(libdjvu/ddjvuapi.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) @@ -1747,17 +1746,17 @@ if test "$with_djvu" != 'no'; then AC_MSG_CHECKING([if DJVU package is complete]) if test $passed -gt 0; then if test $failed -gt 0; then - AC_MSG_NOTICE([no -- some components failed test]) + AC_MSG_RESULT([no -- some components failed test]) have_djvu='no (failed tests)' else DJVU_LIBS='-ldjvulibre' LIBS="$DJVU_LIBS $LIBS" AC_DEFINE(DJVU_DELEGATE,1,Define if you have DJVU library) - AC_MSG_NOTICE([yes]) + AC_MSG_RESULT([yes]) have_djvu='yes' fi else - AC_MSG_NOTICE([no]) + AC_MSG_RESULT([no]) fi fi AM_CONDITIONAL(DJVU_DELEGATE, test "$have_djvu" = 'yes') @@ -1796,9 +1795,9 @@ fi have_fftw='no' FFTW_LIBS='' if test "$with_fftw" != 'no'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for FFTW]) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) failed=0 passed=0 AC_CHECK_HEADER(fftw3.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) @@ -1806,17 +1805,17 @@ if test "$with_fftw" != 'no'; then AC_MSG_CHECKING([if FFTW package is complete]) if test $passed -gt 0; then if test $failed -gt 0; then - AC_MSG_NOTICE([no -- some components failed test]) + AC_MSG_RESULT([no -- some components failed test]) have_fftw='no (failed tests)' else FFTW_LIBS='-lfftw3' LIBS="$FFTW_LIBS $LIBS" AC_DEFINE(FFTW_DELEGATE,1,Define if you have FFTW library) - AC_MSG_NOTICE([yes]) + AC_MSG_RESULT([yes]) have_fftw='yes' fi else - AC_MSG_NOTICE([no]) + AC_MSG_RESULT([no]) fi fi AM_CONDITIONAL(FFTW_DELEGATE, test "$have_fftw" = 'yes') @@ -1840,9 +1839,9 @@ fi have_fpx='no' FPX_LIBS='' if test "$with_fpx" != 'no'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for FlashPIX]) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) failed=0 passed=0 AC_LANG_PUSH(C++) @@ -1852,17 +1851,17 @@ if test "$with_fpx" != 'no'; then AC_MSG_CHECKING([if FlashPIX package is complete]) if test $passed -gt 0; then if test $failed -gt 0; then - AC_MSG_NOTICE([no -- some components failed test]) + AC_MSG_RESULT([no -- some components failed test]) have_fpx='no (failed tests)' else FPX_LIBS='-lfpx' AC_DEFINE(FPX_DELEGATE,1,Define if you have FlashPIX library) - AC_MSG_NOTICE([yes]) + AC_MSG_RESULT([yes]) have_fpx='yes' PERLMAINCC="$CXX" fi else - AC_MSG_NOTICE([no]) + AC_MSG_RESULT([no]) fi fi AM_CONDITIONAL(FPX_DELEGATE, test "$have_fpx" = 'yes') @@ -1888,9 +1887,9 @@ FONTCONFIG_CFLAGS="" FONTCONFIG_LIBS="" FONTCONFIG_PKG="" if test "x$with_fontconfig" = "xyes"; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) PKG_CHECK_MODULES(FONTCONFIG,[fontconfig >= 2.1.0], have_fontconfig=yes, have_fontconfig=no) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) fi if test "$have_fontconfig" = 'yes'; then @@ -1923,9 +1922,9 @@ fi have_freetype='no' FREETYPE_LIBS='' if test "$with_freetype" != 'no'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING(for FreeType 2.0 ) - AC_MSG_NOTICE() + AC_MSG_RESULT() failed=0 passed=0 PERSIST_LDFLAGS="$LDFLAGS" @@ -1974,7 +1973,7 @@ dnl Now test for the headers if test $passed -gt 0; then if test $failed -gt 0; then FREETYPE_LIBS='' - AC_MSG_NOTICE(no -- some components failed test) + AC_MSG_RESULT(no -- some components failed test) have_freetype='no (failed tests)' else LIBS="$FREETYPE_LIBS $LIBS" @@ -1982,11 +1981,11 @@ dnl Now test for the headers if test "$ac_cv_header_ft2build_h" = 'yes'; then AC_DEFINE([HAVE_FT2BUILD_H],[1],[Define to 1 if you have the header file.]) fi - AC_MSG_NOTICE(yes) + AC_MSG_RESULT(yes) have_freetype='yes' fi else - AC_MSG_NOTICE(no) + AC_MSG_RESULT(no) fi fi AM_CONDITIONAL(FREETYPE_DELEGATE, test "$have_freetype" = 'yes') @@ -2014,9 +2013,9 @@ fi have_gslib='no' GS_LIBS='' if test "$with_gslib" != 'no'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for Ghostscript]) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) framework=0 failed=0 passed=0 @@ -2029,15 +2028,15 @@ if test "$with_gslib" != 'no'; then AC_MSG_CHECKING([if Ghostscript package is complete]) if test $passed -gt 0; then if test $failed -gt 0; then - AC_MSG_NOTICE([no -- some components failed test]) + AC_MSG_RESULT([no -- some components failed test]) have_gslib='no (failed tests)' else if test $framework -gt 0; then GS_LIBS='-framework Ghostscript' gslib_framework='yes' - AC_MSG_NOTICE([yes, using framework.]) + AC_MSG_RESULT([yes, using framework.]) else - AC_MSG_NOTICE([yes, using library.]) + AC_MSG_RESULT([yes, using library.]) GS_LIBS='-lgs' fi LIBS="$GS_LIBS $LIBS" @@ -2045,7 +2044,7 @@ if test "$with_gslib" != 'no'; then have_gslib='yes' fi else - AC_MSG_NOTICE([no]) + AC_MSG_RESULT([no]) fi fi AM_CONDITIONAL(GS_DELEGATE, test "$have_gslib" = 'yes') @@ -2095,9 +2094,9 @@ fi GVC_PKG="" if test "x$with_gvc" = "xyes"; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) PKG_CHECK_MODULES(GVC,[libgvc >= 2.9.0], have_gvc=yes, have_gvc=no) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) fi if test "$have_gvc" = 'yes'; then @@ -2126,9 +2125,9 @@ AC_ARG_WITH([jbig], have_jbig='no' JBIG_LIBS='' if test "$with_jbig" != 'no'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for JBIG]) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) failed=0 passed=0 AC_CHECK_HEADER(jbig.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`) @@ -2136,17 +2135,17 @@ if test "$with_jbig" != 'no'; then AC_MSG_CHECKING([if JBIG package is complete]) if test $passed -gt 0; then if test $failed -gt 0; then - AC_MSG_NOTICE([no -- some components failed test]) + AC_MSG_RESULT([no -- some components failed test]) have_jbig='no (failed tests)' else JBIG_LIBS='-ljbig' LIBS="$JBIG_LIBS $LIBS" AC_DEFINE(JBIG_DELEGATE,1,Define if you have JBIG library) - AC_MSG_NOTICE([yes]) + AC_MSG_RESULT([yes]) have_jbig='yes' fi else - AC_MSG_NOTICE([no]) + AC_MSG_RESULT([no]) fi fi AM_CONDITIONAL(JBIG_DELEGATE, test "$have_jbig" = 'yes') @@ -2170,9 +2169,9 @@ fi have_jpeg='no' JPEG_LIBS='' if test "$with_jpeg" != 'no'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for JPEG]) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) failed=0 passed=0 AC_CHECK_HEADER(jconfig.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`) @@ -2203,17 +2202,17 @@ fi AC_MSG_CHECKING([if JPEG package is complete]) if test $passed -gt 0; then if test $failed -gt 0; then - AC_MSG_NOTICE([no -- some components failed test]) + AC_MSG_RESULT([no -- some components failed test]) have_jpeg='no (failed tests)' else JPEG_LIBS='-ljpeg' LIBS="$JPEG_LIBS $LIBS" AC_DEFINE(JPEG_DELEGATE,1,Define if you have JPEG library) - AC_MSG_NOTICE([yes]) + AC_MSG_RESULT([yes]) have_jpeg='yes' fi else - AC_MSG_NOTICE([no]) + AC_MSG_RESULT([no]) fi fi AM_CONDITIONAL(JPEG_DELEGATE, test "$have_jpeg" = 'yes') @@ -2237,9 +2236,9 @@ fi have_jp2='no' JP2_LIBS='' if test "$with_jp2" != 'no'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for JPEG Version 2]) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) failed=0 passed=0 AC_CHECK_HEADER(jasper/jasper.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`) @@ -2247,17 +2246,17 @@ if test "$with_jp2" != 'no'; then AC_MSG_CHECKING([if JPEG version 2 support package is complete]) if test $passed -gt 0; then if test $failed -gt 0; then - AC_MSG_NOTICE([no -- some components failed test]) + AC_MSG_RESULT([no -- some components failed test]) have_jp2='no (failed tests)' else JP2_LIBS='-ljasper' LIBS="$JP2_LIBS $LIBS" AC_DEFINE(JP2_DELEGATE,1,Define if you have JPEG version 2 "Jasper" library) - AC_MSG_NOTICE([yes]) + AC_MSG_RESULT([yes]) have_jp2='yes' fi else - AC_MSG_NOTICE([no]) + AC_MSG_RESULT([no]) fi fi AM_CONDITIONAL(JP2_DELEGATE, test "$have_jp2" = 'yes') @@ -2289,9 +2288,9 @@ fi have_lcms2='no' LCMS_LIBS='' if test "$with_lcms2" != 'no'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for LCMS v2]) - AC_MSG_NOTICE() + AC_MSG_RESULT() failed=0 passed=0 have_lcms_header='no' @@ -2321,16 +2320,16 @@ if test "$with_lcms2" != 'no'; then AC_MSG_CHECKING(if LCMS v2 package is complete) if test $passed -gt 0; then if test $failed -gt 0; then - AC_MSG_NOTICE(no -- some components failed test) + AC_MSG_RESULT(no -- some components failed test) have_lcms2='no (failed tests)' else LCMS_LIBS='-llcms2' LIBS="$LCMS_LIBS $LIBS" - AC_MSG_NOTICE(yes) + AC_MSG_RESULT(yes) have_lcms2='yes' fi else - AC_MSG_NOTICE(no) + AC_MSG_RESULT(no) fi fi @@ -2343,9 +2342,9 @@ fi have_lcms='no' if test "$with_lcms" != 'no'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for LCMS v1.1X]) - AC_MSG_NOTICE() + AC_MSG_RESULT() failed=0 passed=0 have_lcms_header='no' @@ -2377,16 +2376,16 @@ if test "$with_lcms" != 'no'; then AC_MSG_CHECKING(if LCMS package is complete) if test $passed -gt 0; then if test $failed -gt 0; then - AC_MSG_NOTICE(no -- some components failed test) + AC_MSG_RESULT(no -- some components failed test) have_lcms='no (failed tests)' else LCMS_LIBS='-llcms' LIBS="$LCMS_LIBS $LIBS" - AC_MSG_NOTICE(yes) + AC_MSG_RESULT(yes) have_lcms='yes' fi else - AC_MSG_NOTICE(no) + AC_MSG_RESULT(no) fi fi @@ -2417,9 +2416,9 @@ LQR_CFLAGS="" LQR_LIBS="" LQR_PKG="" if test "x$with_lqr" = "xyes"; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) PKG_CHECK_MODULES(LQR,[lqr-1 >= 0.1.0], have_lqr=yes, have_lqr=no) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) fi if test "$have_lqr" = 'yes'; then @@ -2444,9 +2443,9 @@ fi LZMA_PKG="" if test "x$with_lzma" = "xyes"; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) PKG_CHECK_MODULES(LZMA,[liblzma >= 2.9.0], have_lzma=yes, have_lzma=no) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) fi if test "$have_lzma" = 'yes'; then @@ -2480,9 +2479,9 @@ OPENEXR_CFLAGS="" OPENEXR_LIBS="" OPENEXR_PKG="" if test "x$with_openexr" = "xyes"; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) PKG_CHECK_MODULES(OPENEXR,[OpenEXR >= 1.0.6], have_openexr=yes, have_openexr=no) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) fi if test "$have_openexr" = 'yes'; then @@ -2562,9 +2561,9 @@ have_png='no' PNG_LIBS='' if test "$with_png" != 'no' -a "$have_zlib" != 'no' ; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING(for PNG support ) - AC_MSG_NOTICE() + AC_MSG_RESULT() failed=0 passed=0 AC_CHECK_HEADER(png.h,passed=`expr $passed + 1`, @@ -2603,14 +2602,14 @@ return 0; ac_cv_libpng_ok='no') if test "$ac_cv_libpng_ok" = 'yes' ; then passed=`expr $passed + 1` - AC_MSG_NOTICE(yes) + AC_MSG_RESULT(yes) else failed=`expr $failed + 1` - AC_MSG_NOTICE(no) + AC_MSG_RESULT(no) fi else passed=`expr $passed + 1` - AC_MSG_NOTICE(yes) + AC_MSG_RESULT(yes) fi fi @@ -2639,13 +2638,13 @@ return 0; AC_MSG_CHECKING(if ${pnglib} package is complete) if test $passed -gt 0 ; then if test $failed -gt 0 ; then - AC_MSG_NOTICE(no -- some components failed test) + AC_MSG_RESULT(no -- some components failed test) have_png='no (failed tests)' else PNG_LIBS="-l${pnglib}" LIBS="$PNG_LIBS $LIBS" AC_DEFINE(PNG_DELEGATE,1,Define if you have PNG library) - AC_MSG_NOTICE(yes) + AC_MSG_RESULT(yes) have_png='yes' fi fi @@ -2681,11 +2680,11 @@ RSVG_CFLAGS="" RSVG_LIBS="" RSVG_PKG="" if test "x$with_rsvg" = "xyes"; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) PKG_CHECK_MODULES(RSVG,[librsvg-2.0 >= 2.9.0], have_rsvg=yes, have_rsvg=no) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) PKG_CHECK_MODULES(CAIRO_SVG, cairo-svg, have_cairo=yes, have_cairo=no) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) fi if test "$have_rsvg" = 'yes'; then @@ -2725,9 +2724,9 @@ fi have_tiff='no' TIFF_LIBS='' if test "$with_tiff" != 'no'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for TIFF]) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) failed=0 passed=0 AC_CHECK_HEADER(tiff.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`) @@ -2740,13 +2739,13 @@ if test "$with_tiff" != 'no'; then AC_MSG_CHECKING([if TIFF package is complete]) if test $passed -gt 0; then if test $failed -gt 0; then - AC_MSG_NOTICE([no -- some components failed test]) + AC_MSG_RESULT([no -- some components failed test]) have_tiff='no (failed tests)' else TIFF_LIBS='-ltiff' LIBS="$TIFF_LIBS $LIBS" AC_DEFINE(TIFF_DELEGATE,1,Define if you have TIFF library) - AC_MSG_NOTICE([yes]) + AC_MSG_RESULT([yes]) have_tiff='yes' AC_CHECK_HEADERS(tiffconf.h) AC_CHECK_FUNCS([TIFFIsCODECConfigured TIFFMergeFieldInfo \ @@ -2755,7 +2754,7 @@ if test "$with_tiff" != 'no'; then TIFFSwabArrayOfTriples]) fi else - AC_MSG_NOTICE([no]) + AC_MSG_RESULT([no]) fi fi AM_CONDITIONAL(TIFF_DELEGATE, test "$have_tiff" = 'yes') @@ -2779,9 +2778,9 @@ fi have_webp='no' WEBP_LIBS='' if test "$with_webp" != 'no'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for WEBP]) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) failed=0 passed=0 AC_CHECK_HEADER(webp/decode.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) @@ -2789,17 +2788,17 @@ if test "$with_webp" != 'no'; then AC_MSG_CHECKING([if WEBP package is complete]) if test $passed -gt 0; then if test $failed -gt 0; then - AC_MSG_NOTICE([no -- some components failed test]) + AC_MSG_RESULT([no -- some components failed test]) have_webp='no (failed tests)' else WEBP_LIBS='-lwebp' LIBS="$WEBP_LIBS $LIBS" AC_DEFINE(WEBP_DELEGATE,1,Define if you have WEBP library) - AC_MSG_NOTICE([yes]) + AC_MSG_RESULT([yes]) have_webp='yes' fi else - AC_MSG_NOTICE([no]) + AC_MSG_RESULT([no]) fi fi AM_CONDITIONAL(WEBP_DELEGATE,test "$have_webp" = 'yes') @@ -2906,9 +2905,9 @@ fi have_xml='no' XML_LIBS='' if test "$with_xml" != 'no'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for XML]) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) PERSIST_LDFLAGS=$LDFLAGS PERSIST_CPPFLAGS=$CPPFLAGS xml2_config='' @@ -2934,7 +2933,7 @@ if test "$with_xml" != 'no'; then AC_MSG_CHECKING([if XML package is complete]) if test $passed -gt 0; then if test $failed -gt 0; then - AC_MSG_NOTICE([no -- some components failed test]) + AC_MSG_RESULT([no -- some components failed test]) have_xml='no (failed tests)' LDFLAGS="$PERSIST_LDFLAGS" CPPFLAGS="$PERSIST_CPPFLAGS" @@ -2942,11 +2941,11 @@ if test "$with_xml" != 'no'; then XML_LIBS='-lxml2' LIBS="$XML_LIBS $LIBS" AC_DEFINE(XML_DELEGATE,1,Define if you have XML library) - AC_MSG_NOTICE([yes]) + AC_MSG_RESULT([yes]) have_xml='yes' fi else - AC_MSG_NOTICE([no]) + AC_MSG_RESULT([no]) fi fi AM_CONDITIONAL(XML_DELEGATE,test "$have_xml" = 'yes') @@ -3090,13 +3089,13 @@ AC_SUBST(SHARE_PATH) if test "x$SHAREARCH_BASEDIRNAME" = "x"; then SHAREARCH_BASEDIRNAME="config" fi -AC_DEFINE_UNQUOTED(SHAREARCH_BASEDIRNAME,"$SHAREARCH_BASEDIRNAME",[Configure directory name without ABI part.]) +AC_DEFINE_UNQUOTED(SHAREARCH_BASEDIRNAME,"$SHAREARCH_BASEDIRNAME",[Sharearch directory name without ABI part.]) AC_SUBST(SHAREARCH_BASEDIRNAME) if test "x$SHAREARCH_DIRNAME" = "x"; then SHAREARCH_DIRNAME=${SHAREARCH_BASEDIRNAME}-${MAGICK_ABI_SUFFIX} else - AC_DEFINE_UNQUOTED(SHAREARCH_DIRNAME,"$SHAREARCH_DIRNAME",[Configure directory dirname]) + AC_DEFINE_UNQUOTED(SHAREARCH_DIRNAME,"$SHAREARCH_DIRNAME",[Sharearch directory dirname]) fi AC_SUBST(SHAREARCH_DIRNAME) @@ -3111,9 +3110,9 @@ AC_SUBST(SHAREARCH_PATH) configure_transform_name=`echo ${program_transform_name} | sed 's,\\$\\$,$,'` # Default delegate definitions -AC_MSG_NOTICE([-------------------------------------------------------------]) +AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for ImageMagick delegate programs]) -AC_MSG_NOTICE([]) +AC_MSG_RESULT([]) AutotraceDecodeDelegateDefault='autotrace' BlenderDecodeDelegateDefault='blender' BZIPDelegateDefault='bzip2' @@ -3254,9 +3253,9 @@ else fi if test "${dejavu_font_dir}x" != 'x'; then type_include_files="${type_include_files} "'' - AC_MSG_NOTICE([$dejavu_font_dir]) + AC_MSG_RESULT([$dejavu_font_dir]) else - AC_MSG_NOTICE([not found!]); + AC_MSG_RESULT([not found!]); fi AC_SUBST(dejavu_font_dir) @@ -3315,9 +3314,9 @@ else fi if test "${ghostscript_font_dir}x" != 'x'; then type_include_files="${type_include_files} "'' - AC_MSG_NOTICE([$ghostscript_font_dir]) + AC_MSG_RESULT([$ghostscript_font_dir]) else - AC_MSG_NOTICE([not found!]); + AC_MSG_RESULT([not found!]); fi AC_SUBST(ghostscript_font_dir) case "${build_os}" in @@ -3457,9 +3456,9 @@ if test -z "$PCLVersion"; then PCLVersion='unknown' fi if test $have_pcl = 'yes'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for PCL]) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) # PCLColorDevice AC_MSG_CHECKING([for pcl color device]) if $PCLDelegate -dBATCH -sDEVICE=$PCLColorDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then @@ -3467,7 +3466,7 @@ if test $have_pcl = 'yes'; then else PCLColorDevice=ppmraw fi - AC_MSG_NOTICE([$PCLColorDevice]) + AC_MSG_RESULT([$PCLColorDevice]) # PCLCMYKDevice AC_MSG_CHECKING([for pcl CMYK device]) @@ -3476,7 +3475,7 @@ if test $have_pcl = 'yes'; then else PCLCMYKDevice=$PCLColorDevice fi - AC_MSG_NOTICE([$PCLCMYKDevice]) + AC_MSG_RESULT([$PCLCMYKDevice]) # PCLMonoDevice AC_MSG_CHECKING([for pcl mono device]) @@ -3485,7 +3484,7 @@ if test $have_pcl = 'yes'; then else PCLMonoDevice=$PCLColorDevice fi - AC_MSG_NOTICE([$PCLMonoDevice]) + AC_MSG_RESULT([$PCLMonoDevice]) fi AC_SUBST(PCLMonoDevice) @@ -3503,9 +3502,9 @@ if test -z "$XPSVersion"; then XPSVersion='unknown' fi if test $have_xps = 'yes'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for XPS]) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) # XPSColorDevice AC_MSG_CHECKING([for xps color device]) if $XPSDelegate -dBATCH -sDEVICE=$XPSColorDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then @@ -3513,7 +3512,7 @@ if test $have_xps = 'yes'; then else XPSColorDevice=ppmraw fi - AC_MSG_NOTICE([$XPSColorDevice]) + AC_MSG_RESULT([$XPSColorDevice]) # XPSCMYKDevice AC_MSG_CHECKING([for xps CMYK device]) @@ -3522,7 +3521,7 @@ if test $have_xps = 'yes'; then else XPSCMYKDevice=$XPSColorDevice fi - AC_MSG_NOTICE([$XPSCMYKDevice]) + AC_MSG_RESULT([$XPSCMYKDevice]) # XPSMonoDevice AC_MSG_CHECKING([for xps mono device]) @@ -3531,7 +3530,7 @@ if test $have_xps = 'yes'; then else XPSMonoDevice=$XPSColorDevice fi - AC_MSG_NOTICE([$XPSMonoDevice]) + AC_MSG_RESULT([$XPSMonoDevice]) fi AC_SUBST(XPSMonoDevice) @@ -3551,16 +3550,16 @@ GSPSDevice=pswrite GSEPSDevice=epswrite GSVersion='unknown' if test $have_gs = 'yes'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for Ghostscript]) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) AC_MSG_CHECKING([for Ghostscript version]) if GSVersion=`$PSDelegate --version`; then : else GSVersion=`$PSDelegate --help | sed -e '1q' | awk '{ print $3 }'` fi - AC_MSG_NOTICE([$GSVersion]) + AC_MSG_RESULT([$GSVersion]) # GSAlphaDevice AC_MSG_CHECKING([for gs alpha device]) @@ -3569,7 +3568,7 @@ if test $have_gs = 'yes'; then else GSAlphaDevice=pnmraw fi - AC_MSG_NOTICE([$GSAlphaDevice]) + AC_MSG_RESULT([$GSAlphaDevice]) # GSColorDevice AC_MSG_CHECKING([for gs color device]) @@ -3578,7 +3577,7 @@ if test $have_gs = 'yes'; then else GSColorDevice=pnmraw fi - AC_MSG_NOTICE([$GSColorDevice]) + AC_MSG_RESULT([$GSColorDevice]) # GSCMYKDevice AC_MSG_CHECKING([for gs CMYK device]) @@ -3587,7 +3586,7 @@ if test $have_gs = 'yes'; then else GSCMYKDevice=bmpsep8 fi - AC_MSG_NOTICE([$GSCMYKDevice]) + AC_MSG_RESULT([$GSCMYKDevice]) # GSMonoDevice AC_MSG_CHECKING([for gs mono device]) @@ -3596,7 +3595,7 @@ if test $have_gs = 'yes'; then else GSMonoDevice=$GSColorDevice fi - AC_MSG_NOTICE([$GSMonoDevice]) + AC_MSG_RESULT([$GSMonoDevice]) # GSPDFDevice AC_MSG_CHECKING([for gs PDF writing device]) @@ -3605,7 +3604,7 @@ if test $have_gs = 'yes'; then else GSPDFDevice=nodevice fi - AC_MSG_NOTICE([$GSPDFDevice]) + AC_MSG_RESULT([$GSPDFDevice]) # GSPSDevice AC_MSG_CHECKING([for gs PS writing device]) @@ -3614,7 +3613,7 @@ if test $have_gs = 'yes'; then else GSPSDevice=nodevice fi - AC_MSG_NOTICE([$GSPSDevice]) + AC_MSG_RESULT([$GSPSDevice]) # GSEPSDevice AC_MSG_CHECKING([for gs EPS writing device]) @@ -3623,7 +3622,7 @@ if test $have_gs = 'yes'; then else GSEPSDevice=nodevice fi - AC_MSG_NOTICE([$GSEPSDevice]) + AC_MSG_RESULT([$GSEPSDevice]) fi AC_SUBST(GSAlphaDevice) @@ -3643,9 +3642,9 @@ AC_SUBST(GSVersion) # If name/path of desired PERL interpreter is specified, look for that one first have_perl='no' if test "$with_perl" != 'no'; then - AC_MSG_NOTICE([-------------------------------------------------------------]) + AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for Perl]) - AC_MSG_NOTICE([]) + AC_MSG_RESULT([]) if test "$with_perl" != 'yes'; then AC_CACHE_CHECK(for perl,ac_cv_path_PERL,ac_cv_path_PERL="$with_perl"); PERL=$ac_cv_path_PERL @@ -3697,7 +3696,6 @@ AC_SUBST(MAGICKCORE_PATH) MAGICK_DELEGATES='' if test "$have_autotrace" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES autotrace" - MAGICK_FEATURES="$MAGICK_FEATURES Autotrace" fi if test "$have_bzlib" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES bzlib" @@ -3899,8 +3897,8 @@ AC_CONFIG_COMMANDS([MagickWand-config.in],[chmod +x MagickWand/MagickWand-config AC_CONFIG_COMMANDS([Magick++-config.in],[chmod +x Magick++/bin/Magick++-config]) AC_CONFIG_COMMANDS([PerlMagick/check.sh.in],[chmod +x PerlMagick/check.sh]) -AC_MSG_NOTICE([-------------------------------------------------------------]) -AC_MSG_NOTICE([Update ImageMagick configuration]) +AC_MSG_RESULT([-------------------------------------------------------------]) +AC_MSG_RESULT([Update ImageMagick configuration]) AC_OUTPUT rm -f magick-version @@ -3920,7 +3918,7 @@ if test "${windows_font_dir}x" != 'x'; then result_windows_font_dir=${windows_font_dir} fi -AC_MSG_NOTICE([ +AC_MSG_RESULT([ ImageMagick is configured as follows. Please verify that this configuration matches your expectations. diff --git a/filters/Makefile.am b/filters/Makefile.am index e6e93403f..1e1c5fdfe 100644 --- a/filters/Makefile.am +++ b/filters/Makefile.am @@ -22,7 +22,7 @@ MAGICKCORE_FILTER_SRCS = \ if WITH_MODULES filters_LTLIBRARIES = \ - filters/analyze.la + filters/analyze.la ${MATH_LIBS} else filters_LTLIBRARIES = endif # WITH_MODULES -- 2.40.0