diff options
author | dron <dron> | 2007-07-13 14:00:41 +0000 |
---|---|---|
committer | dron <dron> | 2007-07-13 14:00:41 +0000 |
commit | f13bf411cb671e0212754cec524089c051fc5cfb (patch) | |
tree | 401d88080ab9eddbee5f8e5a2193e9e51fa26503 | |
parent | c9b9c5937ebe0eab50b8457b9ab40974645f3b3e (diff) | |
download | libtiff-f13bf411cb671e0212754cec524089c051fc5cfb.tar.gz |
libtiff 3.9.0beta released.Release-v3-9-0beta
82 files changed, 1589 insertions, 956 deletions
@@ -1,3 +1,7 @@ +2007-07-13 Andrey Kiselev <dron@ak4719.spb.edu> + + * libtiff 3.9.0beta released. + 2007-07-12 Andrey Kiselev <dron@ak4719.spb.edu> * tools/tiff2pdf.c: Added missed extern optind as per bug diff --git a/RELEASE-DATE b/RELEASE-DATE index 14ad11c6..1b3f7479 100644 --- a/RELEASE-DATE +++ b/RELEASE-DATE @@ -1 +1 @@ -20060323 +20070713 @@ -1 +1 @@ -3.8.2 +3.9.0beta diff --git a/build/Makefile.in b/build/Makefile.in index e8941d60..44c92996 100644 --- a/build/Makefile.in +++ b/build/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.1.2.1 2007-06-29 20:06:45 bfriesen Exp $ +# $Id: Makefile.in,v 1.1.2.2 2007-07-13 14:00:46 dron Exp $ # # Tag Image File Format (TIFF) Software # diff --git a/config/ltmain.sh b/config/ltmain.sh index 7874cc06..ed16ed74 100755 --- a/config/ltmain.sh +++ b/config/ltmain.sh @@ -1,30 +1,32 @@ # Generated from ltmain.m4sh; do not edit by hand -# ltmain.sh (GNU libtool 1.2410 2007/02/24 08:52:13) 2.1a +# ltmain.sh (GNU libtool 1.2477 2007/06/24 20:46:44) 2.1a # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 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. -# This program is free software; you can redistribute it and/or modify +# GNU Libtool is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, but +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, +# or obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Usage: $progname [OPTION]... [MODE-ARG]... # @@ -63,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool 1.2410 2007/02/24 08:52:13) 2.1a +# $progname: (GNU libtool 1.2477 2007/06/24 20:46:44) 2.1a # automake: $automake_version # autoconf: $autoconf_version # @@ -72,8 +74,8 @@ PROGRAM=ltmain.sh PACKAGE=libtool VERSION=2.1a -TIMESTAMP=" 1.2410 2007/02/24 08:52:13" -package_revision=1.2410 +TIMESTAMP=" 1.2477 2007/06/24 20:46:44" +package_revision=1.2477 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -106,6 +108,8 @@ $lt_unset CDPATH + + : ${CP="cp -f"} : ${ECHO="echo"} : ${EGREP="/bin/grep -E"} @@ -204,7 +208,7 @@ opt_verbose=false # name if it has been set yet. func_echo () { - $ECHO "$progname${mode+: }$mode: "${1+"$@"} + $ECHO "$progname${mode+: }$mode: $*" } # func_verbose arg... @@ -421,6 +425,9 @@ func_show_eval () } + + + # func_version # Echo version message to standard output and exit. func_version () @@ -482,6 +489,9 @@ func_missing_arg () exit_cmd=: + + + # Check that we have a working $ECHO. if test "X$1" = X--no-reexec; then # Discard the --no-reexec flag, and continue. @@ -507,7 +517,7 @@ EOF fi magic="%%%MAGIC variable%%%" - +magic_exe="%%%MAGIC EXE variable%%%" # Global variables. # $mode is unset @@ -1033,13 +1043,55 @@ func_lalib_unsafe_p () test "$lalib_p" = yes } +# func_ltwrapper_script_p file +# True iff FILE is a libtool wrapper script +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_script_p () +{ + func_lalib_p "$1" +} + +# func_ltwrapper_executable_p file +# True iff FILE is a libtool wrapper executable +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_executable_p () +{ + func_ltwrapper_exec_suffix= + case $1 in + *.exe) ;; + *) func_ltwrapper_exec_suffix=.exe ;; + esac + $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 +} + +# func_ltwrapper_scriptname file +# Assumes file is an ltwrapper_executable +# uses $file to determine the appropriate filename for a +# temporary ltwrapper_script. +func_ltwrapper_scriptname () +{ + func_ltwrapper_scriptname_result="" + if func_ltwrapper_executable_p "$1"; then + func_dirname "$1" + func_basename "$1" + func_stripname '' '.exe' "$func_basename_result" + if test -z "$func_dirname_result"; then + func_ltwrapper_scriptname_result="./$objdir/${func_stripname_result}_ltshwrapper" + else + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + fi + fi +} + # func_ltwrapper_p file -# True iff FILE is a libtool wrapper script. +# True iff FILE is a libtool wrapper script or wrapper executable # This function is only a basic sanity check; it will hardly flush out # determined imposters. func_ltwrapper_p () { - func_lalib_p "$1" + func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" } @@ -1350,8 +1402,14 @@ lt_${my_prefix}_LTX_preloaded_symbols[] = {\ { \"$my_originator\", (void *) 0 }," - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" - + case $need_lib_prefix in + no) + eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" + ;; + *) + eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" + ;; + esac $ECHO >> "$output_objdir/$my_dlsyms" "\ {0, (void *) 0} }; @@ -2021,12 +2079,14 @@ func_mode_execute () -*) ;; *) # Do a test to see if this is really a libtool program. - if func_ltwrapper_p "$file"; then + if func_ltwrapper_script_p "$file"; then func_source "$file" - - # Transform arg to wrapped name. - file="$progdir/$program" + elif func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + func_source "$func_ltwrapper_scriptname_result" fi + # Transform arg to wrapped name. + file="$progdir/$program" ;; esac # Quote arguments (to preserve shell metacharacters). @@ -2457,14 +2517,19 @@ func_mode_install () # Do a test to see if this is really a libtool program. case $host in *cygwin*|*mingw*) - func_stripname '' '.exe' "$file" - wrapper=$func_stripname_result + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + wrapper=$func_ltwrapper_scriptname_result + else + func_stripname '' '.exe' "$file" + wrapper=$func_stripname_result + fi ;; *) wrapper=$file ;; esac - if func_ltwrapper_p "$wrapper"; then + if func_ltwrapper_script_p "$wrapper"; then notinst_deplibs= relink_command= @@ -2581,6 +2646,787 @@ func_mode_install () test "$mode" = install && func_mode_install ${1+"$@"} +# func_emit_wrapper arg +# +# emit a libtool wrapper script on stdout +# don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variable +# set therein. +# +# arg is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory in which it is stored is +# the '.lib' directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () +{ + func_emit_wrapper_arg1=no + if test -n "$1" ; then + func_emit_wrapper_arg1=$1 + fi + + $ECHO "\ +#! $SHELL + +# $output - temporary wrapper script for $objdir/$outputname +# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# +# The $output program cannot be directly executed until all the libtool +# libraries that it depends on are installed. +# +# This wrapper script should never be moved out of the build directory. +# If it is, it will not operate correctly. + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='${SED} -e 1s/^X//' +sed_quote_subst='$sed_quote_subst' + +# Be Bourne compatible +if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +relink_command=\"$relink_command\" + +# This environment variable determines our operation mode. +if test \"\$libtool_install_magic\" = \"$magic\"; then + # install mode needs the following variables: + generated_by_libtool_version='$macro_version' + notinst_deplibs='$notinst_deplibs' +else + # When we are sourced in execute mode, \$file and \$ECHO are already set. + if test \"\$libtool_execute_magic\" != \"$magic\"; then + ECHO=\"$qecho\" + file=\"\$0\" + # Make sure echo works. + if test \"X\$1\" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift + 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 \"\$0\" --no-reexec \${1+\"\$@\"} + fi + fi\ +" + $ECHO "\ + + # Find the directory that this script lives in. + thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` + test \"x\$thisdir\" = \"x\$file\" && thisdir=. + + # Follow symbolic links until we get to the real thisdir. + file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` + while test -n \"\$file\"; do + destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` + + # If there was a directory component, then change thisdir. + if test \"x\$destdir\" != \"x\$file\"; then + case \"\$destdir\" in + [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; + *) thisdir=\"\$thisdir/\$destdir\" ;; + esac + fi + + file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` + done + + # Usually 'no', except on cygwin/mingw when embedded into + # the cwrapper. + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 + if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then + # special case for '.' + if test \"\$thisdir\" = \".\"; then + thisdir=\`pwd\` + fi + # remove .libs from thisdir + case \"\$thisdir\" in + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; + $objdir ) thisdir=. ;; + esac + fi + + # Try to get the absolute directory name. + absdir=\`cd \"\$thisdir\" && pwd\` + test -n \"\$absdir\" && thisdir=\"\$absdir\" +" + + if test "$fast_install" = yes; then + $ECHO "\ + program=lt-'$outputname'$exeext + progdir=\"\$thisdir/$objdir\" + + if test ! -f \"\$progdir/\$program\" || + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + test \"X\$file\" != \"X\$progdir/\$program\"; }; then + + file=\"\$\$-\$program\" + + if test ! -d \"\$progdir\"; then + $MKDIR \"\$progdir\" + else + $RM \"\$progdir/\$file\" + fi" + + $ECHO "\ + + # relink executable if necessary + if test -n \"\$relink_command\"; then + if relink_command_output=\`eval \$relink_command 2>&1\`; then : + else + $ECHO \"\$relink_command_output\" >&2 + $RM \"\$progdir/\$file\" + exit 1 + fi + fi + + $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || + { $RM \"\$progdir/\$program\"; + $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } + $RM \"\$progdir/\$file\" + fi" + else + $ECHO "\ + program='$outputname' + progdir=\"\$thisdir/$objdir\" +" + fi + + $ECHO "\ + + if test -f \"\$progdir/\$program\"; then" + + # Export our shlibpath_var if we have one. + if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ + # Add our own library path to $shlibpath_var + $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" + + # Some systems cannot cope with colon-terminated $shlibpath_var + # The second colon is a workaround for a bug in BeOS R4 sed + $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` + + export $shlibpath_var +" + fi + + # fixup the dll searchpath if we need to. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + + $ECHO "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. +" + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2*) + $ECHO "\ + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; + + *) + $ECHO "\ + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" + exit 1 + fi + else + # The program doesn't exist. + \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 + $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + exit 1 + fi +fi\ +" +} +# end: func_emit_wrapper + +# func_emit_cwrapperexe_src +# emit the source code for a wrapper executable on stdout +# Must ONLY be called from within func_mode_link because +# it depends on a number of variable set therein. +func_emit_cwrapperexe_src () +{ + cat <<EOF + +/* $cwrappersource - temporary wrapper executable for $objdir/$outputname + Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION + + The $output program cannot be directly executed until all the libtool + libraries that it depends on are installed. + + This wrapper executable should never be moved out of the build directory. + If it is, it will not operate correctly. + + Currently, it simply execs the wrapper *script* "$SHELL $output", + but could eventually absorb all of the scripts functionality and + exec $objdir/$outputname directly. +*/ +EOF + cat <<"EOF" +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <malloc.h> +#include <stdarg.h> +#include <assert.h> +#include <string.h> +#include <ctype.h> +#include <errno.h> +#include <sys/stat.h> + +#if defined(PATH_MAX) +# define LT_PATHMAX PATH_MAX +#elif defined(MAXPATHLEN) +# define LT_PATHMAX MAXPATHLEN +#else +# define LT_PATHMAX 1024 +#endif + +#ifndef S_IXOTH +# define S_IXOTH 0 +#endif +#ifndef S_IXGRP +# define S_IXGRP 0 +#endif + +#ifndef DIR_SEPARATOR +# define DIR_SEPARATOR '/' +# define PATH_SEPARATOR ':' +#endif + +#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ + defined (__OS2__) +# define HAVE_DOS_BASED_FILE_SYSTEM +# ifndef DIR_SEPARATOR_2 +# define DIR_SEPARATOR_2 '\\' +# endif +# ifndef PATH_SEPARATOR_2 +# define PATH_SEPARATOR_2 ';' +# endif +#endif + +#ifndef DIR_SEPARATOR_2 +# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) +#else /* DIR_SEPARATOR_2 */ +# define IS_DIR_SEPARATOR(ch) \ + (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) +#endif /* DIR_SEPARATOR_2 */ + +#ifndef PATH_SEPARATOR_2 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) +#else /* PATH_SEPARATOR_2 */ +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) +#endif /* PATH_SEPARATOR_2 */ + +#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) +#define XFREE(stale) do { \ + if (stale) { free ((void *) stale); stale = 0; } \ +} while (0) + +#undef LTWRAPPER_DEBUGPRINTF +#if defined DEBUGWRAPPER +# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args +static void +ltwrapper_debugprintf (const char *fmt, ...) +{ + va_list args; + va_start (args, fmt); + (void) vfprintf (stderr, fmt, args); + va_end (args); +} +#else +# define LTWRAPPER_DEBUGPRINTF(args) +#endif + +const char *program_name = NULL; + +void *xmalloc (size_t num); +char *xstrdup (const char *string); +const char *base_name (const char *name); +char *find_executable (const char *wrapper); +char *chase_symlinks (const char *pathspec); +int make_executable (const char *path); +int check_executable (const char *path); +char *strendzap (char *str, const char *pat); +void lt_fatal (const char *message, ...); + +static const char *script_text = +EOF + + func_emit_wrapper yes | + $SED -e 's/\([\\"]\)/\\\1/g' \ + -e 's/^/ "/' -e 's/$/\\n"/' + echo ";" + + cat <<EOF +const char * MAGIC_EXE = "$magic_exe"; + +int +main (int argc, char *argv[]) +{ + char **newargz; + char *tmp_pathspec; + char *actual_cwrapper_path; + char *shwrapper_name; + intptr_t rval = 127; + FILE *shwrapper; + + const char *dumpscript_opt = "--lt-dump-script"; + int i; + + program_name = (char *) xstrdup (base_name (argv[0])); + LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0])); + LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name)); + + /* very simple arg parsing; don't want to rely on getopt */ + for (i = 1; i < argc; i++) + { + if (strcmp (argv[i], dumpscript_opt) == 0) + { + printf ("%s", script_text); + return 0; + } + } + + newargz = XMALLOC (char *, argc + 2); +EOF + + if test -n "$TARGETSHELL" ; then + # no path translation at all + lt_newargv0=$TARGETSHELL + else + case "$host" in + *mingw* ) + # awkward: cmd appends spaces to result + lt_sed_strip_trailing_spaces="s/[ ]*\$//" + lt_newargv0=`( cmd //c echo $SHELL | $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo $SHELL` + case $lt_newargv0 in + *.exe | *.EXE) ;; + *) lt_newargv0=$lt_newargv0.exe ;; + esac + ;; + * ) lt_newargv0=$SHELL ;; + esac + fi + + cat <<EOF + newargz[0] = (char *) xstrdup ("$lt_newargv0"); +EOF + + cat <<"EOF" + tmp_pathspec = find_executable (argv[0]); + if (tmp_pathspec == NULL) + lt_fatal ("Couldn't find %s", argv[0]); + LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", + tmp_pathspec)); + + actual_cwrapper_path = chase_symlinks (tmp_pathspec); + LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n", + actual_cwrapper_path)); + XFREE (tmp_pathspec); + + shwrapper_name = (char *) xstrdup (base_name (actual_cwrapper_path)); + strendzap (actual_cwrapper_path, shwrapper_name); + + /* shwrapper_name transforms */ + strendzap (shwrapper_name, ".exe"); + tmp_pathspec = XMALLOC (char, (strlen (shwrapper_name) + + strlen ("_ltshwrapperTMP") + 1)); + strcpy (tmp_pathspec, shwrapper_name); + strcat (tmp_pathspec, "_ltshwrapperTMP"); + XFREE (shwrapper_name); + shwrapper_name = tmp_pathspec; + tmp_pathspec = 0; + LTWRAPPER_DEBUGPRINTF (("(main) libtool shell wrapper name: %s\n", + shwrapper_name)); +EOF + + cat <<EOF + newargz[1] = + XMALLOC (char, (strlen (actual_cwrapper_path) + + strlen ("$objdir") + 1 + strlen (shwrapper_name) + 1)); + strcpy (newargz[1], actual_cwrapper_path); + strcat (newargz[1], "$objdir"); + strcat (newargz[1], "/"); + strcat (newargz[1], shwrapper_name); +EOF + + + case $host_os in + mingw*) + cat <<"EOF" + { + char* p; + while ((p = strchr (newargz[1], '\\')) != NULL) + { + *p = '/'; + } + } +EOF + ;; + esac + + cat <<"EOF" + XFREE (shwrapper_name); + XFREE (actual_cwrapper_path); + + /* note: do NOT use "wt" here! -- defer to underlying + * mount type on cygwin + */ + if ((shwrapper = fopen (newargz[1], "w")) == 0) + { + lt_fatal ("Could not open %s for writing", newargz[1]); + } + fprintf (shwrapper, "%s", script_text); + fclose (shwrapper); + + make_executable (newargz[1]); + + for (i = 1; i < argc; i++) + newargz[i + 1] = xstrdup (argv[i]); + newargz[argc + 1] = NULL; + + for (i = 0; i < argc + 1; i++) + { + LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, newargz[i])); + } + +EOF + + case $host_os in + mingw*) + cat <<EOF + /* execv doesn't actually work on mingw as expected on unix */ + rval = _spawnv (_P_WAIT, "$lt_newargv0", (const char * const *) newargz); + if (rval == -1) + { + /* failed to start process */ + LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"$lt_newargv0\": errno = %d\n", errno)); + return 127; + } + return rval; +} +EOF + ;; + *) + cat <<EOF + execv ("$lt_newargv0", newargz); + return rval; /* =127, but avoids unused variable warning */ +} +EOF + ;; + esac + + cat <<"EOF" + +void * +xmalloc (size_t num) +{ + void *p = (void *) malloc (num); + if (!p) + lt_fatal ("Memory exhausted"); + + return p; +} + +char * +xstrdup (const char *string) +{ + return string ? strcpy ((char *) xmalloc (strlen (string) + 1), + string) : NULL; +} + +const char * +base_name (const char *name) +{ + const char *base; + +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + /* Skip over the disk name in MSDOS pathnames. */ + if (isalpha ((unsigned char) name[0]) && name[1] == ':') + name += 2; +#endif + + for (base = name; *name; name++) + if (IS_DIR_SEPARATOR (*name)) + base = name + 1; + return base; +} + +int +check_executable (const char *path) +{ + struct stat st; + + LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", + path ? (*path ? path : "EMPTY!") : "NULL!")); + if ((!path) || (!*path)) + return 0; + + if ((stat (path, &st) >= 0) + && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) + return 1; + else + return 0; +} + +int +make_executable (const char *path) +{ + int rval = 0; + struct stat st; + + LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", + path ? (*path ? path : "EMPTY!") : "NULL!")); + if ((!path) || (!*path)) + return 0; + + if (stat (path, &st) >= 0) + { + rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); + } + return rval; +} + +/* Searches for the full path of the wrapper. Returns + newly allocated full path name if found, NULL otherwise + Does not chase symlinks, even on platforms that support them. +*/ +char * +find_executable (const char *wrapper) +{ + int has_slash = 0; + const char *p; + const char *p_next; + /* static buffer for getcwd */ + char tmp[LT_PATHMAX + 1]; + int tmp_len; + char *concat_name; + + LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", + wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); + + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; + + /* Absolute path? */ +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + else + { +#endif + if (IS_DIR_SEPARATOR (wrapper[0])) + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + } +#endif + + for (p = wrapper; *p; p++) + if (*p == '/') + { + has_slash = 1; + break; + } + if (!has_slash) + { + /* no slashes; search PATH */ + const char *path = getenv ("PATH"); + if (path != NULL) + { + for (p = path; *p; p = p_next) + { + const char *q; + size_t p_len; + for (q = p; *q; q++) + if (IS_PATH_SEPARATOR (*q)) + break; + p_len = q - p; + p_next = (*q == '\0' ? q : q + 1); + if (p_len == 0) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal ("getcwd failed"); + tmp_len = strlen (tmp); + concat_name = + XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + } + else + { + concat_name = + XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, p, p_len); + concat_name[p_len] = '/'; + strcpy (concat_name + p_len + 1, wrapper); + } + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + } + /* not found in PATH; assume curdir */ + } + /* Relative path | not found in path: prepend cwd */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal ("getcwd failed"); + tmp_len = strlen (tmp); + concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + return NULL; +} + +char * +chase_symlinks (const char *pathspec) +{ +#ifndef S_ISLNK + return xstrdup (pathspec); +#else + char buf[LT_PATHMAX]; + struct stat s; + int rv = 0; + char *tmp_pathspec = xstrdup (pathspec); + char *p; + int has_symlinks = 0; + while (strlen (tmp_pathspec) && !has_symlinks) + { + LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", + tmp_pathspec)); + if (lstat (tmp_pathspec, &s) == 0) + { + if (S_ISLNK (s.st_mode) != 0) + { + has_symlinks = 1; + break; + } + + /* search backwards for last DIR_SEPARATOR */ + p = tmp_pathspec + strlen (tmp_pathspec) - 1; + while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + p--; + if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + { + /* no more DIR_SEPARATORS left */ + break; + } + *p = '\0'; + } + else + { + char *errstr = strerror (errno); + lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); + } + } + XFREE (tmp_pathspec); + + if (!has_symlinks) + { + return xstrdup (pathspec); + } + + tmp_pathspec = realpath (pathspec, buf); + if (tmp_pathspec == 0) + { + lt_fatal ("Could not follow symlinks for %s", pathspec); + } + return xstrdup (tmp_pathspec); +#endif +} + +char * +strendzap (char *str, const char *pat) +{ + size_t len, patlen; + + assert (str != NULL); + assert (pat != NULL); + + len = strlen (str); + patlen = strlen (pat); + + if (patlen <= len) + { + str += len - patlen; + if (strcmp (str, pat) == 0) + *str = '\0'; + } + return str; +} + +static void +lt_error_core (int exit_status, const char *mode, + const char *message, va_list ap) +{ + fprintf (stderr, "%s: %s: ", program_name, mode); + vfprintf (stderr, message, ap); + fprintf (stderr, ".\n"); + + if (exit_status >= 0) + exit (exit_status); +} + +void +lt_fatal (const char *message, ...) +{ + va_list ap; + va_start (ap, message); + lt_error_core (EXIT_FAILURE, "FATAL", message, ap); + va_end (ap); +} +EOF +} +# end: func_emit_cwrapperexe_src + # func_mode_link arg... func_mode_link () { @@ -3142,9 +3988,9 @@ func_mode_link () -no-install) case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) # The PATH hackery in wrapper scripts is required on Windows - # in order for the loader to find any dlls it needs. + # and Darwin in order for the loader to find any dlls it needs. func_warning "\`-no-install' is ignored for $host" func_warning "assuming \`-no-fast-install' instead" fast_install=no @@ -3859,12 +4705,6 @@ func_mode_link () done fi dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$new_inherited_linker_flags $compile_deplibs" - finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" - else - compiler_flags="$compiler_flags $inherited_linker_flags" - fi if test "$linkmode,$pass" = "lib,link" || test "$linkmode,$pass" = "prog,scan" || { test "$linkmode" != prog && test "$linkmode" != lib; }; then @@ -4492,6 +5332,14 @@ func_mode_link () fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs + if test "$pass" = link; then + if test "$linkmode" = "prog"; then + compile_deplibs="$new_inherited_linker_flags $compile_deplibs" + finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" + else + compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + fi + fi dependency_libs="$newdependency_libs" if test "$pass" = dlpreopen; then # Link the dlpreopened libraries before other libraries @@ -4729,9 +5577,10 @@ func_mode_link () age="0" ;; irix|nonstopux) - current=`expr $number_major + $number_minor - 1` + current=`expr $number_major + $number_minor` age="$number_minor" revision="$number_minor" + lt_irix_increment=no ;; esac ;; @@ -4786,7 +5635,8 @@ func_mode_link () versuffix="$major.$age.$revision" # Darwin ld doesn't like 0 for these options... minor_current=`expr $current + 1` - verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" ;; freebsd-aout) @@ -4800,7 +5650,11 @@ func_mode_link () ;; irix | nonstopux) - major=`expr $current - $age + 1` + if test "X$lt_irix_increment" = "Xno"; then + major=`expr $current - $age` + else + major=`expr $current - $age + 1` + fi case $version_type in nonstopux) verstring_prefix=nonstopux ;; @@ -5755,6 +6609,28 @@ EOF fi fi + if ${skipped_export-false}; then + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' + fi + + if test -n "$orig_export_symbols"; then + # The given exports_symbols file has to be filtered, so filter it. + func_echo "filter symbol list for \`$libname.la' to tag DATA exports" + # FIXME: $output_objdir/$libname.filter potentially contains lots of + # 's' commands which not all seds can handle. GNU sed should be fine + # though. Also, the filter scales superlinearly with the number of + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter + delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi + fi + libobjs=$output # Restore the value of output. output=$save_output @@ -6285,553 +7161,43 @@ EOF esac case $host in *cygwin* | *mingw* ) - output_name=`basename $output` - output_path=`dirname $output` + func_basename "$output" + output_name=$func_basename_result + func_dirname "$output" + output_path=$func_dirname_result + if test -z "$output_path"; then + output_path=. + fi cwrappersource="$output_path/$objdir/lt-$output_name.c" cwrapper="$output_path/$output_name.exe" $RM $cwrappersource $cwrapper trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 - cat > $cwrappersource <<EOF - -/* $cwrappersource - temporary wrapper executable for $objdir/$outputname - Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION - - The $output program cannot be directly executed until all the libtool - libraries that it depends on are installed. - - This wrapper executable should never be moved out of the build directory. - If it is, it will not operate correctly. - - Currently, it simply execs the wrapper *script* "/bin/sh $output", - but could eventually absorb all of the scripts functionality and - exec $objdir/$outputname directly. -*/ -EOF - cat >> $cwrappersource<<"EOF" -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <malloc.h> -#include <stdarg.h> -#include <assert.h> -#include <string.h> -#include <ctype.h> -#include <sys/stat.h> - -#if defined(PATH_MAX) -# define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) -# define LT_PATHMAX MAXPATHLEN -#else -# define LT_PATHMAX 1024 -#endif - -#ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' -#endif - -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif -#endif - -#ifndef DIR_SEPARATOR_2 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -#else /* DIR_SEPARATOR_2 */ -# define IS_DIR_SEPARATOR(ch) \ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -#endif /* DIR_SEPARATOR_2 */ - -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ - -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -#define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ -} while (0) - -/* -DDEBUG is fairly common in CFLAGS. */ -#undef DEBUG -#if defined DEBUGWRAPPER -# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) -#else -# define DEBUG(format, ...) -#endif - -const char *program_name = NULL; - -void * xmalloc (size_t num); -char * xstrdup (const char *string); -const char * base_name (const char *name); -char * find_executable(const char *wrapper); -int check_executable(const char *path); -char * strendzap(char *str, const char *pat); -void lt_fatal (const char *message, ...); - -int -main (int argc, char *argv[]) -{ - char **newargz; - int i; - - program_name = (char *) xstrdup (base_name (argv[0])); - DEBUG("(main) argv[0] : %s\n",argv[0]); - DEBUG("(main) program_name : %s\n",program_name); - newargz = XMALLOC(char *, argc+2); -EOF - - cat >> $cwrappersource <<EOF - newargz[0] = (char *) xstrdup("$SHELL"); -EOF - - cat >> $cwrappersource <<"EOF" - newargz[1] = find_executable(argv[0]); - if (newargz[1] == NULL) - lt_fatal("Couldn't find %s", argv[0]); - DEBUG("(main) found exe at : %s\n",newargz[1]); - /* we know the script has the same name, without the .exe */ - /* so make sure newargz[1] doesn't end in .exe */ - strendzap(newargz[1],".exe"); - for (i = 1; i < argc; i++) - newargz[i+1] = xstrdup(argv[i]); - newargz[argc+1] = NULL; - - for (i=0; i<argc+1; i++) - { - DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]); - ; - } - -EOF - - case $host_os in - mingw*) - cat >> $cwrappersource <<EOF - execv("$SHELL",(char const **)newargz); -EOF - ;; - *) - cat >> $cwrappersource <<EOF - execv("$SHELL",newargz); -EOF - ;; - esac - - cat >> $cwrappersource <<"EOF" - return 127; -} - -void * -xmalloc (size_t num) -{ - void * p = (void *) malloc (num); - if (!p) - lt_fatal ("Memory exhausted"); - - return p; -} - -char * -xstrdup (const char *string) -{ - return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL -; -} - -const char * -base_name (const char *name) -{ - const char *base; - -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - /* Skip over the disk name in MSDOS pathnames. */ - if (isalpha ((unsigned char)name[0]) && name[1] == ':') - name += 2; -#endif - - for (base = name; *name; name++) - if (IS_DIR_SEPARATOR (*name)) - base = name + 1; - return base; -} - -int -check_executable(const char * path) -{ - struct stat st; - - DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); - if ((!path) || (!*path)) - return 0; - - if ((stat (path, &st) >= 0) && - ( - /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ -#if defined (S_IXOTH) - ((st.st_mode & S_IXOTH) == S_IXOTH) || -#endif -#if defined (S_IXGRP) - ((st.st_mode & S_IXGRP) == S_IXGRP) || -#endif - ((st.st_mode & S_IXUSR) == S_IXUSR)) - ) - return 1; - else - return 0; -} - -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise */ -char * -find_executable (const char* wrapper) -{ - int has_slash = 0; - const char* p; - const char* p_next; - /* static buffer for getcwd */ - char tmp[LT_PATHMAX + 1]; - int tmp_len; - char* concat_name; - - DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; - - /* Absolute path? */ -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - else - { -#endif - if (IS_DIR_SEPARATOR (wrapper[0])) - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - } -#endif - - for (p = wrapper; *p; p++) - if (*p == '/') - { - has_slash = 1; - break; - } - if (!has_slash) - { - /* no slashes; search PATH */ - const char* path = getenv ("PATH"); - if (path != NULL) - { - for (p = path; *p; p = p_next) - { - const char* q; - size_t p_len; - for (q = p; *q; q++) - if (IS_PATH_SEPARATOR(*q)) - break; - p_len = q - p; - p_next = (*q == '\0' ? q : q + 1); - if (p_len == 0) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - } - else - { - concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, p, p_len); - concat_name[p_len] = '/'; - strcpy (concat_name + p_len + 1, wrapper); - } - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - } - /* not found in PATH; assume curdir */ - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - return NULL; -} - -char * -strendzap(char *str, const char *pat) -{ - size_t len, patlen; - - assert(str != NULL); - assert(pat != NULL); - - len = strlen(str); - patlen = strlen(pat); - - if (patlen <= len) - { - str += len - patlen; - if (strcmp(str, pat) == 0) - *str = '\0'; - } - return str; -} - -static void -lt_error_core (int exit_status, const char * mode, - const char * message, va_list ap) -{ - fprintf (stderr, "%s: %s: ", program_name, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - - if (exit_status >= 0) - exit (exit_status); -} - -void -lt_fatal (const char *message, ...) -{ - va_list ap; - va_start (ap, message); - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); - va_end (ap); -} -EOF - # we should really use a build-platform specific compiler - # here, but OTOH, the wrappers (shell script and this C one) - # are only useful if you want to execute the "real" binary. - # Since the "real" binary is built for $host, then this - # wrapper might as well be built for $host, too. - $opt_dry_run || $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource - ;; - esac - $RM $output - trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 - - $ECHO > $output "\ -#! $SHELL + func_emit_cwrapperexe_src > $cwrappersource -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. + # we should really use a build-platform specific compiler + # here, but OTOH, the wrappers (shell script and this C one) + # are only useful if you want to execute the "real" binary. + # Since the "real" binary is built for $host, then this + # wrapper might as well be built for $host, too. + $opt_dry_run || $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='${SED} -e 1s/^X//' -sed_quote_subst='$sed_quote_subst' - -# Be Bourne compatible -if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -relink_command=\"$relink_command\" - -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variables: - generated_by_libtool_version='$macro_version' - notinst_deplibs='$notinst_deplibs' -else - # When we are sourced in execute mode, \$file and \$ECHO are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then - ECHO=\"$qecho\" - file=\"\$0\" - # Make sure echo works. - if test \"X\$1\" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - 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 \"\$0\" --no-reexec \${1+\"\$@\"} - fi - fi\ -" - $ECHO >> $output "\ - - # Find the directory that this script lives in. - thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac - fi - - file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` - done - - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" - - if test "$fast_install" = yes; then - $ECHO >> $output "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" - - if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then - - file=\"\$\$-\$program\" - - if test ! -d \"\$progdir\"; then - $MKDIR \"\$progdir\" - else - $RM \"\$progdir/\$file\" - fi" - - $ECHO >> $output "\ - - # relink executable if necessary - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $ECHO \"\$relink_command_output\" >&2 - $RM \"\$progdir/\$file\" - exit 1 - fi - fi - - $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $RM \"\$progdir/\$program\"; - $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $RM \"\$progdir/\$file\" - fi" - else - $ECHO >> $output "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" - fi - - $ECHO >> $output "\ - - if test -f \"\$progdir/\$program\"; then" - - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO >> $output "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` - - export $shlibpath_var -" - fi - - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $ECHO >> $output "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - - $ECHO >> $output "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2*) - $ECHO >> $output "\ - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" + # Now, create the wrapper script for func_source use: + func_ltwrapper_scriptname $cwrapper + $RM $func_ltwrapper_scriptname_result + trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 + $opt_dry_run || { + $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result + } ;; + * ) + $RM $output + trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 - *) - $ECHO >> $output "\ - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" + func_emit_wrapper no > $output + chmod +x $output ;; esac - $ECHO >> $output "\ - \$ECHO \"\$0: cannot exec \$program \$*\" - exit 1 - fi - else - # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 - fi -fi\ -" - chmod +x $output } exit $EXIT_SUCCESS ;; @@ -7281,8 +7647,15 @@ func_mode_uninstall () esac # Do a test to see if this is a libtool program. if func_ltwrapper_p "$file"; then - relink_command= - func_source $dir/$noexename + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + relink_command= + func_source $func_ltwrapper_scriptname_result + rmfiles="$rmfiles $func_ltwrapper_scriptname_result" + else + relink_command= + func_source $dir/$noexename + fi # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles @@ -7355,3 +7728,5 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` # sh-indentation:2 # End: # vi:sw=2 + + @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for LibTIFF Software 3.8.2. +# Generated by GNU Autoconf 2.61 for LibTIFF Software 3.9.0beta. # # Report bugs to <tiff@lists.maptools.org>. # @@ -723,8 +723,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='LibTIFF Software' PACKAGE_TARNAME='tiff' -PACKAGE_VERSION='3.8.2' -PACKAGE_STRING='LibTIFF Software 3.8.2' +PACKAGE_VERSION='3.9.0beta' +PACKAGE_STRING='LibTIFF Software 3.9.0beta' PACKAGE_BUGREPORT='tiff@lists.maptools.org' # Factoring default headers for most tests. @@ -1425,7 +1425,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 3.8.2 to adapt to many kinds of systems. +\`configure' configures LibTIFF Software 3.9.0beta to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1500,7 +1500,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LibTIFF Software 3.8.2:";; + short | recursive ) echo "Configuration of LibTIFF Software 3.9.0beta:";; esac cat <<\_ACEOF @@ -1653,7 +1653,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LibTIFF Software configure 3.8.2 +LibTIFF Software configure 3.9.0beta generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1667,7 +1667,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 3.8.2, which was +It was created by LibTIFF Software $as_me 3.9.0beta, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2472,7 +2472,7 @@ fi # Define the identity of the package. PACKAGE='tiff' - VERSION='3.8.2' + VERSION='3.9.0beta' cat >>confdefs.h <<_ACEOF @@ -2644,9 +2644,9 @@ fi LIBTIFF_MAJOR_VERSION=3 -LIBTIFF_MINOR_VERSION=8 -LIBTIFF_MICRO_VERSION=2 -LIBTIFF_ALPHA_VERSION= +LIBTIFF_MINOR_VERSION=9 +LIBTIFF_MICRO_VERSION=0 +LIBTIFF_ALPHA_VERSION=beta LIBTIFF_VERSION=$LIBTIFF_MAJOR_VERSION.$LIBTIFF_MINOR_VERSION.$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION LIBTIFF_RELEASE_DATE=`date +"%Y%m%d"` @@ -2656,10 +2656,10 @@ LIBTIFF_RELEASE_DATE=`date +"%Y%m%d"` # See http://bugzilla.remotesensing.org/show_bug.cgi?id=838 for details. case "$target_os" in openbsd* | mirbsd*) - LIBTIFF_VERSION_INFO=$LIBTIFF_MAJOR_VERSION$LIBTIFF_MINOR_VERSION:$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION:0 + LIBTIFF_VERSION_INFO=$LIBTIFF_MAJOR_VERSION$LIBTIFF_MINOR_VERSION:$LIBTIFF_MICRO_VERSION:0 ;; *) - LIBTIFF_VERSION_INFO=$LIBTIFF_MAJOR_VERSION:$LIBTIFF_MINOR_VERSION:$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION + LIBTIFF_VERSION_INFO=$LIBTIFF_MAJOR_VERSION:$LIBTIFF_MINOR_VERSION:$LIBTIFF_MICRO_VERSION ;; esac @@ -4402,7 +4402,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump macro_version='2.1a' -macro_revision='1.2410' +macro_revision='1.2477' @@ -5289,29 +5289,35 @@ else fi ;; *) - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ + = "XX$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi ;; esac @@ -5518,7 +5524,7 @@ hpux10.20* | hpux11*) esac ;; -interix3*) +interix[3-9]*) # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' ;; @@ -5946,7 +5952,7 @@ test -z "$RANLIB" && RANLIB=: # Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= @@ -6070,6 +6076,7 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' # Transform an extracted symbol line into symbol name and symbol address lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -6249,6 +6256,11 @@ fi + + + + + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then enableval=$enable_libtool_lock; @@ -6280,7 +6292,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6283 "configure"' > conftest.$ac_ext + echo '#line 6295 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7375,11 +7387,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7378: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7390: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7382: \$? = $ac_status" >&5 + echo "$as_me:7394: \$? = $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 other than the usual output. @@ -7468,7 +7480,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } esac ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -7697,11 +7709,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7700: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7712: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7704: \$? = $ac_status" >&5 + echo "$as_me:7716: \$? = $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 other than the usual output. @@ -7802,11 +7814,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7805: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7817: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7809: \$? = $ac_status" >&5 + echo "$as_me:7821: \$? = $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 @@ -7857,11 +7869,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7860: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7872: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7864: \$? = $ac_status" >&5 + echo "$as_me:7876: \$? = $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 @@ -8073,7 +8085,7 @@ _LT_EOF fi ;; - interix3*) + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no hardcode_libdir_flag_spec='${wl}-rpath,$libdir' @@ -8566,10 +8578,10 @@ fi case $cc_basename in xlc*) output_verbose_link_cmd=echo - archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`$ECHO $rpath/$soname` $verstring' + archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`$ECHO $rpath/$soname` $xlcverstring' module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed "s,^,_," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds='sed "s,^,_," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds='sed "s,^,_," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -8774,25 +8786,29 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ;; openbsd*) - hardcode_direct=yes - hardcode_shlibpath_var=no - hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + hardcode_direct_absolute=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + export_dynamic_flag_spec='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi + else + ld_shlibs=no fi ;; @@ -9577,7 +9593,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -10613,7 +10629,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10616 "configure" +#line 10632 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10713,7 +10729,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10716 "configure" +#line 10732 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19111,11 +19127,11 @@ fi case $cc_basename in xlc*) output_verbose_link_cmd=echo - archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`$ECHO "$rpath/$soname"` $verstring' + archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`$ECHO "$rpath/$soname"` $xlcverstring' module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, # it doesn't exist in older darwin lds - archive_expsym_cmds_CXX='sed "s,^,_," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_CXX='sed "s,^,_," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_CXX='sed "s,^,_," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -19276,7 +19292,7 @@ fi esac ;; - interix3*) + interix[3-9]*) hardcode_direct_CXX=no hardcode_shlibpath_var_CXX=no hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' @@ -19493,17 +19509,21 @@ fi ;; openbsd*) - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - hardcode_direct_absolute_CXX=yes - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + if test -f /usr/libexec/ld.so; then + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + hardcode_direct_absolute_CXX=yes + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='${wl}-E' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd=echo + else + ld_shlibs_CXX=no fi - output_verbose_link_cmd=echo ;; osf3* | osf4* | osf5*) @@ -19882,7 +19902,7 @@ $RM -f confest.$objext # PORTME: override above test on systems where it is broken case $host_os in -interix3*) +interix[3-9]*) # Interix 3.5 installs completely hosed .la files for C++, so rather than # hack all around it, let's just trust "g++" to DTRT. predep_objects_CXX= @@ -20013,7 +20033,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } # DJGPP does not support shared libraries at all lt_prog_compiler_pic_CXX= ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -20302,11 +20322,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:20305: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20325: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:20309: \$? = $ac_status" >&5 + echo "$as_me:20329: \$? = $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 other than the usual output. @@ -20401,11 +20421,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:20404: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20424: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:20408: \$? = $ac_status" >&5 + echo "$as_me:20428: \$? = $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 @@ -20453,11 +20473,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:20456: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20476: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:20460: \$? = $ac_status" >&5 + echo "$as_me:20480: \$? = $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 @@ -20967,7 +20987,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -22193,7 +22213,7 @@ exec 6>&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 3.8.2, which was +This file was extended by LibTIFF Software $as_me 3.9.0beta, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22246,7 +22266,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -LibTIFF Software config.status 3.8.2 +LibTIFF Software config.status 3.9.0beta configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -22406,6 +22426,7 @@ GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' @@ -22552,6 +22573,7 @@ compiler \ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ SHELL \ ECHO \ lt_prog_compiler_no_builtin_flag \ @@ -23552,30 +23574,32 @@ done # 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. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007 Free Software Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 # -# This file is part of GNU Libtool: -# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 +# This file is part of GNU Libtool. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. # -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# GNU Libtool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # The names of the tagged configurations supported by this script. @@ -23694,6 +23718,9 @@ global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl # Transform the output of nm in a C name address pair. global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +# Transform the output of nm in a C name address pair when lib prefix is needed. +global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix + # The name of the directory that contains temporary libtool files. objdir=$objdir diff --git a/configure.ac b/configure.ac index 1afc946f..3e9bbc06 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ dnl OF THIS SOFTWARE. dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([LibTIFF Software], 3.8.2, [tiff@lists.maptools.org], tiff) +AC_INIT([LibTIFF Software], 3.9.0beta, [tiff@lists.maptools.org], tiff) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR(m4) AC_LANG(C) @@ -40,9 +40,9 @@ AM_MAINTAINER_MODE dnl Versioning. dnl Don't fill the ALPHA_VERSION field, if not applicable. LIBTIFF_MAJOR_VERSION=3 -LIBTIFF_MINOR_VERSION=8 -LIBTIFF_MICRO_VERSION=2 -LIBTIFF_ALPHA_VERSION= +LIBTIFF_MINOR_VERSION=9 +LIBTIFF_MICRO_VERSION=0 +LIBTIFF_ALPHA_VERSION=beta LIBTIFF_VERSION=$LIBTIFF_MAJOR_VERSION.$LIBTIFF_MINOR_VERSION.$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION dnl This will be used with the 'make release' target LIBTIFF_RELEASE_DATE=`date +"%Y%m%d"` @@ -53,10 +53,10 @@ LIBTIFF_RELEASE_DATE=`date +"%Y%m%d"` # See http://bugzilla.remotesensing.org/show_bug.cgi?id=838 for details. case "$target_os" in openbsd* | mirbsd*) - LIBTIFF_VERSION_INFO=$LIBTIFF_MAJOR_VERSION$LIBTIFF_MINOR_VERSION:$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION:0 + LIBTIFF_VERSION_INFO=$LIBTIFF_MAJOR_VERSION$LIBTIFF_MINOR_VERSION:$LIBTIFF_MICRO_VERSION:0 ;; *) - LIBTIFF_VERSION_INFO=$LIBTIFF_MAJOR_VERSION:$LIBTIFF_MINOR_VERSION:$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION + LIBTIFF_VERSION_INFO=$LIBTIFF_MAJOR_VERSION:$LIBTIFF_MINOR_VERSION:$LIBTIFF_MICRO_VERSION ;; esac diff --git a/contrib/dbs/xtiff/Makefile.in b/contrib/dbs/xtiff/Makefile.in index b0aa478d..4b55b140 100644 --- a/contrib/dbs/xtiff/Makefile.in +++ b/contrib/dbs/xtiff/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.36.2.1 2007-06-29 20:06:46 bfriesen Exp $ +# $Id: Makefile.in,v 1.36.2.2 2007-07-13 14:00:47 dron Exp $ # # Tag Image File Format (TIFF) Software # diff --git a/html/Makefile.in b/html/Makefile.in index e6fdb3ad..8bee866c 100644 --- a/html/Makefile.in +++ b/html/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.49.2.1 2007-06-29 20:06:46 bfriesen Exp $ +# $Id: Makefile.in,v 1.49.2.2 2007-07-13 14:00:47 dron Exp $ # # Tag Image File Format (TIFF) Software # @@ -289,7 +289,8 @@ docfiles = \ v3.7.4.html \ v3.8.0.html \ v3.8.1.html \ - v3.8.2.html + v3.8.2.html \ + v3.9.0beta.html dist_doc_DATA = $(docfiles) SUBDIRS = images man diff --git a/html/index.html b/html/index.html index fe0ec23b..f0f0b04b 100644 --- a/html/index.html +++ b/html/index.html @@ -28,7 +28,7 @@ </tr> <tr> <th>Latest Development Release</th> - <td><a href="v3.8.2.html">v3.8.2</a></td> + <td><a href="v3.9.0beta.html">v3.9.0beta</a></td> </tr> <tr> <th>Master Download Site</th> @@ -123,7 +123,7 @@ </p> <hr> <p> - Last updated $Date: 2007-04-30 11:28:05 $. + Last updated $Date: 2007-07-13 14:00:47 $. </p> </body> </html> diff --git a/html/man/Makefile.am b/html/man/Makefile.am index a8d3c641..c14c4dbc 100644 --- a/html/man/Makefile.am +++ b/html/man/Makefile.am @@ -102,9 +102,9 @@ INDEXSTART = '<HTML><HEAD><TITLE>Libtiff HTML manpage index</TITLE></HEAD><BODY INDEXEND = '</ul></BODY></HTML>' .PHONY: index -index: $(docfiles) +index: ${ECHO} ${INDEXSTART} > $(indexfile) - for i in $^; do \ + for i in $(docfiles); do \ ${ECHO} '<li><A HREF='$$i'>'$$i'</a>' >> $(indexfile); \ done ${ECHO} ${INDEXEND} >> $(indexfile) @@ -112,9 +112,7 @@ index: $(docfiles) manpages = $(docfiles:.html=) .PHONY: htmldoc -htmldoc: $(docfiles) - -$(docfiles): +htmldoc: for i in $(manpages); do \ ${GROFF} $(MANSRCDIR)/$$i > $(HTMLMANDIR)/$$i.html; \ done diff --git a/html/man/Makefile.in b/html/man/Makefile.in index d9c4165c..0c4035d0 100644 --- a/html/man/Makefile.in +++ b/html/man/Makefile.in @@ -489,17 +489,15 @@ uninstall-am: uninstall-dist_docDATA uninstall-info-am .PHONY: index -index: $(docfiles) +index: ${ECHO} ${INDEXSTART} > $(indexfile) - for i in $^; do \ + for i in $(docfiles); do \ ${ECHO} '<li><A HREF='$$i'>'$$i'</a>' >> $(indexfile); \ done ${ECHO} ${INDEXEND} >> $(indexfile) .PHONY: htmldoc -htmldoc: $(docfiles) - -$(docfiles): +htmldoc: for i in $(manpages); do \ ${GROFF} $(MANSRCDIR)/$$i > $(HTMLMANDIR)/$$i.html; \ done diff --git a/html/man/TIFFClose.3tiff.html b/html/man/TIFFClose.3tiff.html index 2b8ce570..42e3ba89 100644 --- a/html/man/TIFFClose.3tiff.html +++ b/html/man/TIFFClose.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:56 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:15 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFDataWidth.3tiff.html b/html/man/TIFFDataWidth.3tiff.html index 3ecb6c9a..237296e1 100644 --- a/html/man/TIFFDataWidth.3tiff.html +++ b/html/man/TIFFDataWidth.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:56 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:15 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFError.3tiff.html b/html/man/TIFFError.3tiff.html index 4fbe36d6..5d39a139 100644 --- a/html/man/TIFFError.3tiff.html +++ b/html/man/TIFFError.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:56 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:15 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFFlush.3tiff.html b/html/man/TIFFFlush.3tiff.html index 1761c6f9..f32ccd3d 100644 --- a/html/man/TIFFFlush.3tiff.html +++ b/html/man/TIFFFlush.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:56 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:15 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFGetField.3tiff.html b/html/man/TIFFGetField.3tiff.html index cabcb649..e644b1d4 100644 --- a/html/man/TIFFGetField.3tiff.html +++ b/html/man/TIFFGetField.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:57 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:15 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFOpen.3tiff.html b/html/man/TIFFOpen.3tiff.html index eaa0d464..6bc85d84 100644 --- a/html/man/TIFFOpen.3tiff.html +++ b/html/man/TIFFOpen.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:57 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:15 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFPrintDirectory.3tiff.html b/html/man/TIFFPrintDirectory.3tiff.html index d28323bb..a5f418a1 100644 --- a/html/man/TIFFPrintDirectory.3tiff.html +++ b/html/man/TIFFPrintDirectory.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:57 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:15 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFRGBAImage.3tiff.html b/html/man/TIFFRGBAImage.3tiff.html index 0883cc6f..7bbee0f2 100644 --- a/html/man/TIFFRGBAImage.3tiff.html +++ b/html/man/TIFFRGBAImage.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:58 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:16 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFReadDirectory.3tiff.html b/html/man/TIFFReadDirectory.3tiff.html index 35200991..5bb828ef 100644 --- a/html/man/TIFFReadDirectory.3tiff.html +++ b/html/man/TIFFReadDirectory.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:57 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:16 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFReadEncodedStrip.3tiff.html b/html/man/TIFFReadEncodedStrip.3tiff.html index 2ac47202..39d411d7 100644 --- a/html/man/TIFFReadEncodedStrip.3tiff.html +++ b/html/man/TIFFReadEncodedStrip.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:57 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:16 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFReadEncodedTile.3tiff.html b/html/man/TIFFReadEncodedTile.3tiff.html index 8eb2d62e..752b1ea3 100644 --- a/html/man/TIFFReadEncodedTile.3tiff.html +++ b/html/man/TIFFReadEncodedTile.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:57 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:16 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFReadRGBAImage.3tiff.html b/html/man/TIFFReadRGBAImage.3tiff.html index 9eaf9c91..165284e5 100644 --- a/html/man/TIFFReadRGBAImage.3tiff.html +++ b/html/man/TIFFReadRGBAImage.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:57 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:16 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFReadRGBAStrip.3tiff.html b/html/man/TIFFReadRGBAStrip.3tiff.html index d13bab77..df09f649 100644 --- a/html/man/TIFFReadRGBAStrip.3tiff.html +++ b/html/man/TIFFReadRGBAStrip.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:58 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:16 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFReadRGBATile.3tiff.html b/html/man/TIFFReadRGBATile.3tiff.html index 23ac4c37..ed67b832 100644 --- a/html/man/TIFFReadRGBATile.3tiff.html +++ b/html/man/TIFFReadRGBATile.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:58 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:16 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFReadRawStrip.3tiff.html b/html/man/TIFFReadRawStrip.3tiff.html index 80e22a4f..bd14f723 100644 --- a/html/man/TIFFReadRawStrip.3tiff.html +++ b/html/man/TIFFReadRawStrip.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:57 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:16 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFReadRawTile.3tiff.html b/html/man/TIFFReadRawTile.3tiff.html index a6e11033..bae2b46c 100644 --- a/html/man/TIFFReadRawTile.3tiff.html +++ b/html/man/TIFFReadRawTile.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:57 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:16 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFReadScanline.3tiff.html b/html/man/TIFFReadScanline.3tiff.html index 8bc1b8d9..423645cc 100644 --- a/html/man/TIFFReadScanline.3tiff.html +++ b/html/man/TIFFReadScanline.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:58 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:16 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFReadTile.3tiff.html b/html/man/TIFFReadTile.3tiff.html index d27acdb2..ff726b49 100644 --- a/html/man/TIFFReadTile.3tiff.html +++ b/html/man/TIFFReadTile.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:58 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:16 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFSetDirectory.3tiff.html b/html/man/TIFFSetDirectory.3tiff.html index b93e88b1..a0e5cfc0 100644 --- a/html/man/TIFFSetDirectory.3tiff.html +++ b/html/man/TIFFSetDirectory.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:58 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:17 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFSetField.3tiff.html b/html/man/TIFFSetField.3tiff.html index dd95f958..2e70225b 100644 --- a/html/man/TIFFSetField.3tiff.html +++ b/html/man/TIFFSetField.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:58 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:17 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFWarning.3tiff.html b/html/man/TIFFWarning.3tiff.html index dab5bf0a..df17073b 100644 --- a/html/man/TIFFWarning.3tiff.html +++ b/html/man/TIFFWarning.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:58 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:17 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFWriteDirectory.3tiff.html b/html/man/TIFFWriteDirectory.3tiff.html index f4fc47b7..07a443e1 100644 --- a/html/man/TIFFWriteDirectory.3tiff.html +++ b/html/man/TIFFWriteDirectory.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:58 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:17 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFWriteEncodedStrip.3tiff.html b/html/man/TIFFWriteEncodedStrip.3tiff.html index 6c4e6f21..5a45f593 100644 --- a/html/man/TIFFWriteEncodedStrip.3tiff.html +++ b/html/man/TIFFWriteEncodedStrip.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:59 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:17 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFWriteEncodedTile.3tiff.html b/html/man/TIFFWriteEncodedTile.3tiff.html index 91717f8e..0e6e1bac 100644 --- a/html/man/TIFFWriteEncodedTile.3tiff.html +++ b/html/man/TIFFWriteEncodedTile.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:59 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:17 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFWriteRawStrip.3tiff.html b/html/man/TIFFWriteRawStrip.3tiff.html index e60b5a2e..95b48570 100644 --- a/html/man/TIFFWriteRawStrip.3tiff.html +++ b/html/man/TIFFWriteRawStrip.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:59 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:17 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFWriteRawTile.3tiff.html b/html/man/TIFFWriteRawTile.3tiff.html index c2874417..3d18ed18 100644 --- a/html/man/TIFFWriteRawTile.3tiff.html +++ b/html/man/TIFFWriteRawTile.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:59 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:18 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFWriteScanline.3tiff.html b/html/man/TIFFWriteScanline.3tiff.html index 135e1f5b..bb9323d2 100644 --- a/html/man/TIFFWriteScanline.3tiff.html +++ b/html/man/TIFFWriteScanline.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:59 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:18 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFWriteTile.3tiff.html b/html/man/TIFFWriteTile.3tiff.html index 9d98d6f3..d6bc5d8a 100644 --- a/html/man/TIFFWriteTile.3tiff.html +++ b/html/man/TIFFWriteTile.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:59 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:18 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFbuffer.3tiff.html b/html/man/TIFFbuffer.3tiff.html index 47234f01..3d610ca5 100644 --- a/html/man/TIFFbuffer.3tiff.html +++ b/html/man/TIFFbuffer.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:56 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:14 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFcodec.3tiff.html b/html/man/TIFFcodec.3tiff.html index 2cc92666..8567b30b 100644 --- a/html/man/TIFFcodec.3tiff.html +++ b/html/man/TIFFcodec.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:56 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:15 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFcolor.3tiff.html b/html/man/TIFFcolor.3tiff.html index eefde39f..7e4eea51 100644 --- a/html/man/TIFFcolor.3tiff.html +++ b/html/man/TIFFcolor.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:56 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:15 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFmemory.3tiff.html b/html/man/TIFFmemory.3tiff.html index b787d3b8..746b5ec2 100644 --- a/html/man/TIFFmemory.3tiff.html +++ b/html/man/TIFFmemory.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:57 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:15 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFquery.3tiff.html b/html/man/TIFFquery.3tiff.html index 9d4a42f4..e27354af 100644 --- a/html/man/TIFFquery.3tiff.html +++ b/html/man/TIFFquery.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:57 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:15 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFsize.3tiff.html b/html/man/TIFFsize.3tiff.html index c45c36dc..54fb71b8 100644 --- a/html/man/TIFFsize.3tiff.html +++ b/html/man/TIFFsize.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:58 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:17 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFstrip.3tiff.html b/html/man/TIFFstrip.3tiff.html index 4ca5e3e5..a0fc358b 100644 --- a/html/man/TIFFstrip.3tiff.html +++ b/html/man/TIFFstrip.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:58 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:17 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFswab.3tiff.html b/html/man/TIFFswab.3tiff.html index bd28022d..2924a38b 100644 --- a/html/man/TIFFswab.3tiff.html +++ b/html/man/TIFFswab.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:58 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:17 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/TIFFtile.3tiff.html b/html/man/TIFFtile.3tiff.html index 04edcbe9..e8e0008a 100644 --- a/html/man/TIFFtile.3tiff.html +++ b/html/man/TIFFtile.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:58 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:17 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/fax2ps.1.html b/html/man/fax2ps.1.html index 5f4945c6..c5396143 100644 --- a/html/man/fax2ps.1.html +++ b/html/man/fax2ps.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:59 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:18 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/fax2tiff.1.html b/html/man/fax2tiff.1.html index 39e646ab..38b54c01 100644 --- a/html/man/fax2tiff.1.html +++ b/html/man/fax2tiff.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:59 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:18 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/gif2tiff.1.html b/html/man/gif2tiff.1.html index 97df35a9..6114bd31 100644 --- a/html/man/gif2tiff.1.html +++ b/html/man/gif2tiff.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:59 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:18 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/libtiff.3tiff.html b/html/man/libtiff.3tiff.html index 4ab1e4d2..bea73f76 100644 --- a/html/man/libtiff.3tiff.html +++ b/html/man/libtiff.3tiff.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:56 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:14 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/pal2rgb.1.html b/html/man/pal2rgb.1.html index c303da36..5c3a679a 100644 --- a/html/man/pal2rgb.1.html +++ b/html/man/pal2rgb.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:59 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:18 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/ppm2tiff.1.html b/html/man/ppm2tiff.1.html index 09dd61a4..60e56e1f 100644 --- a/html/man/ppm2tiff.1.html +++ b/html/man/ppm2tiff.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:59 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:18 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/ras2tiff.1.html b/html/man/ras2tiff.1.html index f2a6bf68..b0b89932 100644 --- a/html/man/ras2tiff.1.html +++ b/html/man/ras2tiff.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:59 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:18 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/raw2tiff.1.html b/html/man/raw2tiff.1.html index f39bc2c9..360eb277 100644 --- a/html/man/raw2tiff.1.html +++ b/html/man/raw2tiff.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:59 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:18 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/rgb2ycbcr.1.html b/html/man/rgb2ycbcr.1.html index 56d8e8f2..5cff15fb 100644 --- a/html/man/rgb2ycbcr.1.html +++ b/html/man/rgb2ycbcr.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 17:59:59 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:19 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/sgi2tiff.1.html b/html/man/sgi2tiff.1.html index 60b0b376..fe90d647 100644 --- a/html/man/sgi2tiff.1.html +++ b/html/man/sgi2tiff.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 18:00:00 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:19 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/thumbnail.1.html b/html/man/thumbnail.1.html index bf684de1..fabc6011 100644 --- a/html/man/thumbnail.1.html +++ b/html/man/thumbnail.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 18:00:00 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:19 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/tiff2bw.1.html b/html/man/tiff2bw.1.html index 72ee05e9..6b6accfc 100644 --- a/html/man/tiff2bw.1.html +++ b/html/man/tiff2bw.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 18:00:00 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:19 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/tiff2pdf.1.html b/html/man/tiff2pdf.1.html index 998a55e0..80e0d557 100644 --- a/html/man/tiff2pdf.1.html +++ b/html/man/tiff2pdf.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 18:00:00 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:19 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/tiff2ps.1.html b/html/man/tiff2ps.1.html index 98e679de..e13bb8f8 100644 --- a/html/man/tiff2ps.1.html +++ b/html/man/tiff2ps.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 18:00:00 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:19 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/tiff2rgba.1.html b/html/man/tiff2rgba.1.html index 08f169d6..eec39683 100644 --- a/html/man/tiff2rgba.1.html +++ b/html/man/tiff2rgba.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 18:00:00 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:19 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/tiffcmp.1.html b/html/man/tiffcmp.1.html index 2f3dd785..a9fca2f1 100644 --- a/html/man/tiffcmp.1.html +++ b/html/man/tiffcmp.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 18:00:00 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:19 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/tiffcp.1.html b/html/man/tiffcp.1.html index d1c59790..2b30d5f1 100644 --- a/html/man/tiffcp.1.html +++ b/html/man/tiffcp.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 18:00:00 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:19 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/tiffcrop.1.html b/html/man/tiffcrop.1.html index 3a849fb6..4c25c292 100644 --- a/html/man/tiffcrop.1.html +++ b/html/man/tiffcrop.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 18:00:00 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:19 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> @@ -25,8 +25,8 @@ <tr valign="top" align="left"> <td width="8%"></td> <td width="91%"> -<p>tiffcrop − copy (and possibly convert and crop or -process) a <small>TIFF</small> file</p> +<p>tiffcrop − copy, convert, crop, extract, or process +a <small>TIFF</small> file</p> </td> </table> <a name="SYNOPSIS"></a> @@ -57,19 +57,60 @@ compressed using a different algorithm than the input files. image for processing with bar code recognizer or OCR software when that software cannot restrict the region of interest to a specific portion of the image or to improve -efficiency when the regions of interest must be rotated.</p> +efficiency when the regions of interest must be rotated. It +can also be used to subdivide all or part of a processed +image into smaller sections.</p> <!-- INDENTATION --> +<p>Functions are applied to the input image in the following +order:</p></td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="17%"></td> +<td width="82%"> +<pre>cropping, fixed area extraction, zones, inversion, mirroring, rotation. +</pre> +</td> +</table> +<!-- INDENTATION --> + +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="8%"></td> +<td width="91%"> +<p>Functions are applied to the output image in the +following order:</p></td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="17%"></td> +<td width="82%"> +<p>output resolution, output margins, rows and columns +<b>or</b> page size divisions, orientation options, strip, +tile, byte order, and compression options.</p></td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="8%"></td> +<td width="91%"> <p>By default, <i>tiffcrop</i> will copy all the understood tags in a <small>TIFF</small> directory of an input file to -the associated directory in the output file.</p> +the associated directory in the output file. Options can be +used to force the resultant image to be written as strips or +tiles of data, respectively.</p> <!-- INDENTATION --> <p><i>tiffcrop</i> can be used to reorganize the storage -characteristics of data in a file, and it will alter or -convert the image data content as specified at the same -time, unlike tiffcp.</p> -<!-- INDENTATION --> -<p><i>tiffcrop</i> will behave exactly like tiffcp if none -of the new options are specified.</p> +characteristics of data in a file, and to reorganize, +extract, rotate, and otherwise process the image data as +specified at the same time whereas tiffcp does not alter the +image data itself.</p> </td> </table> <a name="OPTIONS"></a> @@ -88,16 +129,16 @@ of the new options are specified.</p> <tr valign="top" align="left"> <td width="19%"></td> <td width="80%"> -<p>sequences and ranges of images within file to process. -The words <b>odd</b> or <b>even</b> may be used to specify -all odd or even numbered images. The word <b>last</b> may be -used in place of a number in the sequence to indicate the -final image in the file without knowing how many images -there are. Ranges of images may be specified with a dash and -multiple sets can be indicated by joining them in a -comma-separated list. e.g.. use <b>−N 1,5-7,last</b> -to process the 1st, 5th through 7th, and final image in the -file.</p> +<p>Specify one or more series or range(s) of images within +file to process. The words <b>odd</b> or <b>even</b> may be +used to specify all odd or even numbered images. The word +<b>last</b> may be used in place of a number in the sequence +to indicate the final image in the file without knowing how +many images there are. Ranges of images may be specified +with a dash and multiple sets can be indicated by joining +them in a comma-separated list. eg. use <b>−N +1,5-7,last</b> to process the 1st, 5th through 7th, and +final image in the file.</p> </td> </table> <!-- INDENTATION --> @@ -114,8 +155,9 @@ file.</p> <tr valign="top" align="left"> <td width="19%"></td> <td width="80%"> -<p>use the top, bottom, left, or right edge as origin -reference for width and length of crop regions. May be +<p>Specify the top, bottom, left, or right edge as the +reference from which to calcuate the width and length of +crop regions or sequence of postions for zones. May be abbreviated to first letter.</p> </td> </table> @@ -133,10 +175,11 @@ abbreviated to first letter.</p> <tr valign="top" align="left"> <td width="19%"></td> <td width="80%"> -<p>units to apply to dimensions for margins and crop -regions. Inches or centimeters are converted to pixels using -the resolution unit specified in the TIFF file (which -defaults to inches if not specified in the IFD).</p> +<p>Specify the type of units to apply to dimensions for +margins and crop regions for input and output images. Inches +or centimeters are converted to pixels using the resolution +unit specified in the TIFF file (which defaults to inches if +not specified in the IFD).</p> </td> </table> <!-- INDENTATION --> @@ -153,11 +196,11 @@ defaults to inches if not specified in the IFD).</p> <tr valign="top" align="left"> <td width="19%"></td> <td width="80%"> -<p>margins to be removed from the image. The order must be -top, left, bottom, right with only commas separating the -elements of the list. Margins are scaled according to the -current units and removed before any other extractions are -computed. Capital M was in use.</p> +<p>Specify margins to be removed from the input image. The +order must be top, left, bottom, right with only commas +separating the elements of the list. Margins are scaled +according to the current units and removed before any other +extractions are computed. Captial M was in use.</p> </td> </table> <!-- TABS --> @@ -172,10 +215,10 @@ computed. Capital M was in use.</p> <td width="2%"></td> <td width="80%"> -<p>horizontal (X-axis) dimension of a region to extract -relative to the specified origin reference. If the origin is -the top or bottom edge, the X axis value will be assumed to -start at the left edge.</p> +<p>Set the horizontal (X-axis) dimension of a region to +extract relative to the specified origin reference. If the +origin is the top or bottom edge, the X axis value will be +assumed to start at the left edge.</p> </td> <td width="0%"> </td> @@ -188,10 +231,10 @@ start at the left edge.</p> <td width="2%"></td> <td width="80%"> -<p>vertical (Y-axis) dimension of a region to extract -relative to the specified origin reference. If the origin is -the left or right edge, the Y axis value will be assumed to -start at the top.</p> +<p>Set the vertical (Y-axis) dimension of a region to +extract relative to the specified origin reference. If the +origin is the left or right edge, the Y axis value will be +assumed to start at the top.</p> </td> <td width="0%"> </td> @@ -210,9 +253,9 @@ start at the top.</p> <tr valign="top" align="left"> <td width="19%"></td> <td width="80%"> -<p>zones of the image designated as position X of Y equal -sized portions measured from the reference edge, e.g. 1:3 -would be first third of the image starting from the +<p>Specify zones of the image designated as position X of Y +equal sized portions measured from the reference edge, eg +1:3 would be first third of the image starting from the reference edge minus any margins specified for the confining edges. Multiple zones can be specified as a comma separated list but they must reference the same edge. To extract the @@ -234,7 +277,7 @@ top quarter and the bottom third of an image you would use <tr valign="top" align="left"> <td width="19%"></td> <td width="80%"> -<p>flip, i.e. mirror, the image or extracted region +<p>Flip, ie mirror, the image or extracted region horizontally or vertically.</p> </td> </table> @@ -252,7 +295,7 @@ horizontally or vertically.</p> <tr valign="top" align="left"> <td width="19%"></td> <td width="80%"> -<p>rotate the image or extracted region 90, 180, or 270 +<p>Rotate the image or extracted region 90, 180, or 270 degrees clockwise.</p> </td> </table> @@ -261,20 +304,94 @@ degrees clockwise.</p> cols="5" cellspacing="0" cellpadding="0"> <tr valign="top" align="left"> <td width="10%"></td> -<td width="2%"> +<td width="6%"> <p><b>−I</b></p> </td> -<td width="6%"></td> +<td width="2%"></td> <td width="80%"> -<p>invert the colorspace values for grayscale and bi-level +<p>Invert the colorspace values for grayscale and bilevel images. This would be used to correct negative images that -have incorrect PHOTOMETRIC INTERPRETATION tags. No support +have incorrect PHOTMETRIC INTERPRETATION tags. No support for color images.</p> </td> <td width="0%"> </td> +<tr valign="top" align="left"> +<td width="10%"></td> +<td width="6%"> + +<p><b>−H #</b></p> +</td> +<td width="2%"></td> +<td width="80%"> + +<p>Set the horizontal resolution of output images to # +expressed in the current units.</p> +</td> +<td width="0%"> +</td> +<tr valign="top" align="left"> +<td width="10%"></td> +<td width="6%"> + +<p><b>−V #</b></p> +</td> +<td width="2%"></td> +<td width="80%"> + +<p>Set the vertical resolution of the output images to # +expressed in the current units.</p> +</td> +<td width="0%"> +</td> +<tr valign="top" align="left"> +<td width="10%"></td> +<td width="6%"> + +<p><b>−J #</b></p> +</td> +<td width="2%"></td> +<td width="80%"> + +<p>Set the horizontal margin of an output page size to # +expressed in the current units.</p> +</td> +<td width="0%"> +</td> +<tr valign="top" align="left"> +<td width="10%"></td> +<td width="6%"> + +<p><b>−K #</b></p> +</td> +<td width="2%"></td> +<td width="80%"> + +<p>Set the vertical margin of an output page size to # +expressed in the current units.</p> +</td> +<td width="0%"> +</td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="8%"></td> +<td width="91%"> +<p><b>−O portrait|landscape|auto</b></p></td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="19%"></td> +<td width="80%"> +<p>Set the output orientation of the pages or sections. Auto +will use the arrangement that requires the fewest pages.</p> +</td> </table> <!-- INDENTATION --> <table width="100%" border=0 rules="none" frame="void" @@ -282,7 +399,7 @@ for color images.</p> <tr valign="top" align="left"> <td width="8%"></td> <td width="91%"> -<p><b>−b</b> <i>image</i></p></td> +<p><b>−S cols:rows</b></p></td> </table> <!-- INDENTATION --> <table width="100%" border=0 rules="none" frame="void" @@ -290,12 +407,26 @@ for color images.</p> <tr valign="top" align="left"> <td width="19%"></td> <td width="80%"> -<p>subtract the following monochrome image from all others -processed. This can be used to remove a noise bias from a -set of images. This bias image is typically an image of -noise the camera saw with its shutter closed. Bias image -support is not available with options for cropping, -rotating, or inverting the image.</p> +<p>Divide each image into cols across and rows down equal +sections.</p> +</td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="8%"></td> +<td width="91%"> +<p><b>−P page</b></p></td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="19%"></td> +<td width="80%"> +<p>Format the output images to fit on page size paper. Use +-P list to show the supported page sizes and dimensions.</p> </td> </table> <!-- TABS --> @@ -360,7 +491,7 @@ compress data according to the value of the <td width="17%"></td> <td width="82%"> <p>The <small>CCITT</small> Group 3 and Group 4 compression -algorithms can only be used with bi-level data.</p> +algorithms can only be used with bilevel data.</p> <!-- INDENTATION --> <p>Group 3 compression can be specified together with several T.4-specific options: <b>1d</b> for 1-dimensional @@ -476,12 +607,13 @@ images.</p> <td width="80%"> <p>Specify the planar configuration to use in writing image -data that has one 8-bit sample per pixel. By default, -<i>tiffcrop</i> will create a new file with the same planar -configuration as the original. Specifying <b>−p -contig</b> will force data to be written with multi-sample -data packed together, while <b>−p separate</b> will -force samples to be written in separate planes.</p> +data that has more than one 8-bit sample per pixel. By +default, <i>tiffcrop</i> will create a new file with the +same planar configuration as the original. Specifying +<b>−p contig</b> will force data to be written with +multi-sample data packed together, while <b>−p +separate</b> will force samples to be written in separate +planes.</p> </td> <td width="0%"> </td> @@ -498,7 +630,7 @@ force samples to be written in separate planes.</p> data written to the output file. By default (or when value <b>0</b> is specified), <i>tiffcrop</i> attempts to set the rows/strip that no more than 8 kilobytes of data appear in a -strip. If you specify special value <b>-1</b> it will +strip. If you specify the special value <b>-1</b> it will results in infinite number of the rows per strip. The entire image will be the one strip in that case.</p> </td> @@ -528,9 +660,7 @@ in strips (rather than tiles).</p> <td width="80%"> <p>Force the output file to be written with data organized -in tiles (rather than strips). options can be used to force -the resultant image to be written as strips or tiles of -data, respectively.</p> +in tiles (rather than strips).</p> </td> <td width="0%"> </td> @@ -647,10 +777,12 @@ to "result.tif":</p></td> <tr valign="top" align="left"> <td width="8%"></td> <td width="91%"> -<p>Given file "CCD.tif" whose first image is a -noise bias followed by images which include that bias, -subtract the noise from all those images following it (while -decompressing) with the command:</p></td> +<p>Invert a bilevel image scan of a microfilmed document and +crop off margins of 0.25 inches on the left and right, 0.5 +inch on the top, nad 0.75 inch on the bottom. From the +remaining portion of the image, select the second and third +quarters, ie, one half of the area left from the center to +each margin.</p></td> </table> <!-- INDENTATION --> <table width="100%" border=0 rules="none" frame="void" @@ -658,14 +790,49 @@ decompressing) with the command:</p></td> <tr valign="top" align="left"> <td width="17%"></td> <td width="82%"> -<pre>tiffcrop -c none -b CCD.tif CCD.tif -d 2 result.tif +<pre>tiffcrop -U in -m 0.5,0.25,0.75,0.25 -E left -Z 2:4,3:4 -I MicrofilmNegative.tif MicrofilmPostiveCenter.tif </pre> </td> </table> +<!-- INDENTATION --> + +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="8%"></td> +<td width="91%"> +<p>Extract only the final image of a large Architectural E +sized multipage TIFF file and rotate it 90 degrees clockwise +while reformatting the output to fit on tabloid sized sheets +with one quarter of an inch on each side:</p></td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="17%"></td> +<td width="82%"> +<pre>tiffcrop -N last -R 90 -O auto -P tabloid -U in -J 0.25 -K 0.25 -H 300 -V 300 Big-PlatMap.tif BigPlatMap-Tabloid.tif +</pre> +</td> +</table> +<!-- INDENTATION --> + +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="8%"></td> +<td width="91%"> +<p>The output images will have a specified resolution of 300 +dpi in both directions. The orientation of each page will be +determined by whichever choice requires the fewest pages. To +specify a specific orientation, use the portrait or +landscape option.</p> +</td> +</table> <a name="SEE ALSO"></a> <h2>SEE ALSO</h2> <!-- INDENTATION --> - <table width="100%" border=0 rules="none" frame="void" cols="2" cellspacing="0" cellpadding="0"> <tr valign="top" align="left"> diff --git a/html/man/tiffdither.1.html b/html/man/tiffdither.1.html index c03502d5..2427a901 100644 --- a/html/man/tiffdither.1.html +++ b/html/man/tiffdither.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 18:00:01 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:19 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/tiffdump.1.html b/html/man/tiffdump.1.html index f63e4277..abf0662c 100644 --- a/html/man/tiffdump.1.html +++ b/html/man/tiffdump.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 18:00:01 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:20 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/tiffgt.1.html b/html/man/tiffgt.1.html index 6865e3eb..e8bd4b23 100644 --- a/html/man/tiffgt.1.html +++ b/html/man/tiffgt.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 18:00:01 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:20 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/tiffinfo.1.html b/html/man/tiffinfo.1.html index fac0ed12..4863ed37 100644 --- a/html/man/tiffinfo.1.html +++ b/html/man/tiffinfo.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 18:00:01 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:20 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/tiffmedian.1.html b/html/man/tiffmedian.1.html index 16adbfcb..59613177 100644 --- a/html/man/tiffmedian.1.html +++ b/html/man/tiffmedian.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 18:00:01 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:20 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/tiffset.1.html b/html/man/tiffset.1.html index 712f10e9..fb4d0ed5 100644 --- a/html/man/tiffset.1.html +++ b/html/man/tiffset.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 18:00:01 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:20 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/tiffsplit.1.html b/html/man/tiffsplit.1.html index 00884b67..adbc2f88 100644 --- a/html/man/tiffsplit.1.html +++ b/html/man/tiffsplit.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 18:00:01 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:20 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/html/man/tiffsv.1.html b/html/man/tiffsv.1.html index 71937403..fb484b01 100644 --- a/html/man/tiffsv.1.html +++ b/html/man/tiffsv.1.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Sat Feb 24 18:00:01 2007 --> +<!-- CreationDate: Fri Jul 13 17:43:20 2007 --> <html> <head> <meta name="generator" content="groff -Thtml, see www.gnu.org"> diff --git a/libtiff/tiffvers.h b/libtiff/tiffvers.h index 9744f8d3..91089840 100644 --- a/libtiff/tiffvers.h +++ b/libtiff/tiffvers.h @@ -1,4 +1,4 @@ -#define TIFFLIB_VERSION_STR "LIBTIFF, Version 3.8.2\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc." +#define TIFFLIB_VERSION_STR "LIBTIFF, Version 3.9.0beta\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc." /* * This define can be used in code that requires * compilation-related definitions specific to a @@ -6,4 +6,4 @@ * version checking should be done based on the * string returned by TIFFGetVersion. */ -#define TIFFLIB_VERSION 20060323 +#define TIFFLIB_VERSION 20070713 @@ -1,13 +1,13 @@ # Portability macros for glibc argz. -*- Autoconf -*- -# Written by Gary V. Vaughan <gary@gnu.org> - -# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. - +# +# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +# Written by Gary V. Vaughan <gary@gnu.org> +# # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 4 argz.m4 +# serial 5 argz.m4 AC_DEFUN([gl_FUNC_ARGZ], [gl_PREREQ_ARGZ @@ -27,6 +27,51 @@ AC_CHECK_TYPES([error_t], ARGZ_H= AC_CHECK_FUNCS([argz_append argz_create_sep argz_insert argz_next \ argz_stringify], [], [ARGZ_H=argz.h; AC_LIBOBJ([argz])]) + +dnl if have system argz functions, allow forced use of +dnl libltdl-supplied implementation (and default to do so +dnl on "known bad" systems). Could use a runtime check, but +dnl (a) detecting malloc issues is notoriously unreliable +dnl (b) only known system that declares argz functions, +dnl provides them, yet they are broken, is cygwin +dnl releases prior to 16-Mar-2007 (1.5.24 and earlier) +dnl So, it's more straightforward simply to special case +dnl this for known bad systems. +AS_IF([test -z "$ARGZ_H"], + [AC_CACHE_CHECK( + [if argz actually works], + [lt_cv_sys_argz_works], + [[case $host_os in #( + *cygwin*) + lt_cv_sys_argz_works=no + if test "$cross_compiling" != no; then + lt_cv_sys_argz_works="guessing no" + else + lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/' + save_IFS=$IFS + IFS=-. + set x `uname -r | sed -e "$lt_sed_extract_leading_digits"` + IFS=$save_IFS + lt_os_major=${2-0} + lt_os_minor=${3-0} + lt_os_micro=${4-0} + if test "$lt_os_major" -gt 1 \ + || { test "$lt_os_major" -eq 1 \ + && { test "$lt_os_minor" -gt 5 \ + || { test "$lt_os_minor" -eq 5 \ + && test "$lt_os_micro" -gt 24; }; }; }; then + lt_cv_sys_argz_works=yes + fi + fi + ;; #( + *) lt_cv_sys_argz_works=yes ;; + esac]]) + AS_IF([test $lt_cv_sys_argz_works = yes], + [AC_DEFINE([HAVE_WORKING_ARGZ], 1, + [This value is set to 1 to indicate that the system argz facility works])], + [ARGZ_H=argz.h + AC_LIBOBJ([argz])])]) + AC_SUBST([ARGZ_H]) ]) diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 2cc55cd3..aa579d4c 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1,40 +1,40 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007 Free Software Foundation, Inc. -# -# This file is part of GNU Libtool: -# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007 Free Software Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007 Free Software Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 # -# This file is part of GNU Libtool: -# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 +# This file is part of GNU Libtool. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. # -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# GNU Libtool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ]) # serial 53 LT_INIT @@ -1232,7 +1232,7 @@ _LT_DECL([], [RANLIB], [1], [Commands used to install an old-style archive]) # Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= @@ -1437,29 +1437,35 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl fi ;; *) - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ + = "XX$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi ;; esac ]) @@ -2249,7 +2255,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[[3-9]]*) version_type=linux need_lib_prefix=no need_version=no @@ -2901,7 +2907,7 @@ hpux10.20* | hpux11*) esac ;; -interix3*) +interix[[3-9]]*) # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' ;; @@ -3216,6 +3222,7 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' # Transform an extracted symbol line into symbol name and symbol address lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3369,6 +3376,9 @@ _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], _LT_DECL([global_symbol_to_c_name_address], [lt_cv_sys_global_symbol_to_c_name_address], [1], [Transform the output of nm in a C name address pair]) +_LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3422,7 +3432,7 @@ m4_if([$1], [CXX], [ # DJGPP does not support shared libraries at all _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; - interix3*) + interix[[3-9]]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -3729,7 +3739,7 @@ m4_if([$1], [CXX], [ esac ;; - interix3*) + interix[[3-9]]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -4152,7 +4162,7 @@ _LT_EOF fi ;; - interix3*) + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' @@ -4529,10 +4539,10 @@ _LT_EOF case $cc_basename in xlc*) output_verbose_link_cmd=echo - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`$ECHO $rpath/$soname` $verstring' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`$ECHO $rpath/$soname` $xlcverstring' _LT_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_TAGVAR(module_expsym_cmds, $1)='sed "s,^,_," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -4708,25 +4718,29 @@ _LT_EOF ;; openbsd*) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac + fi + else + _LT_TAGVAR(ld_shlibs, $1)=no fi ;; @@ -5537,11 +5551,11 @@ if test "$_lt_caught_CXX_error" != yes; then case $cc_basename in xlc*) output_verbose_link_cmd=echo - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`$ECHO "$rpath/$soname"` $verstring' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`$ECHO "$rpath/$soname"` $xlcverstring' _LT_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, # it doesn't exist in older darwin lds - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_TAGVAR(module_expsym_cmds, $1)='sed "s,^,_," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -5702,7 +5716,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac ;; - interix3*) + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' @@ -5919,17 +5933,21 @@ if test "$_lt_caught_CXX_error" != yes; then ;; openbsd*) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd=echo + else + _LT_TAGVAR(ld_shlibs, $1)=no fi - output_verbose_link_cmd=echo ;; osf3* | osf4* | osf5*) @@ -6373,7 +6391,7 @@ $RM -f confest.$objext # PORTME: override above test on systems where it is broken m4_if([$1], [CXX], [case $host_os in -interix3*) +interix[[3-9]]*) # Interix 3.5 installs completely hosed .la files for C++, so rather than # hack all around it, let's just trust "g++" to DTRT. _LT_TAGVAR(predep_objects,$1)= @@ -6842,7 +6860,7 @@ AC_DEFUN([LT_PROG_GCJ], [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], [AC_CHECK_TOOL(GCJ, gcj,) test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS)])])dnl + AC_SUBST(GCJFLAGS)])])[]dnl ]) # Old name: diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 index 7961b9f4..4a6f18ac 100644 --- a/m4/ltoptions.m4 +++ b/m4/ltoptions.m4 @@ -1,7 +1,7 @@ # Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# Written by Gary V. Vaughan <gary@gnu.org> +# +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4 index fc51dc7e..c095fdfa 100644 --- a/m4/ltsugar.m4 +++ b/m4/ltsugar.m4 @@ -1,7 +1,7 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# Written by Gary V. Vaughan. +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 index e9bf1cef..478909b8 100644 --- a/m4/ltversion.m4 +++ b/m4/ltversion.m4 @@ -1,23 +1,23 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004 Free Software Foundation, Inc. -# Written by Scott James Remnant. +# Copyright (C) 2004 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004 # -## This file is free software; the Free Software Foundation gives +# This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. # Generated from ltversion.in; do not edit by hand -# serial 2410 ltversion.m4 +# serial 2477 ltversion.m4 # This file is part of GNU Libtool m4_define([LT_PACKAGE_VERSION], [2.1a]) -m4_define([LT_PACKAGE_REVISION], [1.2410]) +m4_define([LT_PACKAGE_REVISION], [1.2477]) AC_DEFUN([LTVERSION_VERSION], [macro_version='2.1a' -macro_revision='1.2410' +macro_revision='1.2477' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 index 74f5746b..d4e0a616 100644 --- a/m4/lt~obsolete.m4 +++ b/m4/lt~obsolete.m4 @@ -1,7 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# Written by Scott James Remnant. +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without |