From c7c6dee54929ed35ff4b92bb9b5e52bd17b0cef5 Mon Sep 17 00:00:00 2001 From: Andrey Kiselev Date: Fri, 16 Apr 2004 08:12:54 +0000 Subject: [PATCH] *** empty log message *** --- configure | 351 ++++++++++++++++++++++++++++++++------------ configure.ac | 86 ++++++++++- libtiff/config.h.in | 3 + libtiff/tiffcomp.h | 11 +- libtiff/tiffconf.h | 54 +------ nmake.opt | 86 ++++++++++- 6 files changed, 431 insertions(+), 160 deletions(-) diff --git a/configure b/configure index 0163b9c2..7543ae4b 100755 --- a/configure +++ b/configure @@ -465,7 +465,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot LIBTIFF_MAJOR_VERSION LIBTIFF_MINOR_VERSION LIBTIFF_MICRO_VERSION LIBTIFF_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE OPENGL_LIBS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot LIBTIFF_MAJOR_VERSION LIBTIFF_MINOR_VERSION LIBTIFF_MICRO_VERSION LIBTIFF_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE OPENGL_LIBS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1015,6 +1015,7 @@ Program names: System types: --build=BUILD configure for building on BUILD [guessed] --host=HOST cross-compile to build programs to run on HOST [BUILD] + --target=TARGET configure for building compilers for TARGET [HOST] _ACEOF fi @@ -1037,8 +1038,17 @@ Optional Features: --enable-dependency-tracking do not reject slow dependency extractors --disable-libtool-lock avoid locking (might break parallel builds) --disable-largefile omit support for large files + --disable-ccitt disable support for CCITT Group 3 & 4 algorithms + --disable-packbits disable support for Macintosh PackBits algorithm + --disable-lzw disable support for LZW algorithm + --disable-thunder disable support for ThunderScan 4-bit RLE algorithm + --disable-next disable support for NeXT 2-bit RLE algorithm + --disable-logluv disable support for LogLuv high dynamic range + encoding --disable-zlib disable Zlib usage (required for Deflate compression, enabled by default) + --disable-pixarlog disable support for Pixar log-format algorithm + (requires Zlib) --disable-jpeg disable IJG JPEG library usage (required for JPEG compression, enabled by default) --enable-old-jpeg enable support for Old JPEG compresson (read @@ -1531,7 +1541,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version="1.8" + ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -1557,6 +1567,90 @@ ac_config_guess="$SHELL $ac_aux_dir/config.guess" ac_config_sub="$SHELL $ac_aux_dir/config.sub" ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. +# Make sure we can run config.sub. +$ac_config_sub sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 +echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6 +if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_build_alias=$build_alias +test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` +test -z "$ac_cv_build_alias" && + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6 +build=$ac_cv_build +build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + +echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6 +if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_host_alias=$host_alias +test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias +ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6 +host=$ac_cv_host +host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + +echo "$as_me:$LINENO: checking target system type" >&5 +echo $ECHO_N "checking target system type... $ECHO_C" >&6 +if test "${ac_cv_target+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_target_alias=$target_alias +test "x$ac_cv_target_alias" = "x" && + ac_cv_target_alias=$ac_cv_host_alias +ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:$LINENO: result: $ac_cv_target" >&5 +echo "${ECHO_T}$ac_cv_target" >&6 +target=$ac_cv_target +target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + +# The aliases save the names the user supplied, while $host etc. +# will get canonicalized. +test -n "$target_alias" && + test "$program_prefix$program_suffix$program_transform_name" = \ + NONENONEs,x,x, && + program_prefix=${target_alias}- + +am__api_version="1.8" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -2042,60 +2136,6 @@ else enable_fast_install=yes fi; -# Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} - { (exit 1); exit 1; }; } - -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 -build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 -host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -3662,7 +3702,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3665 "configure"' > conftest.$ac_ext + echo '#line 3705 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5221,7 +5261,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5224:" \ +echo "$as_me:5264:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6253,11 +6293,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6256: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6296: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6260: \$? = $ac_status" >&5 + echo "$as_me:6300: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6486,11 +6526,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6489: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6529: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6493: \$? = $ac_status" >&5 + echo "$as_me:6533: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6546,11 +6586,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6549: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6589: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6553: \$? = $ac_status" >&5 + echo "$as_me:6593: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8721,7 +8761,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11039: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11003: \$? = $ac_status" >&5 + echo "$as_me:11043: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11056,11 +11096,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11059: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11099: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11063: \$? = $ac_status" >&5 + echo "$as_me:11103: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12410,7 +12450,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13378: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13342: \$? = $ac_status" >&5 + echo "$as_me:13382: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13395,11 +13435,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13398: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13438: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13402: \$? = $ac_status" >&5 + echo "$as_me:13442: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15427,11 +15467,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15430: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15470: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15434: \$? = $ac_status" >&5 + echo "$as_me:15474: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15660,11 +15700,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15663: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15703: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15667: \$? = $ac_status" >&5 + echo "$as_me:15707: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15720,11 +15760,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15723: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15763: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15727: \$? = $ac_status" >&5 + echo "$as_me:15767: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17895,7 +17935,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 @@ -22024,6 +22063,111 @@ rm -f conftest* fi +echo "$as_me:$LINENO: checking native cpu bit order" >&5 +echo $ECHO_N "checking native cpu bit order... $ECHO_C" >&6 +case "$target_cpu" in + i*86*) + HOST_FILLORDER=FILLODER_LSB2MSB + echo "$as_me:$LINENO: result: lsb2msb" >&5 +echo "${ECHO_T}lsb2msb" >&6 + ;; + *) + HOST_FILLORDER=FILLORDER_MSB2LSB + echo "$as_me:$LINENO: result: msb2lsb" >&5 +echo "${ECHO_T}msb2lsb" >&6 + ;; +esac + +cat >>confdefs.h <<_ACEOF +#define HOST_FILLORDER $HOST_FILLORDER +_ACEOF + + + +HAVE_CCITT=yes + +# Check whether --enable-ccitt or --disable-ccitt was given. +if test "${enable_ccitt+set}" = set; then + enableval="$enable_ccitt" + HAVE_CCITT=no +else + HAVE_CCITT=yes +fi; + +if test "$HAVE_CCITT" = "yes" ; then + CPPFLAGS="-DCCITT_SUPPORT $CPPFLAGS" +fi + +HAVE_PACKBITS=yes + +# Check whether --enable-packbits or --disable-packbits was given. +if test "${enable_packbits+set}" = set; then + enableval="$enable_packbits" + HAVE_PACKBITS=no +else + HAVE_PACKBITS=yes +fi; + +if test "$HAVE_PACKBITS" = "yes" ; then + CPPFLAGS="-DPACKBITS_SUPPORT $CPPFLAGS" +fi + +HAVE_LZW=yes + +# Check whether --enable-lzw or --disable-lzw was given. +if test "${enable_lzw+set}" = set; then + enableval="$enable_lzw" + HAVE_LZW=no +else + HAVE_LZW=yes +fi; + +if test "$HAVE_LZW" = "yes" ; then + CPPFLAGS="-DLZW_SUPPORT $CPPFLAGS" +fi + +HAVE_THUNDER=yes + +# Check whether --enable-thunder or --disable-thunder was given. +if test "${enable_thunder+set}" = set; then + enableval="$enable_thunder" + HAVE_THUNDER=no +else + HAVE_THUNDER=yes +fi; + +if test "$HAVE_THUNDER" = "yes" ; then + CPPFLAGS="-DTHUNDER_SUPPORT $CPPFLAGS" +fi + +HAVE_NEXT=yes + +# Check whether --enable-next or --disable-next was given. +if test "${enable_next+set}" = set; then + enableval="$enable_next" + HAVE_NEXT=no +else + HAVE_NEXT=yes +fi; + +if test "$HAVE_NEXT" = "yes" ; then + CPPFLAGS="-DNEXT_SUPPORT $CPPFLAGS" +fi + +HAVE_LOGLUV=yes + +# Check whether --enable-logluv or --disable-logluv was given. +if test "${enable_logluv+set}" = set; then + enableval="$enable_logluv" + HAVE_LOGLUV=no +else + HAVE_LOGLUV=yes +fi; + +if test "$HAVE_LOGLUV" = "yes" ; then + CPPFLAGS="-DLOGLUV_SUPPORT $CPPFLAGS" +fi + HAVE_ZLIB=no @@ -22289,6 +22433,21 @@ if test "$HAVE_ZLIB" = "yes" ; then fi +HAVE_PIXARLOG=no + +# Check whether --enable-pixarlog or --disable-pixarlog was given. +if test "${enable_pixarlog+set}" = set; then + enableval="$enable_pixarlog" + HAVE_PIXARLOG=no +else + HAVE_PIXARLOG=yes +fi; + +if test "$HAVE_ZLIB" = "yes" -a "$HAVE_PIXARLOG" = "yes" ; then + CPPFLAGS="-DPIXARLOG_SUPPORT $CPPFLAGS" +fi + + HAVE_JPEG=no # Check whether --enable-jpeg or --disable-jpeg was given. @@ -23753,6 +23912,18 @@ s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t s,@LIBS@,$LIBS,;t t +s,@build@,$build,;t t +s,@build_cpu@,$build_cpu,;t t +s,@build_vendor@,$build_vendor,;t t +s,@build_os@,$build_os,;t t +s,@host@,$host,;t t +s,@host_cpu@,$host_cpu,;t t +s,@host_vendor@,$host_vendor,;t t +s,@host_os@,$host_os,;t t +s,@target@,$target,;t t +s,@target_cpu@,$target_cpu,;t t +s,@target_vendor@,$target_vendor,;t t +s,@target_os@,$target_os,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t @@ -23777,14 +23948,6 @@ s,@LIBTIFF_MAJOR_VERSION@,$LIBTIFF_MAJOR_VERSION,;t t s,@LIBTIFF_MINOR_VERSION@,$LIBTIFF_MINOR_VERSION,;t t s,@LIBTIFF_MICRO_VERSION@,$LIBTIFF_MICRO_VERSION,;t t s,@LIBTIFF_VERSION@,$LIBTIFF_VERSION,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t diff --git a/configure.ac b/configure.ac index d83b28d7..6cfe1648 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,10 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) AC_INIT([LibTIFF Software], 3.7.0, [tiff@remotesensing.org], libtiff) + +dnl Compute the canonical target-system type variable +AC_CANONICAL_TARGET + AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR(libtiff/config.h.in) AM_CONFIG_HEADER(libtiff/config.h) @@ -74,7 +78,7 @@ AC_HEADER_TIME AC_STRUCT_TM dnl Checks for library functions. -AC_CHECK_FUNCS([floor gettimeofday isascii memmove memset munmap pow sqrt strcasecmp strchr strncasecmp strrchr strstr strtol strtoul]) +AC_CHECK_FUNCS([floor gettimeofday isascii memmove memset munmap pow sqrt strcasecmp strchr strncasecmp strrchr strstr strtol]) dnl Will use local replacements for unavailable functions AC_REPLACE_FUNCS(getopt) @@ -83,6 +87,74 @@ AC_REPLACE_FUNCS(strtoul) AC_SYS_LARGEFILE +dnl --------------------------------------------------------------------------- +dnl Check the native cpu bit order +dnl --------------------------------------------------------------------------- +AC_MSG_CHECKING([native cpu bit order]) +case "$target_cpu" in + i*86*) + HOST_FILLORDER=FILLODER_LSB2MSB + AC_MSG_RESULT([lsb2msb]) + ;; + *) + HOST_FILLORDER=FILLORDER_MSB2LSB + AC_MSG_RESULT([msb2lsb]) + ;; +esac +AC_DEFINE_UNQUOTED(HOST_FILLORDER, $HOST_FILLORDER, [Set the native cpu bit order]) + +dnl --------------------------------------------------------------------------- +dnl Switch on/off internal codecs. +dnl --------------------------------------------------------------------------- + +HAVE_CCITT=yes + +AC_ARG_ENABLE(ccitt, AS_HELP_STRING([--disable-ccitt], [disable support for CCITT Group 3 & 4 algorithms]), [HAVE_CCITT=no], [HAVE_CCITT=yes]) + +if test "$HAVE_CCITT" = "yes" ; then + CPPFLAGS="-DCCITT_SUPPORT $CPPFLAGS" +fi + +HAVE_PACKBITS=yes + +AC_ARG_ENABLE(packbits, AS_HELP_STRING([--disable-packbits], [disable support for Macintosh PackBits algorithm]), [HAVE_PACKBITS=no], [HAVE_PACKBITS=yes]) + +if test "$HAVE_PACKBITS" = "yes" ; then + CPPFLAGS="-DPACKBITS_SUPPORT $CPPFLAGS" +fi + +HAVE_LZW=yes + +AC_ARG_ENABLE(lzw, AS_HELP_STRING([--disable-lzw], [disable support for LZW algorithm]), [HAVE_LZW=no], [HAVE_LZW=yes]) + +if test "$HAVE_LZW" = "yes" ; then + CPPFLAGS="-DLZW_SUPPORT $CPPFLAGS" +fi + +HAVE_THUNDER=yes + +AC_ARG_ENABLE(thunder, AS_HELP_STRING([--disable-thunder], [disable support for ThunderScan 4-bit RLE algorithm]), [HAVE_THUNDER=no], [HAVE_THUNDER=yes]) + +if test "$HAVE_THUNDER" = "yes" ; then + CPPFLAGS="-DTHUNDER_SUPPORT $CPPFLAGS" +fi + +HAVE_NEXT=yes + +AC_ARG_ENABLE(next, AS_HELP_STRING([--disable-next], [disable support for NeXT 2-bit RLE algorithm]), [HAVE_NEXT=no], [HAVE_NEXT=yes]) + +if test "$HAVE_NEXT" = "yes" ; then + CPPFLAGS="-DNEXT_SUPPORT $CPPFLAGS" +fi + +HAVE_LOGLUV=yes + +AC_ARG_ENABLE(logluv, AS_HELP_STRING([--disable-logluv], [disable support for LogLuv high dynamic range encoding]), [HAVE_LOGLUV=no], [HAVE_LOGLUV=yes]) + +if test "$HAVE_LOGLUV" = "yes" ; then + CPPFLAGS="-DLOGLUV_SUPPORT $CPPFLAGS" +fi + dnl --------------------------------------------------------------------------- dnl Check for ZLIB. dnl --------------------------------------------------------------------------- @@ -122,6 +194,18 @@ if test "$HAVE_ZLIB" = "yes" ; then LIBS="-lz $LIBS" fi +dnl --------------------------------------------------------------------------- +dnl Check for Pixar log-format algorithm. +dnl --------------------------------------------------------------------------- + +HAVE_PIXARLOG=no + +AC_ARG_ENABLE(pixarlog, AS_HELP_STRING([--disable-pixarlog], [disable support for Pixar log-format algorithm (requires Zlib)]), [HAVE_PIXARLOG=no], [HAVE_PIXARLOG=yes]) + +if test "$HAVE_ZLIB" = "yes" -a "$HAVE_PIXARLOG" = "yes" ; then + CPPFLAGS="-DPIXARLOG_SUPPORT $CPPFLAGS" +fi + dnl --------------------------------------------------------------------------- dnl Check for JPEG. dnl --------------------------------------------------------------------------- diff --git a/libtiff/config.h.in b/libtiff/config.h.in index 6fde0483..97d51212 100644 --- a/libtiff/config.h.in +++ b/libtiff/config.h.in @@ -102,6 +102,9 @@ /* Define to 1 if the system has the type `_Bool'. */ #undef HAVE__BOOL +/* Set the native cpu bit order */ +#undef HOST_FILLORDER + /* Name of package */ #undef PACKAGE diff --git a/libtiff/tiffcomp.h b/libtiff/tiffcomp.h index 3b622bf8..93d74549 100644 --- a/libtiff/tiffcomp.h +++ b/libtiff/tiffcomp.h @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Attic/tiffcomp.h,v 1.6 2004-03-26 14:58:17 dron Exp $ */ +/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Attic/tiffcomp.h,v 1.7 2004-04-16 08:13:44 dron Exp $ */ /* * Copyright (c) 1990-1997 Sam Leffler @@ -193,13 +193,4 @@ extern int creat(const char *path, int mode); #endif /* __cplusplus */ #endif /* __acornriscos */ -/* Bit and byte order, the default is MSB to LSB */ -#ifdef VMS -#undef HOST_FILLORDER -#undef WORDS_BIGENDIAN -#define HOST_FILLORDER FILLORDER_LSB2MSB -#define WORDS_BIGENDIAN 0 -#endif - - #endif /* _COMPAT_ */ diff --git a/libtiff/tiffconf.h b/libtiff/tiffconf.h index d30dbda4..910df7e0 100644 --- a/libtiff/tiffconf.h +++ b/libtiff/tiffconf.h @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Attic/tiffconf.h,v 1.11 2004-03-30 10:18:13 dron Exp $ */ +/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Attic/tiffconf.h,v 1.12 2004-04-16 08:13:44 dron Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1991-1997 Silicon Graphics, Inc. @@ -41,59 +41,12 @@ * * HAVE_IEEEFP define as 0 or 1 according to the floating point * format suported by the machine - * BSDTYPES define this if your system does NOT define the - * usual 4BSD typedefs u_int et. al. * HAVE_MMAP enable support for memory mapping read-only files; * this is typically deduced by the configure script - * HOST_FILLORDER native cpu bit order: one of FILLORDER_MSB2LSB - * or FILLODER_LSB2MSB; this is typically set by the - * configure script */ #ifndef HAVE_IEEEFP #define HAVE_IEEEFP 1 #endif -#ifndef HOST_FILLORDER -#define HOST_FILLORDER FILLORDER_MSB2LSB -#endif - -#ifndef COMPRESSION_SUPPORT -/* - * Compression support defines: - * - * CCITT_SUPPORT enable support for CCITT Group 3 & 4 algorithms - * PACKBITS_SUPPORT enable support for Macintosh PackBits algorithm - * LZW_SUPPORT enable support for LZW algorithm - * THUNDER_SUPPORT enable support for ThunderScan 4-bit RLE algorithm - * NEXT_SUPPORT enable support for NeXT 2-bit RLE algorithm - * OJPEG_SUPPORT enable support for 6.0-style JPEG DCT algorithms - * (requires IJG software) - * JPEG_SUPPORT enable support for post-6.0-style JPEG DCT algorithms - * (requires freely available IJG software, see tif_jpeg.c) - * ZIP_SUPPORT enable support for Deflate algorithm - * (requires freely available zlib software, see tif_zip.c) - * PIXARLOG_SUPPORT enable support for Pixar log-format algorithm - * LOGLUV_SUPPORT enable support for LogLuv high dynamic range encoding - */ -#define CCITT_SUPPORT -#define PACKBITS_SUPPORT -#define LZW_SUPPORT -#define THUNDER_SUPPORT -#define NEXT_SUPPORT -#define LOGLUV_SUPPORT -#endif /* COMPRESSION_SUPPORT */ - -/* - * If JPEG compression is enabled then we must also include - * support for the colorimetry and YCbCr-related tags. - */ -#ifdef JPEG_SUPPORT -#ifndef YCBCR_SUPPORT -#define YCBCR_SUPPORT -#endif -#ifndef COLORIMETRY_SUPPORT -#define COLORIMETRY_SUPPORT -#endif -#endif /* JPEG_SUPPORT */ /* * ``Orthogonal Features'' @@ -101,7 +54,6 @@ * STRIPCHOP_DEFAULT default handling of strip chopping support (whether * or not to convert single-strip uncompressed images * to mutiple strips of ~8Kb--to reduce memory use) - * SUBIFD_SUPPORT enable support for SubIFD tag (thumbnails and such) * DEFAULT_EXTRASAMPLE_AS_ALPHA * The RGBA interface will treat a fourth sample with * no EXTRASAMPLE_ value as being ASSOCALPHA. Many @@ -116,9 +68,6 @@ #ifndef STRIPCHOP_DEFAULT #define STRIPCHOP_DEFAULT TIFF_STRIPCHOP /* default is to enable */ #endif -#ifndef SUBIFD_SUPPORT -#define SUBIFD_SUPPORT 1 /* enable SubIFD tag (330) support */ -#endif #ifndef DEFAULT_EXTRASAMPLE_AS_ALPHA #define DEFAULT_EXTRASAMPLE_AS_ALPHA 1 #endif @@ -131,6 +80,7 @@ * XXX: These macros are obsoleted. Don't use them in your apps! * Macros stays here for backward compatibility and should be always defined. */ +#define SUBIFD_SUPPORT #define COLORIMETRY_SUPPORT #define YCBCR_SUPPORT #define CMYK_SUPPORT diff --git a/nmake.opt b/nmake.opt index bd76a002..d1784eb1 100644 --- a/nmake.opt +++ b/nmake.opt @@ -1,3 +1,26 @@ +# $Id: nmake.opt,v 1.2 2004-04-16 08:12:54 dron Exp $ +# +# Copyright (C) 2004, Andrey Kiselev +# +# Permission to use, copy, modify, distribute, and sell this software and +# its documentation for any purpose is hereby granted without fee, provided +# that (i) the above copyright notices and this permission notice appear in +# all copies of the software and related documentation, and (ii) the names of +# Sam Leffler and Silicon Graphics may not be used in any advertising or +# publicity relating to the software without the specific, prior written +# permission of Sam Leffler and Silicon Graphics. +# +# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, +# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY +# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. +# +# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR +# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, +# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF +# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE +# OF THIS SOFTWARE. + # Compile time parameters for MS Visual C++ compiler. # You may edit this file to specify building options. @@ -8,6 +31,22 @@ WINMODE = -DTIF_PLATFORM_CONSOLE #WINMODE = -DTIF_PLATFORM_WINDOWED +# +# Comment out the following lines to disable internal codecs. +# +# Support for CCITT Group 3 & 4 algorithms +CCITT_SUPPORT = 1 +# Support for Macintosh PackBits algorithm +PACKBITS_SUPPORT = 1 +# Support for LZW algorithm +LZW_SUPPORT = 1 +# Support for ThunderScan 4-bit RLE algorithm +THUNDER_SUPPORT = 1 +# Support for NeXT 2-bit RLE algorithm +NEXT_SUPPORT = 1 +# Support for LogLuv high dynamic range encoding +LOGLUV_SUPPORT = 1 + # # Uncomment and edit following lines to enable JPEG support. # @@ -23,14 +62,20 @@ WINMODE = -DTIF_PLATFORM_CONSOLE # # Uncomment and edit following lines to enable ZIP support -# (required for Deflate compression) +# (required for Deflate compression and Pixar log-format) # #ZIP_SUPPORT = 1 #ZLIBDIR = d:/projects/zlib-1.2.1 #ZLIB_LIB = $(ZLIBDIR)/zlib.lib # -# There is nothing to edit below this line normally. +# Uncomment following line to enable Pixar log-format algorithm +# (Zlib required). +# +#PIXARLOG_SUPPORT = 1 + +# +########### There is nothing to edit below this line normally. ########### # MAKE = nmake /nologo @@ -40,12 +85,47 @@ CFLAGS = /W3 $(INCL) $(WINMODE) $(EXTRAFLAGS) EXTRAFLAGS = LIBS = +# Set the native cpu bit order +EXTRAFLAGS = $(EXTRAFLAGS) -DFILLODER_LSB2MSB + +# Codec stuff +!IFDEF CCITT_SUPPORT +EXTRAFLAGS = $(EXTRAFLAGS) -DCCITT_SUPPORT +!ENDIF + +!IFDEF PACKBITS_SUPPORT +EXTRAFLAGS = $(EXTRAFLAGS) -DPACKBITS_SUPPORT +!ENDIF + +!IFDEF LZW_SUPPORT +EXTRAFLAGS = $(EXTRAFLAGS) -DLZW_SUPPORT +!ENDIF + +!IFDEF THUNDER_SUPPORT +EXTRAFLAGS = $(EXTRAFLAGS) -DTHUNDER_SUPPORT +!ENDIF + +!IFDEF NEXT_SUPPORT +EXTRAFLAGS = $(EXTRAFLAGS) -DNEXT_SUPPORT +!ENDIF + +!IFDEF LOGLUV_SUPPORT +EXTRAFLAGS = $(EXTRAFLAGS) -DLOGLUV_SUPPORT +!ENDIF + !IFDEF JPEG_SUPPORT LIBS = $(LIBS) $(JPEG_LIB) EXTRAFLAGS = $(EXTRAFLAGS) -DJPEG_SUPPORT - !IFDEF OJPEG_SUPPORT EXTRAFLAGS = $(EXTRAFLAGS) -DOJPEG_SUPPORT !ENDIF !ENDIF +!IFDEF ZIP_SUPPORT +LIBS = $(LIBS) $(ZLIB_LIB) +EXTRAFLAGS = $(EXTRAFLAGS) -DZIP_SUPPORT +!IFDEF PIXARLOG_SUPPORT +EXTRAFLAGS = $(EXTRAFLAGS) -DPIXARLOG_SUPPORT +!ENDIF +!ENDIF +