[haiku-commits] r38701 - in haiku/vendor/libtiff/current: . build config contrib contrib/acorn ...
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 18 Sep 2010 13:50:52 +0200 (CEST)
Author: korli
Date: 2010-09-18 13:50:51 +0200 (Sat, 18 Sep 2010)
New Revision: 38701
Changeset: http://dev.haiku-os.org/changeset/38701
Modified:
haiku/vendor/libtiff/current/ChangeLog
haiku/vendor/libtiff/current/HOWTO-RELEASE
haiku/vendor/libtiff/current/Makefile.in
haiku/vendor/libtiff/current/RELEASE-DATE
haiku/vendor/libtiff/current/VERSION
haiku/vendor/libtiff/current/aclocal.m4
haiku/vendor/libtiff/current/autogen.sh
haiku/vendor/libtiff/current/build/Makefile.in
haiku/vendor/libtiff/current/config/ltmain.sh
haiku/vendor/libtiff/current/configure
haiku/vendor/libtiff/current/configure.ac
haiku/vendor/libtiff/current/contrib/Makefile.in
haiku/vendor/libtiff/current/contrib/acorn/Makefile.in
haiku/vendor/libtiff/current/contrib/addtiffo/Makefile.in
haiku/vendor/libtiff/current/contrib/addtiffo/addtiffo.c
haiku/vendor/libtiff/current/contrib/addtiffo/tif_overview.c
haiku/vendor/libtiff/current/contrib/addtiffo/tif_ovrcache.c
haiku/vendor/libtiff/current/contrib/addtiffo/tif_ovrcache.h
haiku/vendor/libtiff/current/contrib/dbs/Makefile.in
haiku/vendor/libtiff/current/contrib/dbs/tiff-bi.c
haiku/vendor/libtiff/current/contrib/dbs/tiff-grayscale.c
haiku/vendor/libtiff/current/contrib/dbs/tiff-palette.c
haiku/vendor/libtiff/current/contrib/dbs/tiff-rgb.c
haiku/vendor/libtiff/current/contrib/dbs/xtiff/Makefile.in
haiku/vendor/libtiff/current/contrib/dbs/xtiff/patchlevel.h
haiku/vendor/libtiff/current/contrib/dbs/xtiff/xtiff.c
haiku/vendor/libtiff/current/contrib/dbs/xtiff/xtifficon.h
haiku/vendor/libtiff/current/contrib/iptcutil/Makefile.in
haiku/vendor/libtiff/current/contrib/iptcutil/iptcutil.c
haiku/vendor/libtiff/current/contrib/mac-cw/Makefile.in
haiku/vendor/libtiff/current/contrib/mac-cw/mac_main.c
haiku/vendor/libtiff/current/contrib/mac-cw/mac_main.h
haiku/vendor/libtiff/current/contrib/mac-cw/mkg3_main.c
haiku/vendor/libtiff/current/contrib/mac-cw/version.h
haiku/vendor/libtiff/current/contrib/mac-mpw/Makefile.in
haiku/vendor/libtiff/current/contrib/mac-mpw/mactrans.c
haiku/vendor/libtiff/current/contrib/mfs/Makefile.in
haiku/vendor/libtiff/current/contrib/mfs/mfs_file.c
haiku/vendor/libtiff/current/contrib/pds/Makefile.in
haiku/vendor/libtiff/current/contrib/pds/tif_imageiter.c
haiku/vendor/libtiff/current/contrib/pds/tif_imageiter.h
haiku/vendor/libtiff/current/contrib/pds/tif_pdsdirread.c
haiku/vendor/libtiff/current/contrib/pds/tif_pdsdirwrite.c
haiku/vendor/libtiff/current/contrib/ras/Makefile.in
haiku/vendor/libtiff/current/contrib/ras/ras2tif.c
haiku/vendor/libtiff/current/contrib/ras/tif2ras.c
haiku/vendor/libtiff/current/contrib/stream/Makefile.in
haiku/vendor/libtiff/current/contrib/stream/tiffstream.cpp
haiku/vendor/libtiff/current/contrib/stream/tiffstream.h
haiku/vendor/libtiff/current/contrib/tags/Makefile.in
haiku/vendor/libtiff/current/contrib/tags/listtif.c
haiku/vendor/libtiff/current/contrib/tags/maketif.c
haiku/vendor/libtiff/current/contrib/tags/xtif_dir.c
haiku/vendor/libtiff/current/contrib/tags/xtiffio.h
haiku/vendor/libtiff/current/contrib/tags/xtiffiop.h
haiku/vendor/libtiff/current/contrib/win_dib/Makefile.in
haiku/vendor/libtiff/current/contrib/win_dib/Tiffile.cpp
haiku/vendor/libtiff/current/contrib/win_dib/tiff2dib.c
haiku/vendor/libtiff/current/html/Makefile.am
haiku/vendor/libtiff/current/html/Makefile.in
haiku/vendor/libtiff/current/html/images/Makefile.in
haiku/vendor/libtiff/current/html/index.html
haiku/vendor/libtiff/current/html/man/Makefile.in
haiku/vendor/libtiff/current/html/man/tiffcp.1.html
haiku/vendor/libtiff/current/html/v3.9.2.html
haiku/vendor/libtiff/current/libtiff/Makefile.in
haiku/vendor/libtiff/current/libtiff/mkg3states.c
haiku/vendor/libtiff/current/libtiff/t4.h
haiku/vendor/libtiff/current/libtiff/tif_acorn.c
haiku/vendor/libtiff/current/libtiff/tif_apple.c
haiku/vendor/libtiff/current/libtiff/tif_atari.c
haiku/vendor/libtiff/current/libtiff/tif_aux.c
haiku/vendor/libtiff/current/libtiff/tif_close.c
haiku/vendor/libtiff/current/libtiff/tif_codec.c
haiku/vendor/libtiff/current/libtiff/tif_color.c
haiku/vendor/libtiff/current/libtiff/tif_compress.c
haiku/vendor/libtiff/current/libtiff/tif_config.vc.h
haiku/vendor/libtiff/current/libtiff/tif_config.wince.h
haiku/vendor/libtiff/current/libtiff/tif_dir.c
haiku/vendor/libtiff/current/libtiff/tif_dir.h
haiku/vendor/libtiff/current/libtiff/tif_dirinfo.c
haiku/vendor/libtiff/current/libtiff/tif_dirread.c
haiku/vendor/libtiff/current/libtiff/tif_dirwrite.c
haiku/vendor/libtiff/current/libtiff/tif_dumpmode.c
haiku/vendor/libtiff/current/libtiff/tif_error.c
haiku/vendor/libtiff/current/libtiff/tif_extension.c
haiku/vendor/libtiff/current/libtiff/tif_fax3.c
haiku/vendor/libtiff/current/libtiff/tif_fax3.h
haiku/vendor/libtiff/current/libtiff/tif_fax3sm.c
haiku/vendor/libtiff/current/libtiff/tif_flush.c
haiku/vendor/libtiff/current/libtiff/tif_getimage.c
haiku/vendor/libtiff/current/libtiff/tif_jbig.c
haiku/vendor/libtiff/current/libtiff/tif_jpeg.c
haiku/vendor/libtiff/current/libtiff/tif_luv.c
haiku/vendor/libtiff/current/libtiff/tif_lzw.c
haiku/vendor/libtiff/current/libtiff/tif_msdos.c
haiku/vendor/libtiff/current/libtiff/tif_next.c
haiku/vendor/libtiff/current/libtiff/tif_ojpeg.c
haiku/vendor/libtiff/current/libtiff/tif_open.c
haiku/vendor/libtiff/current/libtiff/tif_packbits.c
[... truncated: 78 changed files follow ...]
Log:
updating libtiff to 3.9.4
Modified: haiku/vendor/libtiff/current/ChangeLog
===================================================================
--- haiku/vendor/libtiff/current/ChangeLog 2010-09-18 11:50:14 UTC (rev
38700)
+++ haiku/vendor/libtiff/current/ChangeLog 2010-09-18 11:50:51 UTC (rev
38701)
@@ -1,3 +1,167 @@
+2010-06-15 Bob Friesenhahn <bfriesen@xxxxxxxxxxxxxxxxxxx>
+
+ * libtiff 3.9.4 released.
+
+2010-06-13 Frank Warmerdam <warmerdam@xxxxxxxxx>
+
+ * libtiff/tif_jpeg.c: avoid re-preparing jpeg tables unnecessarily
+ (gdal #3633, libtiff #2135).
+
+ * libtiff/tif_dirread.c: Fixed bad handling of out of order tags
+ definated late by a codec (#2210)
+
+ * libtiff/tif_dirread.c: Fixed inadequate validation of the
+ SubjectDistance field (#2212).
+
+ * tiff2pdf.c: Fix assorted bugs in tiff2pdf: missing "return"
+ in t2p_read_tiff_size() causes t2p->tiff_datasize to be set entirely
+ wrong for COMPRESSION_JPEG case, resulting in memory stomp if actual
+ size is larger. Also, there are a bunch of places that try to
+ memset() a malloc'd buffer before checking for malloc failure, which
+ would result in core dump if there actually were a failure. (#2211)
+
+2010-06-11 Bob Friesenhahn <bfriesen@xxxxxxxxxxxxxxxxxxx>
+
+ * tools/tiff2rgba.c: Applied portion of patch (from Tom Lane)
+ which was left out in order to fully resolve "CVE-2009-2347
+ libtiff: integer overflows in various inter-color space conversion
+ tools". http://bugzilla.maptools.org/show_bug.cgi?id=2079
+
+ * libtiff/tiffiop.h (TIFFSafeMultiply): Need more castings to
+ avoid compiler warnings if parameter types are not sign
+ consistent.
+
+ * tools/tiffcrop.c: Applied patch from Richard Nolde: Corrected
+ European page size dimensions. Added an option to allow the user
+ to specify a custom page size on the command line. Fix the case
+ where a page size specified with a fractional part was being
+ coerced to an integer by retyping the variables that define the
+ paper size.
+
+ * libtiff 3.9.3 released.
+
+ * tools/tiffcp.c (tiffcp): Applied Tom Lane's patch to reject
+ YCbCr subsampled data since tiffcp currently doesn't support it.
+ http://bugzilla.maptools.org/show_bug.cgi?id=2097
+
+ * Update libtool to version 2.2.10.
+
+2010-06-10 Bob Friesenhahn <bfriesen@xxxxxxxxxxxxxxxxxxx>
+
+ * libtiff/tiffiop.h (TIFFSafeMultiply): Work properly if
+ multiplier is zero.
+
+2010-06-09 Bob Friesenhahn <bfriesen@xxxxxxxxxxxxxxxxxxx>
+
+ * libtiff/tif_dir.h: Restore ReferenceBlackWhite as a non-custom
+ field. This avoids a multi-thread reentrancy problem as well as
+ fixing output of wrong tag value due to redundant definitions for
+ the same tag in the tiffFieldInfo[] array. Resolves
+ http://bugzilla.maptools.org/show_bug.cgi?id=2185
+
+ * libtiff/tif_fax3.c (Fax3SetupState): Yesterday's fix for
+ CVE-2010-1411 was not complete.
+
+ * libtiff/tiffiop.h (TIFFSafeMultiply): New macro to safely
+ multiply two integers. Returns zero if there is an integer
+ overflow.
+
+ * tools/tiffcp.c (main): Fix more TIFF handle leaks.
+
+ * libtiff/tif_read.c (TIFFReadBufferSetup): Skip allocating
+ tif_rawdata if tif_rawdatasize becomes zero.
+
+2010-06-08 Bob Friesenhahn <bfriesen@xxxxxxxxxxxxxxxxxxx>
+
+ * tools/tiffcrop.c: Removed duplicated macros such as
+ TIFFhowmany().
+
+ * Update libtool to version 2.2.8.
+
+ * libtiff/tif_fax3.c (Fax3SetupState): Avoid under-allocation of
+ buffer due to integer overflow in TIFFroundup() and several other
+ potential overflows. In conjunction with the fix to TIFFhowmany(),
+ fixes CVE-2010-1411.
+
+ * libtiff/tiffiop.h (TIFFhowmany): Return zero if parameters would
+ result in an integer overflow. This causes TIFFroundup() to also
+ return zero if there would be an integer overflow.
+
+ * libtiff/tif_read.c (TIFFReadBufferSetup): Return an error if
+ tif_rawdatasize becomes zero due to an initial raw size of zero or
+ an overflow reported by TIFFroundup().
+
+ * libtiff/tif_ojpeg.c (OJPEGReadBufferFill): Report an error and
+ avoid a crash if the input file is so broken that the strip
+ offsets are not defined.
+
+ * tools/tiffcp.c (main): tiffcp should not leak memory if an error
+ is reported when reading the input file.
+
+ * libtiff/tif_aux.c (_TIFFCheckRealloc): Produce a fully detailed
+ error message string.
+
+ * Add an emacs formatting mode footer to all source files so that
+ emacs can be effectively used.
+
+2010-06-03 Oliver Chen Feng <scip8183@xxxxxxxxx>
+
+ * libtiff/tools/tiffcp.c: add a new option -x to force merged tiff
+ file PAGENUMBER value in sequence for users who care the page
+ sequence, this will also prevent tiff2pdf from creating pdf file from
+ the merged tiff file with wrong page sequence.
+
+2010-05-07 Frank Warmerdam <warmerdam@xxxxxxxxx>
+
+ * libtiff/tif_jpeg.c: Ensure that quality is always set in
+ JPEGPreEncode(), not just when we want to output local tables.
+ Otherwise the quality used during compression may not be right and
+ might not match the tables in the tables tag. This bug only occurs
+ when seeking between directories in the midst of writing blocks.
+ http://trac.osgeo.org/gdal/ticket/3539
+
+2010-05-05 Olivier Paquet <olivier.paquet@xxxxxxxxx>
+
+ * libtiff/tif_print.c: Have TIFFTAG_REFERENCEBLACKWHITE always print 6
+ floats instead of 2*SamplesPerPixel.
+ http://bugzilla.maptools.org/show_bug.cgi?id=2186
+ * man/TIFFGetField.3tiff, man/TIFFSetField.3tiff: Fixed doc to reflect
the
+ fact that libtiff considers TIFFTAG_REFERENCEBLACKWHITE to be 6 floats.
+
+2010-04-10 Bob Friesenhahn <bfriesen@xxxxxxxxxxxxxxxxxxx>
+
+ * tools/ppm2tiff.c (main): While case for parsing comment line
+ requires extra parenthesis to work as expected. Reported by
+ Thomas Sinclair.
+
+2010-02-22 Lee Howard <faxguy@xxxxxxxxxxxxxxxx>
+
+ * libtiff/tif_jpeg.c: Do not generate a JPEGTables tag when creating
+ the JPEG TIFF as is is not required in order to prevent it from
+ being unused and filled with invalid data. (Leave it to be
+ generated by later activity.)
+ http://bugzilla.maptools.org/show_bug.cgi?id=2135
+ * tools/tiff2pdf.c: Write the JPEG SOI headers into the TIFF strip
+ data rather than skipping them. This fixes the ability to view in
+ Acrobat Reader, Evince, and Ghostscript.
+ http://bugzilla.maptools.org/show_bug.cgi?id=2135
+ * libtiff/tif_fax3.c: Don't return error on badly-terminated MMR
+ strips.
+ http://bugzilla.maptools.org/show_bug.cgi?id=2029
+
+2010-01-06 Frank Warmerdam <warmerdam@xxxxxxxxx>
+
+ * libtiff/tif_dir.c: Ensure tile and scanline sizes are reset
+ when moving to new directories.
+ http://bugzilla.maptools.org/show_bug.cgi?id=1936
+
+2009-12-03 Frank Warmerdam <warmerdam@xxxxxxxxx>
+
+ * libtiff/tif_jpeg.c: Fix a couple of issues that trigger failures in
+ some cases when using TIFFReadScanline() with JPEG compressed
+ subsampled ycbcr images.
+ http://bugzilla.maptools.org/show_bug.cgi?id=1936
+
2009-11-04 Bob Friesenhahn <bfriesen@xxxxxxxxxxxxxxxxxxx>
* libtiff 3.9.2 released.
Modified: haiku/vendor/libtiff/current/HOWTO-RELEASE
===================================================================
--- haiku/vendor/libtiff/current/HOWTO-RELEASE 2010-09-18 11:50:14 UTC (rev
38700)
+++ haiku/vendor/libtiff/current/HOWTO-RELEASE 2010-09-18 11:50:51 UTC (rev
38701)
@@ -88,7 +88,7 @@
12. In the source tree do
- cvs tag Release-v3-9-1
+ cvs tag Release-v3-9-2
(or the appropriate name for the release)
Modified: haiku/vendor/libtiff/current/Makefile.in
===================================================================
--- haiku/vendor/libtiff/current/Makefile.in 2010-09-18 11:50:14 UTC (rev
38700)
+++ haiku/vendor/libtiff/current/Makefile.in 2010-09-18 11:50:51 UTC (rev
38701)
@@ -291,7 +291,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
Modified: haiku/vendor/libtiff/current/RELEASE-DATE
===================================================================
--- haiku/vendor/libtiff/current/RELEASE-DATE 2010-09-18 11:50:14 UTC (rev
38700)
+++ haiku/vendor/libtiff/current/RELEASE-DATE 2010-09-18 11:50:51 UTC (rev
38701)
@@ -1 +1 @@
-20091104
+20100615
Modified: haiku/vendor/libtiff/current/VERSION
===================================================================
--- haiku/vendor/libtiff/current/VERSION 2010-09-18 11:50:14 UTC (rev
38700)
+++ haiku/vendor/libtiff/current/VERSION 2010-09-18 11:50:51 UTC (rev
38701)
@@ -1 +1 @@
-3.9.2
+3.9.4
Modified: haiku/vendor/libtiff/current/aclocal.m4
===================================================================
--- haiku/vendor/libtiff/current/aclocal.m4 2010-09-18 11:50:14 UTC (rev
38700)
+++ haiku/vendor/libtiff/current/aclocal.m4 2010-09-18 11:50:51 UTC (rev
38701)
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically
`autoreconf'.])])
Modified: haiku/vendor/libtiff/current/autogen.sh
===================================================================
--- haiku/vendor/libtiff/current/autogen.sh 2010-09-18 11:50:14 UTC (rev
38700)
+++ haiku/vendor/libtiff/current/autogen.sh 2010-09-18 11:50:51 UTC (rev
38701)
@@ -1,6 +1,6 @@
#!/bin/sh
set -x
-#libtoolize --force --copy
+libtoolize --force --copy
aclocal -I ./m4
autoheader
automake --foreign --add-missing --copy
Modified: haiku/vendor/libtiff/current/build/Makefile.in
===================================================================
--- haiku/vendor/libtiff/current/build/Makefile.in 2010-09-18 11:50:14 UTC
(rev 38700)
+++ haiku/vendor/libtiff/current/build/Makefile.in 2010-09-18 11:50:51 UTC
(rev 38701)
@@ -252,7 +252,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
Modified: haiku/vendor/libtiff/current/config/ltmain.sh
===================================================================
--- haiku/vendor/libtiff/current/config/ltmain.sh 2010-09-18 11:50:14 UTC
(rev 38700)
+++ haiku/vendor/libtiff/current/config/ltmain.sh 2010-09-18 11:50:51 UTC
(rev 38701)
@@ -1,9 +1,10 @@
# Generated from ltmain.m4sh.
-# ltmain.sh (GNU libtool) 2.2.6
+# libtool (GNU libtool) 2.2.10
# Written by Gordon Matzigkeit <gord@xxxxxxxxxxxxxx>, 1996
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
2007 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -32,50 +33,54 @@
#
# Provide generalized library-building support services.
#
-# --config show all configuration variables
-# --debug enable verbose shell tracing
-# -n, --dry-run display commands without modifying any files
-# --features display basic configuration information and exit
-# --mode=MODE use operation mode MODE
-# --preserve-dup-deps don't remove duplicate dependency libraries
-# --quiet, --silent don't print informational messages
-# --tag=TAG use configuration variables from tag TAG
-# -v, --verbose print informational messages (default)
-# --version print version information
-# -h, --help print short or long help message
+# --config show all configuration variables
+# --debug enable verbose shell tracing
+# -n, --dry-run display commands without modifying any files
+# --features display basic configuration information and exit
+# --mode=MODE use operation mode MODE
+# --preserve-dup-deps don't remove duplicate dependency libraries
+# --quiet, --silent don't print informational messages
+# --no-quiet, --no-silent
+# print informational messages (default)
+# --tag=TAG use configuration variables from tag TAG
+# -v, --verbose print more informational messages than default
+# --no-verbose don't print the extra informational messages
+# --version print version information
+# -h, --help, --help-all print short, long, or detailed help message
#
# MODE must be one of the following:
#
-# clean remove files from the build directory
-# compile compile a source file into a libtool object
-# execute automatically set library path, then run a program
-# finish complete the installation of libtool libraries
-# install install libraries or executables
-# link create a library or an executable
-# uninstall remove libraries from an installed directory
+# clean remove files from the build directory
+# compile compile a source file into a libtool object
+# execute automatically set library path, then run a program
+# finish complete the installation of libtool libraries
+# install install libraries or executables
+# link create a library or an executable
+# uninstall remove libraries from an installed directory
#
-# MODE-ARGS vary depending on the MODE.
+# MODE-ARGS vary depending on the MODE. When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
#
# When reporting a bug, please describe a test case to reproduce it and
# include the following information:
#
-# host-triplet: $host
-# shell: $SHELL
-# compiler: $LTCC
-# compiler flags: $LTCFLAGS
-# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6
-# automake: $automake_version
-# autoconf: $autoconf_version
+# host-triplet: $host
+# shell: $SHELL
+# compiler: $LTCC
+# compiler flags: $LTCFLAGS
+# linker: $LD (gnu? $with_gnu_ld)
+# $progname: (GNU libtool) 2.2.10
+# automake: $automake_version
+# autoconf: $autoconf_version
#
# Report bugs to <bug-libtool@xxxxxxx>.
-PROGRAM=ltmain.sh
+PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.2.6
+VERSION=2.2.10
TIMESTAMP=""
-package_revision=1.3012
+package_revision=1.3175
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -91,10 +96,15 @@
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
# NLS nuisances: We save the old values to restore during execute mode.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
lt_user_locale=
lt_safe_locale=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -107,24 +117,33 @@
lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
$lt_unset CDPATH
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
: ${CP="cp -f"}
-: ${ECHO="echo"}
-: ${EGREP="/usr/bin/grep -E"}
-: ${FGREP="/usr/bin/grep -F"}
-: ${GREP="/usr/bin/grep"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${EGREP="grep -E"}
+: ${FGREP="grep -F"}
+: ${GREP="grep"}
: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
-: ${SED="/opt/local/bin/gsed"}
+: ${SED="sed"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
@@ -159,32 +178,168 @@
func_dirname_and_basename ()
{
# Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
func_dirname_result="$func_dirname_result${2}"
fi
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
}
# Generated shell functions inserted here.
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
+# These SED scripts presuppose an absolute path with a trailing slash.
+pathcar='s,^/\([^/]*\).*$,\1,'
+pathcdr='s,^/[^/]*,,'
+removedotparts=':dotsl
+ s@/\./@/@g
+ t dotsl
+ s,/\.$,/,'
+collapseslashes='s@/\{1,\}@/@g'
+finalslash='s,/*$,/,'
+# func_normal_abspath PATH
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+# value returned in "$func_normal_abspath_result"
+func_normal_abspath ()
+{
+ # Start from root dir and reassemble the path.
+ func_normal_abspath_result=
+ func_normal_abspath_tpath=$1
+ func_normal_abspath_altnamespace=
+ case $func_normal_abspath_tpath in
+ "")
+ # Empty path, that just means $cwd.
+ func_stripname '' '/' "`pwd`"
+ func_normal_abspath_result=$func_stripname_result
+ return
+ ;;
+ # The next three entries are used to spot a run of precisely
+ # two leading slashes without using negated character classes;
+ # we take advantage of case's first-match behaviour.
+ ///*)
+ # Unusual form of absolute path, do nothing.
+ ;;
+ //*)
+ # Not necessarily an ordinary path; POSIX reserves leading '//'
+ # and for example Cygwin uses it to access remote file shares
+ # over CIFS/SMB, so we conserve a leading double slash if found.
+ func_normal_abspath_altnamespace=/
+ ;;
+ /*)
+ # Absolute path, do nothing.
+ ;;
+ *)
+ # Relative path, prepend $cwd.
+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+ ;;
+ esac
+ # Cancel out all the simple stuff to save iterations. We also want
+ # the path to end with a slash for ease of parsing, so make sure
+ # there is one (and only one) here.
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
+ while :; do
+ # Processed it all yet?
+ if test "$func_normal_abspath_tpath" = / ; then
+ # If we ascended to the root using ".." the result may be empty now.
+ if test -z "$func_normal_abspath_result" ; then
+ func_normal_abspath_result=/
+ fi
+ break
+ fi
+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$pathcar"`
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$pathcdr"`
+ # Figure out what to do with it
+ case $func_normal_abspath_tcomponent in
+ "")
+ # Trailing empty path component, ignore it.
+ ;;
+ ..)
+ # Parent dir; strip last assembled component from result.
+ func_dirname "$func_normal_abspath_result"
+ func_normal_abspath_result=$func_dirname_result
+ ;;
+ *)
+ # Actual path component, append it.
+
func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
+ ;;
+ esac
+ done
+ # Restore leading double-slash if one was found on entry.
+
func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+# func_relative_path SRCDIR DSTDIR
+# generates a relative path from SRCDIR to DSTDIR, with a trailing
+# slash if non-empty, suitable for immediately appending a filename
+# without needing to append a separator.
+# value returned in "$func_relative_path_result"
+func_relative_path ()
+{
+ func_relative_path_result=
+ func_normal_abspath "$1"
+ func_relative_path_tlibdir=$func_normal_abspath_result
+ func_normal_abspath "$2"
+ func_relative_path_tbindir=$func_normal_abspath_result
+
+ # Ascend the tree starting from libdir
+ while :; do
+ # check if we have found a prefix of bindir
+ case $func_relative_path_tbindir in
+ $func_relative_path_tlibdir)
+ # found an exact match
+ func_relative_path_tcancelled=
+ break
+ ;;
+ $func_relative_path_tlibdir*)
+ # found a matching prefix
+ func_stripname "$func_relative_path_tlibdir" ''
"$func_relative_path_tbindir"
+ func_relative_path_tcancelled=$func_stripname_result
+ if test -z "$func_relative_path_result"; then
+ func_relative_path_result=.
+ fi
+ break
+ ;;
+ *)
+ func_dirname $func_relative_path_tlibdir
+ func_relative_path_tlibdir=${func_dirname_result}
+ if test "x$func_relative_path_tlibdir" = x ; then
+ # Have to descend all the way to the root!
+ func_relative_path_result=../$func_relative_path_result
+ func_relative_path_tcancelled=$func_relative_path_tbindir
+ break
+ fi
+ func_relative_path_result=../$func_relative_path_result
+ ;;
+ esac
+ done
+
+ # Now calculate path; take care to avoid doubling-up slashes.
+ func_stripname '' '/' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
+ func_stripname '/' '/' "$func_relative_path_tcancelled"
+ if test "x$func_stripname_result" != x ; then
+
func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
+ fi
+
+ # Normalisation. If bindir is libdir, return empty string,
+ # else relative path ending with a slash; either way, target
+ # file name can be directly appended.
+ if test ! -z "$func_relative_path_result"; then
+ func_stripname './' '' "$func_relative_path_result/"
+ func_relative_path_result=$func_stripname_result
+ fi
+}
+
# The name of this program:
-# In the unlikely event $progname began with a '-', it would play havoc with
-# func_echo (imagine progname=-n), so we prepend ./ in that case:
func_dirname_and_basename "$progpath"
progname=$func_basename_result
-case $progname in
- -*) progname=./$progname ;;
-esac
# Make sure we have an absolute path for reexecution:
case $progpath in
@@ -258,6 +413,13 @@
:
}
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO "$*"
+}
+
# func_error arg...
# Echo program name prefixed message to standard error.
func_error ()
@@ -326,9 +488,9 @@
case $my_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
- my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+ my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
done
- my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+ my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
save_mkdir_p_IFS="$IFS"; IFS=':'
for my_dir in $my_dir_list; do
@@ -378,7 +540,7 @@
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
- $ECHO "X$my_tmpdir" | $Xsed
+ $ECHO "$my_tmpdir"
}
@@ -392,7 +554,7 @@
{
case $1 in
*[\\\`\"\$]*)
- func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e
"$sed_quote_subst"` ;;
+ func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED
"$sed_quote_subst"` ;;
*)
func_quote_for_eval_unquoted_result="$1" ;;
esac
@@ -419,7 +581,7 @@
{
case $1 in
*[\\\`\"]*)
- my_arg=`$ECHO "X$1" | $Xsed \
+ my_arg=`$ECHO "$1" | $SED \
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
my_arg="$1" ;;
@@ -489,14 +651,19 @@
}
-
-
-
# func_version
# Echo version message to standard output and exit.
func_version ()
{
- $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+ $SED -n '/(C)/!b go
+ :more
+ /\./!{
+ N
+ s/\n# / /
+ b more
+ }
+ :go
+ /^# '$PROGRAM' (GNU /,/# warranty; / {
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
@@ -509,19 +676,20 @@
# Echo short help message to standard output and exit.
func_usage ()
{
- $SED -n '/^# Usage:/,/# -h/ {
+ $SED -n '/^# Usage:/,/^# *.*--help/ {
s/^# //
s/^# *$//
s/\$progname/'$progname'/
p
}' < "$progpath"
- $ECHO
+ echo
$ECHO "run \`$progname --help | more' for full usage"
exit $?
}
-# func_help
-# Echo long help message to standard output and exit.
+# func_help [NOEXIT]
+# Echo long help message to standard output and exit,
+# unless 'noexit' is passed as argument.
func_help ()
{
$SED -n '/^# Usage:/,/# Report bugs to/ {
@@ -538,7 +706,10 @@
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
p
}' < "$progpath"
- exit $?
+ ret=$?
+ if test -z "$1"; then
+ exit $ret
+ fi
}
# func_missing_arg argname
@@ -546,7 +717,7 @@
# exit_cmd.
func_missing_arg ()
{
- func_error "missing argument for $1"
+ func_error "missing argument for $1."
exit_cmd=exit
}
@@ -556,30 +727,7 @@
-# Check that we have a working $ECHO.
-if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X$1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
- # Yippee, $ECHO works!
- :
-else
- # Restart under the correct shell, and then maybe $ECHO will work.
- exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-if test "X$1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<EOF
-$*
-EOF
- exit $EXIT_SUCCESS
-fi
-
magic="%%%MAGIC variable%%%"
magic_exe="%%%MAGIC EXE variable%%%"
@@ -636,16 +784,16 @@
# Display the features supported by this script.
func_features ()
{
- $ECHO "host: $host"
+ echo "host: $host"
if test "$build_libtool_libs" = yes; then
- $ECHO "enable shared libraries"
+ echo "enable shared libraries"
else
- $ECHO "disable shared libraries"
+ echo "disable shared libraries"
fi
if test "$build_old_libs" = yes; then
- $ECHO "enable static libraries"
+ echo "enable static libraries"
else
- $ECHO "disable static libraries"
+ echo "disable static libraries"
fi
exit $?
@@ -772,12 +920,23 @@
--quiet|--silent) preserve_args="$preserve_args $opt"
opt_silent=:
+ opt_verbose=false
;;
+ --no-quiet|--no-silent)
+ preserve_args="$preserve_args $opt"
+ opt_silent=false
+ ;;
+
--verbose| -v) preserve_args="$preserve_args $opt"
opt_silent=false
+ opt_verbose=:
;;
+ --no-verbose) preserve_args="$preserve_args $opt"
+ opt_verbose=false
+ ;;
+
--tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
preserve_args="$preserve_args $opt $1"
func_enable_tag "$1" # tagname is set here
@@ -793,6 +952,7 @@
-\?|-h) func_usage ;;
--help) opt_help=: ;;
+ --help-all) opt_help=': help-all' ;;
--version) func_version ;;
-*) func_fatal_help "unrecognized option \`$opt'" ;;
@@ -1016,10 +1176,13 @@
func_quote_for_eval "$arg"
CC_quoted="$CC_quoted $func_quote_for_eval_result"
done
+ CC_expanded=`func_echo_all $CC`
+ CC_quoted_expanded=`func_echo_all $CC_quoted`
case $@ in
# Blanks in the command may have been stripped by the calling shell,
# but not from the CC environment variable when configure was run.
- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"*
| "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* |
"$CC_quoted_expanded "*) ;;
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
@@ -1033,8 +1196,11 @@
func_quote_for_eval "$arg"
CC_quoted="$CC_quoted $func_quote_for_eval_result"
done
+ CC_expanded=`func_echo_all $CC`
+ CC_quoted_expanded=`func_echo_all $CC_quoted`
case "$@ " in
- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | "
$CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted`
"*)
+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* |
"$CC_quoted_expanded "*)
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
@@ -1213,7 +1379,7 @@
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
- *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+ *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
func_xform "$libobj"
libobj=$func_xform_result
;;
@@ -1288,7 +1454,7 @@
# Calculate the filename of the output object if compiler does
# not support -o with -c
if test "$compiler_c_o" = no; then
- output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e
's%\.[^.]*$%%'`.${objext}
+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
else
output_obj=
@@ -1445,7 +1611,7 @@
}
$opt_help || {
-test "$mode" = compile && func_mode_compile ${1+"$@"}
+ test "$mode" = compile && func_mode_compile ${1+"$@"}
}
func_mode_help ()
@@ -1482,10 +1648,11 @@
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
-no-suppress do not suppress compiler output for multiple passes
- -prefer-pic try to building PIC objects only
- -prefer-non-pic try to building non-PIC objects only
+ -prefer-pic try to build PIC objects only
+ -prefer-non-pic try to build non-PIC objects only
-shared do not build a \`.o' file suitable for static linking
-static only build a \`.o' file suitable for static linking
+ -Wc,FLAG pass FLAG directly to the compiler
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
from the given SOURCEFILE.
@@ -1538,7 +1705,7 @@
The following components of INSTALL-COMMAND are treated specially:
- -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
+ -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for
installation
The rest of the components are interpreted as arguments to that command (only
BSD-compatible install options are recognized)."
@@ -1558,6 +1725,8 @@
-all-static do not do any dynamic linking at all
-avoid-version do not add a version suffix if possible
+ -bindir BINDIR specify path to binaries directory (for systems where
+ libraries must be found in the PATH setting at runtime)
-dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
@@ -1586,6 +1755,11 @@
-version-info CURRENT[:REVISION[:AGE]]
specify library version info [each variable defaults to 0]
-weak LIBNAME declare that the target provides the LIBNAME interface
+ -Wc,FLAG
+ -Xcompiler FLAG pass linker-specific FLAG directly to the compiler
+ -Wl,FLAG
+ -Xlinker FLAG pass linker-specific FLAG directly to the linker
+ -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
All other options (arguments beginning with \`-') are ignored.
@@ -1623,14 +1797,40 @@
;;
esac
- $ECHO
+ echo
$ECHO "Try \`$progname --help' for more information about other modes."
-
- exit $?
}
- # Now that we've collected a possible --mode arg, show help if necessary
- $opt_help && func_mode_help
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+ if test "$opt_help" = :; then
+ func_mode_help
+ else
+ {
+ func_help noexit
+ for mode in compile link execute install finish uninstall clean; do
+ func_mode_help
+ done
+ } | sed -n '1p; 2,$s/^Usage:/ or: /p'
+ {
+ func_help noexit
+ for mode in compile link execute install finish uninstall clean; do
+ echo
+ func_mode_help
+ done
+ } |
+ sed '1d
+ /^When reporting/,/^Report/{
+ H
+ d
+ }
+ $x
+ /information about other modes/d
+ /more detailed .*MODE/d
+ s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+ fi
+ exit $?
+fi
# func_mode_execute arg...
@@ -1712,7 +1912,7 @@
for file
do
case $file in
- -*) ;;
+ -* | *.la | *.lo ) ;;
*)
# Do a test to see if this is really a libtool program.
if func_ltwrapper_script_p "$file"; then
@@ -1754,7 +1954,7 @@
# Display what would be done.
if test -n "$shlibpath_var"; then
eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- $ECHO "export $shlibpath_var"
+ echo "export $shlibpath_var"
fi
$ECHO "$cmd$args"
exit $EXIT_SUCCESS
@@ -1795,23 +1995,23 @@
# Exit here if they wanted silent mode.
$opt_silent && exit $EXIT_SUCCESS
- $ECHO
"X----------------------------------------------------------------------" |
$Xsed
- $ECHO "Libraries have been installed in:"
+ echo
"----------------------------------------------------------------------"
+ echo "Libraries have been installed in:"
for libdir in $libdirs; do
$ECHO " $libdir"
done
- $ECHO
- $ECHO "If you ever happen to want to link against installed libraries"
- $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
- $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $ECHO "flag during linking and do at least one of the following:"
+ echo
+ echo "If you ever happen to want to link against installed libraries"
+ echo "in a given directory, LIBDIR, you must either use libtool, and"
+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ echo "flag during linking and do at least one of the following:"
if test -n "$shlibpath_var"; then
- $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $ECHO " during execution"
+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ echo " during execution"
fi
if test -n "$runpath_var"; then
- $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
[... truncated: 13335 lines follow ...]
Other related posts:
- » [haiku-commits] r38701 - in haiku/vendor/libtiff/current: . build config contrib contrib/acorn ... - korli
