diff options
Diffstat (limited to 'tiff/configure')
-rwxr-xr-x | tiff/configure | 1283 |
1 files changed, 530 insertions, 753 deletions
diff --git a/tiff/configure b/tiff/configure index 96362dad..1d9918f7 100755 --- a/tiff/configure +++ b/tiff/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for LibTIFF Software 4.2.0. +# Generated by GNU Autoconf 2.69 for LibTIFF Software 4.3.0. # # Report bugs to <tiff@lists.maptools.org>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='LibTIFF Software' PACKAGE_TARNAME='tiff' -PACKAGE_VERSION='4.2.0' -PACKAGE_STRING='LibTIFF Software 4.2.0' +PACKAGE_VERSION='4.3.0' +PACKAGE_STRING='LibTIFF Software 4.3.0' PACKAGE_BUGREPORT='tiff@lists.maptools.org' PACKAGE_URL='' @@ -662,6 +662,8 @@ HAVE_ZSTD_FALSE HAVE_ZSTD_TRUE HAVE_LZMA_FALSE HAVE_LZMA_TRUE +HAVE_LERC_FALSE +HAVE_LERC_TRUE HAVE_JBIG_FALSE HAVE_JBIG_TRUE HAVE_JPEG_FALSE @@ -785,6 +787,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -844,6 +847,9 @@ enable_old_jpeg enable_jbig with_jbig_include_dir with_jbig_lib_dir +enable_lerc +with_lerc_include_dir +with_lerc_lib_dir enable_lzma with_lzma_include_dir with_lzma_lib_dir @@ -919,6 +925,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1171,6 +1178,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1308,7 +1324,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1421,7 +1437,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures LibTIFF Software 4.2.0 to adapt to many kinds of systems. +\`configure' configures LibTIFF Software 4.3.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1461,6 +1477,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1495,7 +1512,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LibTIFF Software 4.2.0:";; + short | recursive ) echo "Configuration of LibTIFF Software 4.3.0:";; esac cat <<\_ACEOF @@ -1542,6 +1559,8 @@ Optional Features: enabled by default) --disable-jbig disable JBIG-KIT usage (required for ISO JBIG compression, enabled by default) + --disable-lerc disable liblerc usage (required for lerc + compression, enabled by default) --disable-lzma disable liblzma usage (required for LZMA2 compression, enabled by default) --disable-zstd disable libzstd usage (required for zstd @@ -1556,7 +1575,7 @@ Optional Features: --disable-strip-chopping disable support for strip chopping (whether or not to convert single-strip uncompressed images to - mutiple strips of specified size to reduce memory + multiple strips of specified size to reduce memory usage) --enable-defer-strile-load enable deferred strip/tile offset/size loading (also @@ -1598,6 +1617,9 @@ Optional Packages: --with-jbig-include-dir=DIR location of JBIG-KIT headers --with-jbig-lib-dir=DIR location of JBIG-KIT library binary + --with-lerc-include-dir=DIR + location of liblerc headers + --with-lerc-lib-dir=DIR location of liblerc library binary --with-lzma-include-dir=DIR location of liblzma headers --with-lzma-lib-dir=DIR location of liblzma library binary @@ -1698,7 +1720,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LibTIFF Software configure 4.2.0 +LibTIFF Software configure 4.3.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2471,7 +2493,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LibTIFF Software $as_me 4.2.0, which was +It was created by LibTIFF Software $as_me 4.3.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3414,7 +3436,7 @@ fi # Define the identity of the package. PACKAGE='tiff' - VERSION='4.2.0' + VERSION='4.3.0' cat >>confdefs.h <<_ACEOF @@ -3648,15 +3670,15 @@ fi LIBTIFF_MAJOR_VERSION=4 -LIBTIFF_MINOR_VERSION=2 +LIBTIFF_MINOR_VERSION=3 LIBTIFF_MICRO_VERSION=0 LIBTIFF_ALPHA_VERSION= LIBTIFF_VERSION=$LIBTIFF_MAJOR_VERSION.$LIBTIFF_MINOR_VERSION.$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION LIBTIFF_RELEASE_DATE=`date +"%Y%m%d"` -LIBTIFF_CURRENT=11 +LIBTIFF_CURRENT=12 LIBTIFF_REVISION=0 -LIBTIFF_AGE=6 +LIBTIFF_AGE=7 LIBTIFF_VERSION_INFO=$LIBTIFF_CURRENT:$LIBTIFF_REVISION:$LIBTIFF_AGE # This is a special hack for OpenBSD and MirOS systems. The dynamic linker @@ -3680,6 +3702,69 @@ LIBTIFF_VERSION_INFO=$LIBTIFF_CURRENT:$LIBTIFF_REVISION:$LIBTIFF_AGE +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' +am__doit: + @echo this is the am__doit target >confinc.out +.PHONY: am__doit +END +am__include="#" +am__quote= +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : + ;; +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; +fi + +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4527,69 +4612,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -DEPDIR="${am__leading_dot}deps" - -ac_config_commands="$ac_config_commands depfiles" - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 -$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } -cat > confinc.mk << 'END' -am__doit: - @echo this is the am__doit target >confinc.out -.PHONY: am__doit -END -am__include="#" -am__quote= -# BSD make does it like this. -echo '.include "confinc.mk" # ignored' > confmf.BSD -# Other make implementations (GNU, Solaris 10, AIX) do it like this. -echo 'include confinc.mk # ignored' > confmf.GNU -_am_result=no -for s in GNU BSD; do - { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 - (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - case $?:`cat confinc.out 2>/dev/null` in #( - '0:this is the am__doit target') : - case $s in #( - BSD) : - am__include='.include' am__quote='"' ;; #( - *) : - am__include='include' am__quote='' ;; -esac ;; #( - *) : - ;; -esac - if test "$am__include" != "#"; then - _am_result="yes ($s style)" - break - fi -done -rm -f confinc.* confmf.* -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 -$as_echo "${_am_result}" >&6; } - -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : - enableval=$enable_dependency_tracking; -fi - -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - - depcc="$CC" am_compiler_list= @@ -4719,6 +4741,183 @@ else fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 +$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } +if ${ac_cv_prog_cc_c99+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stdarg.h> +#include <stdbool.h> +#include <stdlib.h> +#include <wchar.h> +#include <stdio.h> + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +#define debug(...) fprintf (stderr, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + your preprocessor is broken; +#endif +#if BIG_OK +#else + your preprocessor is broken; +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static void +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str; + int number; + float fnumber; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg (args_copy, const char *); + break; + case 'd': // int + number = va_arg (args_copy, int); + break; + case 'f': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); +} + +int +main () +{ + + // Check bool. + _Bool success = false; + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + test_varargs ("s, d' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' + || dynamic_array[ni.number - 1] != 543); + + ; + return 0; +} +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c99" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c99" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c99" != xno; then : + +fi + + @@ -6165,7 +6364,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -6524,7 +6723,7 @@ esac fi : ${AR=ar} -: ${AR_FLAGS=cru} +: ${AR_FLAGS=cr} @@ -7025,11 +7224,8 @@ _LT_EOF test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 - (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s "$nlist"; then + $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5 + if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -8248,8 +8444,8 @@ int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 + echo "$AR cr libconftest.a conftest.o" >&5 + $AR cr libconftest.a conftest.o 2>&5 echo "$RANLIB libconftest.a" >&5 $RANLIB libconftest.a 2>&5 cat > conftest.c << _LT_EOF @@ -9676,6 +9872,12 @@ lt_prog_compiler_static= lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; + # flang / f18. f95 an alias for gfortran or flang on Debian + flang* | f18* | f95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -10152,6 +10354,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie openbsd* | bitrig*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -10406,7 +10611,7 @@ _LT_EOF fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -11076,6 +11281,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } if test yes = "$lt_cv_irix_exported_symbol"; then archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi + link_all_deplibs=no else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' @@ -11097,7 +11303,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -12212,6 +12418,18 @@ fi dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -14020,7 +14238,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else GXX=no @@ -14512,7 +14730,7 @@ fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -14577,7 +14795,7 @@ fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -14916,7 +15134,7 @@ fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # FIXME: insert proper C++ library support @@ -15000,7 +15218,7 @@ fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. @@ -15011,7 +15229,7 @@ fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' fi hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir' @@ -15524,7 +15742,7 @@ lt_prog_compiler_static_CXX= ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -15899,6 +16117,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs_CXX=no + ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -16592,6 +16813,18 @@ fi dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -17113,48 +17346,6 @@ $as_echo "#define const /**/" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if ${ac_cv_c_inline+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_inline=$ac_kw -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_inline" != no && break -done - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } - -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } if ${ac_cv_c_bigendian+:} false; then : @@ -17554,254 +17745,8 @@ _ACEOF -# Obtain size of an 'signed int' and define as SIZEOF_SIGNED_INT -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of signed int" >&5 -$as_echo_n "checking size of signed int... " >&6; } -if ${ac_cv_sizeof_signed_int+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (signed int))" "ac_cv_sizeof_signed_int" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_signed_int" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (signed int) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_signed_int=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_signed_int" >&5 -$as_echo "$ac_cv_sizeof_signed_int" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_SIGNED_INT $ac_cv_sizeof_signed_int -_ACEOF - - - -# Obtain size of an 'unsigned int' and define as SIZEOF_UNSIGNED_INT -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned int" >&5 -$as_echo_n "checking size of unsigned int... " >&6; } -if ${ac_cv_sizeof_unsigned_int+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned int))" "ac_cv_sizeof_unsigned_int" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_unsigned_int" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (unsigned int) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_unsigned_int=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_int" >&5 -$as_echo "$ac_cv_sizeof_unsigned_int" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int -_ACEOF - - - -# Obtain size of a 'signed long' and define as SIZEOF_SIGNED_LONG -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of signed long" >&5 -$as_echo_n "checking size of signed long... " >&6; } -if ${ac_cv_sizeof_signed_long+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (signed long))" "ac_cv_sizeof_signed_long" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_signed_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (signed long) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_signed_long=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_signed_long" >&5 -$as_echo "$ac_cv_sizeof_signed_long" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_SIGNED_LONG $ac_cv_sizeof_signed_long -_ACEOF - - - -# Obtain size of a 'unsigned long' and define as SIZEOF_UNSIGNED_LONG -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long" >&5 -$as_echo_n "checking size of unsigned long... " >&6; } -if ${ac_cv_sizeof_unsigned_long+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long))" "ac_cv_sizeof_unsigned_long" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_unsigned_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (unsigned long) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_unsigned_long=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long" >&5 -$as_echo "$ac_cv_sizeof_unsigned_long" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long -_ACEOF - - - -# Obtain size of a 'long long' and define as SIZEOF_SIGNED_LONG_LONG. -# If 'long long' is not supported then the value defined is zero. -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of signed long long" >&5 -$as_echo_n "checking size of signed long long... " >&6; } -if ${ac_cv_sizeof_signed_long_long+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (signed long long))" "ac_cv_sizeof_signed_long_long" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_signed_long_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (signed long long) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_signed_long_long=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_signed_long_long" >&5 -$as_echo "$ac_cv_sizeof_signed_long_long" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_SIGNED_LONG_LONG $ac_cv_sizeof_signed_long_long -_ACEOF - - - -# Obtain size of a 'unsigned long long' and define as -# SIZEOF_UNSIGNED_LONG_LONG. If 'unsigned long long' is not -# supported then the value defined is zero. -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long long" >&5 -$as_echo_n "checking size of unsigned long long... " >&6; } -if ${ac_cv_sizeof_unsigned_long_long+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long long))" "ac_cv_sizeof_unsigned_long_long" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_unsigned_long_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (unsigned long long) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_unsigned_long_long=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long_long" >&5 -$as_echo "$ac_cv_sizeof_unsigned_long_long" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_UNSIGNED_LONG_LONG $ac_cv_sizeof_unsigned_long_long -_ACEOF - - - -# Obtain the size of an 'unsigned char *' and define as -# SIZEOF_UNSIGNED_CHAR_P. Result is available in -# ac_cv_sizeof_unsigned_char_p. -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned char *" >&5 -$as_echo_n "checking size of unsigned char *... " >&6; } -if ${ac_cv_sizeof_unsigned_char_p+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned char *))" "ac_cv_sizeof_unsigned_char_p" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_unsigned_char_p" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (unsigned char *) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_unsigned_char_p=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_char_p" >&5 -$as_echo "$ac_cv_sizeof_unsigned_char_p" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_UNSIGNED_CHAR_P $ac_cv_sizeof_unsigned_char_p -_ACEOF - +# Disable deprecated features to ensure clean build +CPPFLAGS="-DTIFF_DISABLE_DEPRECATED $CPPFLAGS" # Obtain the size of 'size_t' and define as SIZEOF_SIZE_T. Result is @@ -17840,241 +17785,34 @@ _ACEOF -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for signed 8-bit type" >&5 -$as_echo_n "checking for signed 8-bit type... " >&6; } -INT8_T='signed char' -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INT8_T" >&5 -$as_echo "$INT8_T" >&6; } - -cat >>confdefs.h <<_ACEOF -#define TIFF_INT8_T $INT8_T -_ACEOF - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned 8-bit type" >&5 -$as_echo_n "checking for unsigned 8-bit type... " >&6; } -UINT8_T='unsigned char' -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINT8_T" >&5 -$as_echo "$UINT8_T" >&6; } - -cat >>confdefs.h <<_ACEOF -#define TIFF_UINT8_T $UINT8_T -_ACEOF - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for signed 16-bit type" >&5 -$as_echo_n "checking for signed 16-bit type... " >&6; } -INT16_T='signed short' -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INT16_T" >&5 -$as_echo "$INT16_T" >&6; } - -cat >>confdefs.h <<_ACEOF -#define TIFF_INT16_T $INT16_T -_ACEOF - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned 16-bit type" >&5 -$as_echo_n "checking for unsigned 16-bit type... " >&6; } -UINT16_T='unsigned short' -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINT16_T" >&5 -$as_echo "$UINT16_T" >&6; } - -cat >>confdefs.h <<_ACEOF -#define TIFF_UINT16_T $UINT16_T -_ACEOF - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for signed 32-bit type" >&5 -$as_echo_n "checking for signed 32-bit type... " >&6; } -INT32_T='none' -INT32_FORMAT='none' -if test $ac_cv_sizeof_signed_int -eq 4 -then - INT32_T='signed int' - INT32_FORMAT='"%d"' -elif test $ac_cv_sizeof_signed_long -eq 4 -then - INT32_T='signed long' - INT32_FORMAT='"%ld"' -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INT32_T" >&5 -$as_echo "$INT32_T" >&6; } - -cat >>confdefs.h <<_ACEOF -#define TIFF_INT32_T $INT32_T -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define TIFF_INT32_FORMAT $INT32_FORMAT -_ACEOF - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned 32-bit type" >&5 -$as_echo_n "checking for unsigned 32-bit type... " >&6; } -UINT32_T='none' -UINT32_FORMAT='none' -if test $ac_cv_sizeof_unsigned_int -eq 4 -then - UINT32_T='unsigned int' - UINT32_FORMAT='"%u"' -elif test $ac_cv_sizeof_unsigned_long -eq 4 -then - UINT32_T='unsigned long' - UINT32_FORMAT='"%lu"' -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINT32_T" >&5 -$as_echo "$UINT32_T" >&6; } - -cat >>confdefs.h <<_ACEOF -#define TIFF_UINT32_T $UINT32_T -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define TIFF_UINT32_FORMAT $UINT32_FORMAT -_ACEOF - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for signed 64-bit type" >&5 -$as_echo_n "checking for signed 64-bit type... " >&6; } -INT64_T='none' -INT64_FORMAT='none' -if test $ac_cv_sizeof_signed_long -eq 8 -then - INT64_T='signed long' - INT64_FORMAT='"%ld"' -elif test $ac_cv_sizeof_signed_long_long -eq 8 -then - INT64_T='signed long long' - case "${host_os}" in - mingw32*) - # MinGW32 understands 'long long', but uses printf from WIN32 CRT - INT64_FORMAT='"%I64d"' - ;; - *) - INT64_FORMAT='"%lld"' - ;; - esac -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INT64_T" >&5 -$as_echo "$INT64_T" >&6; } - -cat >>confdefs.h <<_ACEOF -#define TIFF_INT64_T $INT64_T -_ACEOF +# C99 fixed-size integer types +INT8_T='int8_t' +UINT8_T='uint8_t' +INT16_T='int16_t' +UINT16_T='uint16_t' -cat >>confdefs.h <<_ACEOF -#define TIFF_INT64_FORMAT $INT64_FORMAT -_ACEOF +INT32_T='int32_t' +UINT32_T='uint32_t' +INT64_T='int64_t' +UINT64_T='uint64_t' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned 64-bit type" >&5 -$as_echo_n "checking for unsigned 64-bit type... " >&6; } -UINT64_T='none' -UINT64_FORMAT='none' -if test $ac_cv_sizeof_unsigned_long -eq 8 +if test $ac_cv_sizeof_size_t -eq 4 then - UINT64_T='unsigned long' - UINT64_FORMAT='"%lu"' -elif test $ac_cv_sizeof_unsigned_long_long -eq 8 + SSIZE_T='int32_t' +elif test $ac_cv_sizeof_size_t -eq 8 then - UINT64_T='unsigned long long' - case "${host_os}" in - mingw32*) - # MinGW32 understands 'unsigned long long', but uses printf from WIN32 CRT - UINT64_FORMAT='"%I64u"' - ;; - *) - UINT64_FORMAT='"%llu"' - ;; - esac -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINT64_T" >&5 -$as_echo "$UINT64_T" >&6; } - -cat >>confdefs.h <<_ACEOF -#define TIFF_UINT64_T $UINT64_T -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define TIFF_UINT64_FORMAT $UINT64_FORMAT -_ACEOF - - -# Determine formatting specifier for 'size_t'. While the size should -# be precise, the type determined may not match the system definition. -# A named type is provided to allow casting to the type we determined -# without changing the actual size. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 'size_t' format specifier" >&5 -$as_echo_n "checking for 'size_t' format specifier... " >&6; } -SIZE_T='unknown' -SIZE_FORMAT='unknown' -if test $ac_cv_sizeof_unsigned_int -eq $ac_cv_sizeof_size_t -then - SIZE_T='unsigned int' - SIZE_FORMAT='"%u"' -elif test $ac_cv_sizeof_unsigned_long -eq $ac_cv_sizeof_size_t -then - SIZE_T='unsigned long' - SIZE_FORMAT='"%lu"' -elif test $ac_cv_sizeof_unsigned_long_long -eq $ac_cv_sizeof_size_t -then - SIZE_T='unsigned long long' - case "${host_os}" in - mingw32*) - # MinGW32 understands 'unsigned long long', but uses printf from WIN32 CRT - SIZE_FORMAT='"%I64u"' - ;; - *) - SIZE_FORMAT='"%llu"' - ;; - esac + SSIZE_T='int64_t' +else + as_fn_error $? "Unsupported size_t size ${ac_cv_sizeof_size_t}; please add support" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SIZE_FORMAT" >&5 -$as_echo "$SIZE_FORMAT" >&6; } - -cat >>confdefs.h <<_ACEOF -#define TIFF_SIZE_T $SIZE_T -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define TIFF_SIZE_FORMAT $SIZE_FORMAT -_ACEOF # Determine TIFF equivalent of ssize_t { $as_echo "$as_me:${as_lineno-$LINENO}: checking for signed size type" >&5 $as_echo_n "checking for signed size type... " >&6; } -SSIZE_T='unknown' -SSIZE_FORMAT='unknown' -if test $ac_cv_sizeof_signed_int -eq $ac_cv_sizeof_size_t -then - SSIZE_T='signed int' - SSIZE_FORMAT='"%d"' -elif test $ac_cv_sizeof_signed_long -eq $ac_cv_sizeof_size_t -then - SSIZE_T='signed long' - SSIZE_FORMAT='"%ld"' -elif test $ac_cv_sizeof_signed_long_long -eq $ac_cv_sizeof_size_t -then - SSIZE_T='signed long long' - case "${host_os}" in - mingw32*) - # MinGW32 understands 'long long', but uses printf from WIN32 CRT - SSIZE_FORMAT='"%I64d"' - ;; - *) - SSIZE_FORMAT='"%lld"' - ;; - esac -fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SSIZE_T" >&5 $as_echo "$SSIZE_T" >&6; } @@ -18083,42 +17821,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF -cat >>confdefs.h <<_ACEOF -#define TIFF_SSIZE_FORMAT $SSIZE_FORMAT -_ACEOF - - -# Determine the type to use for the difference between two pointers. -# We will default to the POSIX ptrdiff_t if it is available, but will -# be prepared for the case when it is not. -PTRDIFF_T='unknown' -PTRDIFF_FORMAT='"%ld"' -ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default" -if test "x$ac_cv_type_ptrdiff_t" = xyes; then : - PTRDIFF_T=ptrdiff_t -fi - -if test $PTRDIFF_T = unknown -then - PTRDIFF_T=$SSIZE_T - PTRDIFF_FORMAT=$SSIZE_FORMAT -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pointer difference type" >&5 -$as_echo_n "checking for pointer difference type... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTRDIFF_T" >&5 -$as_echo "$PTRDIFF_T" >&6; } - -cat >>confdefs.h <<_ACEOF -#define TIFF_PTRDIFF_T $PTRDIFF_T -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define TIFF_PTRDIFF_FORMAT $PTRDIFF_FORMAT -_ACEOF - - -for ac_func in mmap setmode snprintf +for ac_func in mmap setmode do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -18145,104 +17848,6 @@ esac fi -ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf" -if test "x$ac_cv_func_snprintf" = xyes; then : - $as_echo "#define HAVE_SNPRINTF 1" >>confdefs.h - -else - case " $LIBOBJS " in - *" snprintf.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS snprintf.$ac_objext" - ;; -esac - -fi - - -ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" -if test "x$ac_cv_func_strcasecmp" = xyes; then : - $as_echo "#define HAVE_STRCASECMP 1" >>confdefs.h - -else - case " $LIBOBJS " in - *" strcasecmp.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext" - ;; -esac - -fi - - -ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol" -if test "x$ac_cv_func_strtol" = xyes; then : - $as_echo "#define HAVE_STRTOL 1" >>confdefs.h - -else - case " $LIBOBJS " in - *" strtol.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strtol.$ac_objext" - ;; -esac - -fi - - -ac_fn_c_check_func "$LINENO" "strtoll" "ac_cv_func_strtoll" -if test "x$ac_cv_func_strtoll" = xyes; then : - $as_echo "#define HAVE_STRTOLL 1" >>confdefs.h - -else - case " $LIBOBJS " in - *" strtoll.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strtoll.$ac_objext" - ;; -esac - -fi - - -ac_fn_c_check_func "$LINENO" "strtoul" "ac_cv_func_strtoul" -if test "x$ac_cv_func_strtoul" = xyes; then : - $as_echo "#define HAVE_STRTOUL 1" >>confdefs.h - -else - case " $LIBOBJS " in - *" strtoul.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strtoul.$ac_objext" - ;; -esac - -fi - - -ac_fn_c_check_func "$LINENO" "strtoull" "ac_cv_func_strtoull" -if test "x$ac_cv_func_strtoull" = xyes; then : - $as_echo "#define HAVE_STRTOULL 1" >>confdefs.h - -else - case " $LIBOBJS " in - *" strtoull.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strtoull.$ac_objext" - ;; -esac - -fi - - -ac_fn_c_check_func "$LINENO" "lfind" "ac_cv_func_lfind" -if test "x$ac_cv_func_lfind" = xyes; then : - $as_echo "#define HAVE_LFIND 1" >>confdefs.h - -else - case " $LIBOBJS " in - *" lfind.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS lfind.$ac_objext" - ;; -esac - -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking native cpu bit order" >&5 $as_echo_n "checking native cpu bit order... " >&6; } @@ -18328,7 +17933,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -18374,7 +17979,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -18398,7 +18003,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -18443,7 +18048,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -18467,7 +18072,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -18520,6 +18125,8 @@ fi + + # Check whether --enable-ccitt was given. if test "${enable_ccitt+set}" = set; then : enableval=$enable_ccitt; HAVE_CCITT=$enableval @@ -19123,6 +18730,172 @@ fi +HAVE_LERC=no + +# Check whether --enable-lerc was given. +if test "${enable_lerc+set}" = set; then : + enableval=$enable_lerc; +fi + + +# Check whether --with-lerc-include-dir was given. +if test "${with_lerc_include_dir+set}" = set; then : + withval=$with_lerc_include_dir; +fi + + +# Check whether --with-lerc-lib-dir was given. +if test "${with_lerc_lib_dir+set}" = set; then : + withval=$with_lerc_lib_dir; +fi + + +if test "x$enable_lerc" != "xno" ; then + + if test "x$with_lerc_lib_dir" != "x" ; then + LDFLAGS="-L$with_lerc_lib_dir $LDFLAGS" + fi + + lerc_lib_name="LercLib" + as_ac_Lib=`$as_echo "ac_cv_lib_"$lerc_lib_name"''_lerc_decode" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lerc_decode in -l\"$lerc_lib_name\"" >&5 +$as_echo_n "checking for lerc_decode in -l\"$lerc_lib_name\"... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l"$lerc_lib_name" $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char lerc_decode (); +int +main () +{ +return lerc_decode (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + lerc_lib=yes +else + lerc_lib=no +fi + + if test "$lerc_lib" = "no" ; then + lerc_lib_name="Lerc" + as_ac_Lib=`$as_echo "ac_cv_lib_"$lerc_lib_name"''_lerc_decode" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lerc_decode in -l\"$lerc_lib_name\"" >&5 +$as_echo_n "checking for lerc_decode in -l\"$lerc_lib_name\"... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l"$lerc_lib_name" $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char lerc_decode (); +int +main () +{ +return lerc_decode (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + lerc_lib=yes +else + lerc_lib=no +fi + + fi + if test "$lerc_lib" = "no" -a "x$with_lerc_lib_dir" != "x"; then + as_fn_error $? "lerc library not found at $with_lerc_lib_dir" "$LINENO" 5 + fi + + if test "x$with_lerc_include_dir" != "x" ; then + CPPFLAGS="-I$with_lerc_include_dir $CPPFLAGS" + fi + ac_fn_c_check_header_mongrel "$LINENO" "Lerc_c_api.h" "ac_cv_header_Lerc_c_api_h" "$ac_includes_default" +if test "x$ac_cv_header_Lerc_c_api_h" = xyes; then : + lerc_c_api_h=yes +else + lerc_c_api_h=no +fi + + + if test "$lerc_c_api_h" = "no" -a "x$with_lerc_include_dir" != "x" ; then + as_fn_error $? "Liblerc headers not found at $with_lerc_include_dir" "$LINENO" 5 + fi + + if test "$lerc_lib" = "yes" -a "$lerc_c_api_h" = "yes" ; then + HAVE_LERC=yes + fi + +fi + +if test "$HAVE_LERC" = "yes" ; then + +$as_echo "#define LERC_SUPPORT 1" >>confdefs.h + + LIBS="-l${lerc_lib_name} $LIBS" + tiff_libs_private="-l${lerc_lib_name} ${tiff_libs_private}" + + if test "$HAVE_RPATH" = "yes" -a "x$with_lerc_lib_dir" != "x" ; then + LIBDIR="-R $with_lerc_lib_dir $LIBDIR" + fi + +fi + + if test "$HAVE_LERC" = 'yes'; then + HAVE_LERC_TRUE= + HAVE_LERC_FALSE='#' +else + HAVE_LERC_TRUE='#' + HAVE_LERC_FALSE= +fi + + + HAVE_LZMA=no # Check whether --enable-lzma was given. @@ -21243,7 +21016,7 @@ fi -ac_config_headers="$ac_config_headers libtiff/tif_config.h libtiff/tiffconf.h" +ac_config_headers="$ac_config_headers config.h libtiff/tif_config.h libtiff/tiffconf.h port/libport_config.h" ac_config_files="$ac_config_files Makefile build/Makefile contrib/Makefile contrib/addtiffo/Makefile contrib/dbs/Makefile contrib/dbs/xtiff/Makefile contrib/iptcutil/Makefile contrib/mfs/Makefile contrib/pds/Makefile contrib/ras/Makefile contrib/stream/Makefile contrib/tags/Makefile contrib/win_dib/Makefile html/Makefile html/images/Makefile html/man/Makefile libtiff-4.pc libtiff/Makefile man/Makefile port/Makefile test/Makefile tools/Makefile" @@ -21406,6 +21179,10 @@ if test -z "${HAVE_JBIG_TRUE}" && test -z "${HAVE_JBIG_FALSE}"; then as_fn_error $? "conditional \"HAVE_JBIG\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_LERC_TRUE}" && test -z "${HAVE_LERC_FALSE}"; then + as_fn_error $? "conditional \"HAVE_LERC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_LZMA_TRUE}" && test -z "${HAVE_LZMA_FALSE}"; then as_fn_error $? "conditional \"HAVE_LZMA\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21827,7 +21604,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LibTIFF Software $as_me 4.2.0, which was +This file was extended by LibTIFF Software $as_me 4.3.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21893,7 +21670,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -LibTIFF Software config.status 4.2.0 +LibTIFF Software config.status 4.3.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -22407,8 +22184,10 @@ do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "libtiff/tif_config.h") CONFIG_HEADERS="$CONFIG_HEADERS libtiff/tif_config.h" ;; "libtiff/tiffconf.h") CONFIG_HEADERS="$CONFIG_HEADERS libtiff/tiffconf.h" ;; + "port/libport_config.h") CONFIG_HEADERS="$CONFIG_HEADERS port/libport_config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "build/Makefile") CONFIG_FILES="$CONFIG_FILES build/Makefile" ;; "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;; @@ -23108,9 +22887,7 @@ $as_echo X/"$am_mf" | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. If GNU make was not used, consider - re-running the configure script with MAKE=\"gmake\" (or whatever is - necessary). You can also try re-running configure with the + for automatic dependency tracking. Try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } @@ -23137,7 +22914,6 @@ See \`config.log' for more details" "$LINENO" 5; } cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. @@ -23885,7 +23661,7 @@ echo " C++ compiler: ${CXX} ${CXXFLAGS}" echo " Enable runtime linker paths: ${HAVE_RPATH}" echo " Enable linker symbol versioning: ${have_ld_version_script}" echo " Support Microsoft Document Imaging: ${HAVE_MDI}" -echo " Use win32 IO: ${win32_io_ok}" +echo " Use Win32 IO: ${win32_io_ok}" echo "" echo " Support for internal codecs:" echo " CCITT Group 3 & 4 algorithms: ${HAVE_CCITT}" @@ -23903,6 +23679,7 @@ echo " JPEG support: ${HAVE_JPEG}" echo " Old JPEG support: ${HAVE_OJPEG}" echo " JPEG 8/12 bit dual mode: ${HAVE_JPEG12}" echo " ISO JBIG support: ${HAVE_JBIG}" +echo " LERC support: ${HAVE_LERC}" echo " LZMA2 support: ${HAVE_LZMA}" echo " ZSTD support: ${HAVE_ZSTD}" echo " WEBP support: ${HAVE_WEBP}" |