* tools/tiffcrop.c (ROTATE_ANY): Fix Coverity 1294542 "Logical
vs. bitwise operator".
This commit is contained in:
Bob Friesenhahn
parent
7bed6738f2
commit
1752529e75
@ -1,3 +1,8 @@
|
||||
2015-05-27 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
|
||||
|
||||
* tools/tiffcrop.c (ROTATE_ANY): Fix Coverity 1294542 "Logical
|
||||
vs. bitwise operator".
|
||||
|
||||
2015-03-02 Even Rouault <even.rouault@spatialys.com>
|
||||
|
||||
* tools/tiffdither.c: check memory allocations to avoid writing to
|
||||
|
||||
@ -325,7 +325,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -269,7 +269,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
|
||||
## by inline-source v2014-01-03.01
|
||||
|
||||
# libtool (GNU libtool) 2.4.5
|
||||
# libtool (GNU libtool) 2.4.4
|
||||
# Provide generalized library-building support services.
|
||||
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
||||
|
||||
# Copyright (C) 1996-2015 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1996-2014 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.
|
||||
|
||||
@ -31,8 +31,8 @@
|
||||
|
||||
PROGRAM=libtool
|
||||
PACKAGE=libtool
|
||||
VERSION=2.4.5
|
||||
package_revision=2.4.5
|
||||
VERSION=2.4.4
|
||||
package_revision=2.4.4
|
||||
|
||||
|
||||
## ------ ##
|
||||
@ -69,7 +69,7 @@ scriptversion=2014-01-03.01; # UTC
|
||||
# General shell script boiler plate, and helper functions.
|
||||
# Written by Gary V. Vaughan, 2004
|
||||
|
||||
# Copyright (C) 2004-2015 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2004-2014 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.
|
||||
|
||||
@ -1375,7 +1375,7 @@ scriptversion=2014-01-07.03; # UTC
|
||||
# A portable, pluggable option parser for Bourne shell.
|
||||
# Written by Gary V. Vaughan, 2010
|
||||
|
||||
# Copyright (C) 2010-2015 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2010-2014 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.
|
||||
|
||||
@ -1977,7 +1977,7 @@ func_version ()
|
||||
# End:
|
||||
|
||||
# Set a version string.
|
||||
scriptversion='(GNU libtool) 2.4.5'
|
||||
scriptversion='(GNU libtool) 2.4.4'
|
||||
|
||||
|
||||
# func_echo ARG...
|
||||
@ -2063,7 +2063,7 @@ include the following information:
|
||||
compiler: $LTCC
|
||||
compiler flags: $LTCFLAGS
|
||||
linker: $LD (gnu? $with_gnu_ld)
|
||||
version: $progname (GNU libtool) 2.4.5
|
||||
version: $progname (GNU libtool) 2.4.4
|
||||
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
|
||||
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
|
||||
|
||||
@ -6461,24 +6461,6 @@ func_win32_import_lib_p ()
|
||||
esac
|
||||
}
|
||||
|
||||
# func_suncc_cstd_abi
|
||||
# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
|
||||
# Several compiler flags select an ABI that is incompatible with the
|
||||
# Cstd library. Avoid specifying it if any are in CXXFLAGS.
|
||||
func_suncc_cstd_abi ()
|
||||
{
|
||||
$debug_cmd
|
||||
|
||||
case " $compile_command " in
|
||||
*" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
|
||||
suncc_use_cstd_abi=no
|
||||
;;
|
||||
*)
|
||||
suncc_use_cstd_abi=yes
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# func_mode_link arg...
|
||||
func_mode_link ()
|
||||
{
|
||||
@ -7455,9 +7437,6 @@ func_mode_link ()
|
||||
eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
|
||||
eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
|
||||
|
||||
# Definition is injected by LT_CONFIG during libtool generation.
|
||||
func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
|
||||
|
||||
func_dirname "$output" "/" ""
|
||||
output_objdir=$func_dirname_result$objdir
|
||||
func_to_tool_file "$output_objdir/"
|
||||
@ -8620,37 +8599,6 @@ func_mode_link ()
|
||||
eval $var=\"$tmp_libs\"
|
||||
done # for var
|
||||
fi
|
||||
|
||||
# Add Sun CC postdeps if required:
|
||||
test CXX = "$tagname" && {
|
||||
case $host_os in
|
||||
linux*)
|
||||
case `$CC -V 2>&1 | sed 5q` in
|
||||
*Sun\ C*) # Sun C++ 5.9
|
||||
func_suncc_cstd_abi
|
||||
|
||||
if test no != "$suncc_use_cstd_abi"; then
|
||||
func_append postdeps ' -library=Cstd -library=Crun'
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
solaris*)
|
||||
func_cc_basename "$CC"
|
||||
case $func_cc_basename_result in
|
||||
CC* | sunCC*)
|
||||
func_suncc_cstd_abi
|
||||
|
||||
if test no != "$suncc_use_cstd_abi"; then
|
||||
func_append postdeps ' -library=Cstd -library=Crun'
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Last step: remove runtime libs from dependency_libs
|
||||
# (they stay in deplibs)
|
||||
tmp_libs=
|
||||
|
||||
234
configure
vendored
234
configure
vendored
@ -669,7 +669,6 @@ ac_ct_CXX
|
||||
CXXFLAGS
|
||||
CXX
|
||||
CPP
|
||||
LT_SYS_LIBRARY_PATH
|
||||
OTOOL64
|
||||
OTOOL
|
||||
LIPO
|
||||
@ -853,7 +852,6 @@ CFLAGS
|
||||
LDFLAGS
|
||||
LIBS
|
||||
CPPFLAGS
|
||||
LT_SYS_LIBRARY_PATH
|
||||
CPP
|
||||
CXX
|
||||
CXXFLAGS
|
||||
@ -1584,8 +1582,6 @@ Some influential environment variables:
|
||||
LIBS libraries to pass to the linker, e.g. -l<library>
|
||||
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
|
||||
you have headers in a nonstandard directory <include dir>
|
||||
LT_SYS_LIBRARY_PATH
|
||||
User-defined run-time library search path.
|
||||
CPP C preprocessor
|
||||
CXX C++ compiler command
|
||||
CXXFLAGS C++ compiler flags
|
||||
@ -4706,8 +4702,8 @@ esac
|
||||
|
||||
|
||||
|
||||
macro_version='2.4.5'
|
||||
macro_revision='2.4.5'
|
||||
macro_version='2.4.4'
|
||||
macro_revision='2.4.4'
|
||||
|
||||
|
||||
|
||||
@ -7041,21 +7037,6 @@ $as_echo "$lt_cv_truncate_bin" >&6; }
|
||||
|
||||
|
||||
|
||||
|
||||
# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
|
||||
func_cc_basename ()
|
||||
{
|
||||
for cc_temp in $*""; do
|
||||
case $cc_temp in
|
||||
compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
|
||||
distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
|
||||
\-*) ;;
|
||||
*) break;;
|
||||
esac
|
||||
done
|
||||
func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
|
||||
}
|
||||
|
||||
# Check whether --enable-libtool-lock was given.
|
||||
if test "${enable_libtool_lock+set}" = set; then :
|
||||
enableval=$enable_libtool_lock;
|
||||
@ -8063,41 +8044,6 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
|
||||
;;
|
||||
esac
|
||||
|
||||
# func_munge_path_list VARIABLE PATH
|
||||
# -----------------------------------
|
||||
# VARIABLE is name of variable containing _space_ separated list of
|
||||
# directories to be munged by the contents of PATH, which is string
|
||||
# having a format:
|
||||
# "DIR[:DIR]:"
|
||||
# string "DIR[ DIR]" will be prepended to VARIABLE
|
||||
# ":DIR[:DIR]"
|
||||
# string "DIR[ DIR]" will be appended to VARIABLE
|
||||
# "DIRP[:DIRP]::[DIRA:]DIRA"
|
||||
# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
|
||||
# "DIRA[ DIRA]" will be appended to VARIABLE
|
||||
# "DIR[:DIR]"
|
||||
# VARIABLE will be replaced by "DIR[ DIR]"
|
||||
func_munge_path_list ()
|
||||
{
|
||||
case x$2 in
|
||||
x)
|
||||
;;
|
||||
*:)
|
||||
eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
|
||||
;;
|
||||
x:*)
|
||||
eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
|
||||
;;
|
||||
*::*)
|
||||
eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
|
||||
eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
|
||||
;;
|
||||
*)
|
||||
eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
@ -8983,8 +8929,15 @@ test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
|
||||
test -z "$LD" && LD=ld
|
||||
test -z "$ac_objext" && ac_objext=o
|
||||
|
||||
func_cc_basename $compiler
|
||||
cc_basename=$func_cc_basename_result
|
||||
for cc_temp in $compiler""; do
|
||||
case $cc_temp in
|
||||
compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
|
||||
distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
|
||||
\-*) ;;
|
||||
*) break;;
|
||||
esac
|
||||
done
|
||||
cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
|
||||
|
||||
|
||||
# Only perform the check for file, if the check method requires it
|
||||
@ -11443,8 +11396,6 @@ hardcode_into_libs=no
|
||||
# flags to be left without arguments
|
||||
need_version=unknown
|
||||
|
||||
|
||||
|
||||
case $host_os in
|
||||
aix3*)
|
||||
version_type=linux # correct to gnu/linux during the next big refactor
|
||||
@ -11733,7 +11684,6 @@ freebsd* | dragonfly*)
|
||||
case $version_type in
|
||||
freebsd-elf*)
|
||||
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
||||
soname_spec='$libname$release$shared_ext$major'
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
;;
|
||||
@ -11793,11 +11743,10 @@ hpux9* | hpux10* | hpux11*)
|
||||
soname_spec='$libname$release$shared_ext$major'
|
||||
if test 32 = "$HPUX_IA64_MODE"; then
|
||||
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
|
||||
sys_lib_dlsearch_path_spec=/usr/lib/hpux32
|
||||
else
|
||||
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
|
||||
sys_lib_dlsearch_path_spec=/usr/lib/hpux64
|
||||
fi
|
||||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
hppa*64*)
|
||||
shrext_cmds='.sl'
|
||||
@ -11949,12 +11898,7 @@ fi
|
||||
# before this can be enabled.
|
||||
hardcode_into_libs=yes
|
||||
|
||||
# Ideally, we could use ldconfig to report *all* directores which are
|
||||
# searched for libraries, however this is still not possible. Aside from not
|
||||
# being certain /sbin/ldconfig is available, command
|
||||
# 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
|
||||
# even though it is searched at run-time. Try to do the best guess by
|
||||
# appending ld.so.conf contents (and includes) to the search path.
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
@ -12179,18 +12123,10 @@ fi
|
||||
if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
|
||||
sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
|
||||
fi
|
||||
|
||||
if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
|
||||
sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
|
||||
fi
|
||||
|
||||
# lt_cv_sys_lib... is unaugmented for libtool script decls...
|
||||
lt_cv_sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
|
||||
|
||||
# ..but sys_lib_... needs LT_SYS_LIBRARY_PATH munging for
|
||||
# LT_SYS_DLSEARCH_PATH macro in ltdl.m4 to work with the correct paths:
|
||||
func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
|
||||
|
||||
|
||||
|
||||
|
||||
@ -13607,8 +13543,15 @@ $RM -r conftest*
|
||||
CFLAGS=$CXXFLAGS
|
||||
compiler=$CC
|
||||
compiler_CXX=$CC
|
||||
func_cc_basename $compiler
|
||||
cc_basename=$func_cc_basename_result
|
||||
for cc_temp in $compiler""; do
|
||||
case $cc_temp in
|
||||
compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
|
||||
distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
|
||||
\-*) ;;
|
||||
*) break;;
|
||||
esac
|
||||
done
|
||||
cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
|
||||
|
||||
|
||||
if test -n "$compiler"; then
|
||||
@ -14995,6 +14938,51 @@ interix[3-9]*)
|
||||
postdep_objects_CXX=
|
||||
postdeps_CXX=
|
||||
;;
|
||||
|
||||
linux*)
|
||||
case `$CC -V 2>&1 | sed 5q` in
|
||||
*Sun\ C*)
|
||||
# Sun C++ 5.9
|
||||
|
||||
# The more standards-conforming stlport4 library is
|
||||
# incompatible with the Cstd library. Avoid specifying
|
||||
# it if it's in CXXFLAGS. Ignore libCrun as
|
||||
# -library=stlport4 depends on it.
|
||||
case " $CXX $CXXFLAGS " in
|
||||
*" -library=stlport4 "*)
|
||||
solaris_use_stlport4=yes
|
||||
;;
|
||||
esac
|
||||
|
||||
if test yes != "$solaris_use_stlport4"; then
|
||||
postdeps_CXX='-library=Cstd -library=Crun'
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
solaris*)
|
||||
case $cc_basename in
|
||||
CC* | sunCC*)
|
||||
# The more standards-conforming stlport4 library is
|
||||
# incompatible with the Cstd library. Avoid specifying
|
||||
# it if it's in CXXFLAGS. Ignore libCrun as
|
||||
# -library=stlport4 depends on it.
|
||||
case " $CXX $CXXFLAGS " in
|
||||
*" -library=stlport4 "*)
|
||||
solaris_use_stlport4=yes
|
||||
;;
|
||||
esac
|
||||
|
||||
# Adding this requires a known-good setup of shared libraries for
|
||||
# Sun compiler versions before 5.6, else PIC objects from an old
|
||||
# archive will be linked into the output, leading to subtle bugs.
|
||||
if test yes != "$solaris_use_stlport4"; then
|
||||
postdeps_CXX='-library=Cstd -library=Crun'
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
@ -15818,8 +15806,6 @@ hardcode_into_libs=no
|
||||
# flags to be left without arguments
|
||||
need_version=unknown
|
||||
|
||||
|
||||
|
||||
case $host_os in
|
||||
aix3*)
|
||||
version_type=linux # correct to gnu/linux during the next big refactor
|
||||
@ -16106,7 +16092,6 @@ freebsd* | dragonfly*)
|
||||
case $version_type in
|
||||
freebsd-elf*)
|
||||
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
||||
soname_spec='$libname$release$shared_ext$major'
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
;;
|
||||
@ -16166,11 +16151,10 @@ hpux9* | hpux10* | hpux11*)
|
||||
soname_spec='$libname$release$shared_ext$major'
|
||||
if test 32 = "$HPUX_IA64_MODE"; then
|
||||
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
|
||||
sys_lib_dlsearch_path_spec=/usr/lib/hpux32
|
||||
else
|
||||
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
|
||||
sys_lib_dlsearch_path_spec=/usr/lib/hpux64
|
||||
fi
|
||||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
hppa*64*)
|
||||
shrext_cmds='.sl'
|
||||
@ -16322,12 +16306,7 @@ fi
|
||||
# before this can be enabled.
|
||||
hardcode_into_libs=yes
|
||||
|
||||
# Ideally, we could use ldconfig to report *all* directores which are
|
||||
# searched for libraries, however this is still not possible. Aside from not
|
||||
# being certain /sbin/ldconfig is available, command
|
||||
# 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
|
||||
# even though it is searched at run-time. Try to do the best guess by
|
||||
# appending ld.so.conf contents (and includes) to the search path.
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
@ -16552,18 +16531,10 @@ fi
|
||||
if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
|
||||
sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
|
||||
fi
|
||||
|
||||
if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
|
||||
sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
|
||||
fi
|
||||
|
||||
# lt_cv_sys_lib... is unaugmented for libtool script decls...
|
||||
lt_cv_sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
|
||||
|
||||
# ..but sys_lib_... needs LT_SYS_LIBRARY_PATH munging for
|
||||
# LT_SYS_DLSEARCH_PATH macro in ltdl.m4 to work with the correct paths:
|
||||
func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
|
||||
|
||||
|
||||
|
||||
|
||||
@ -21392,7 +21363,7 @@ finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
|
||||
finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
|
||||
hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
|
||||
sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
|
||||
lt_cv_sys_lib_dlsearch_path_spec='`$ECHO "$lt_cv_sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
|
||||
sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
|
||||
hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
|
||||
enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
|
||||
enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
|
||||
@ -21596,7 +21567,7 @@ postinstall_cmds \
|
||||
postuninstall_cmds \
|
||||
finish_cmds \
|
||||
sys_lib_search_path_spec \
|
||||
lt_cv_sys_lib_dlsearch_path_spec \
|
||||
sys_lib_dlsearch_path_spec \
|
||||
reload_cmds_CXX \
|
||||
old_archive_cmds_CXX \
|
||||
old_archive_from_new_cmds_CXX \
|
||||
@ -22406,9 +22377,6 @@ $as_echo X"$file" |
|
||||
# The names of the tagged configurations supported by this script.
|
||||
available_tags='CXX '
|
||||
|
||||
# Configured defaults for sys_lib_dlsearch_path munging.
|
||||
: \${LT_SYS_LIBRARY_PATH="$LT_SYS_LIBRARY_PATH"}
|
||||
|
||||
# ### BEGIN LIBTOOL CONFIG
|
||||
|
||||
# Which release of libtool.m4 was used?
|
||||
@ -22662,7 +22630,7 @@ hardcode_into_libs=$hardcode_into_libs
|
||||
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
|
||||
|
||||
# Run-time system search path for libraries.
|
||||
sys_lib_dlsearch_path_spec=$lt_lt_cv_sys_lib_dlsearch_path_spec
|
||||
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
|
||||
|
||||
# Whether dlopen is supported.
|
||||
dlopen_support=$enable_dlopen
|
||||
@ -22825,64 +22793,6 @@ compiler_lib_search_path=$lt_compiler_lib_search_path
|
||||
|
||||
# ### END LIBTOOL CONFIG
|
||||
|
||||
_LT_EOF
|
||||
|
||||
cat <<'_LT_EOF' >> "$cfgfile"
|
||||
## -------------------------------------- ##
|
||||
## Shell functions shared with configure. ##
|
||||
## -------------------------------------- ##
|
||||
|
||||
# func_munge_path_list VARIABLE PATH
|
||||
# -----------------------------------
|
||||
# VARIABLE is name of variable containing _space_ separated list of
|
||||
# directories to be munged by the contents of PATH, which is string
|
||||
# having a format:
|
||||
# "DIR[:DIR]:"
|
||||
# string "DIR[ DIR]" will be prepended to VARIABLE
|
||||
# ":DIR[:DIR]"
|
||||
# string "DIR[ DIR]" will be appended to VARIABLE
|
||||
# "DIRP[:DIRP]::[DIRA:]DIRA"
|
||||
# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
|
||||
# "DIRA[ DIRA]" will be appended to VARIABLE
|
||||
# "DIR[:DIR]"
|
||||
# VARIABLE will be replaced by "DIR[ DIR]"
|
||||
func_munge_path_list ()
|
||||
{
|
||||
case x$2 in
|
||||
x)
|
||||
;;
|
||||
*:)
|
||||
eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
|
||||
;;
|
||||
x:*)
|
||||
eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
|
||||
;;
|
||||
*::*)
|
||||
eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
|
||||
eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
|
||||
;;
|
||||
*)
|
||||
eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
|
||||
# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
|
||||
func_cc_basename ()
|
||||
{
|
||||
for cc_temp in $*""; do
|
||||
case $cc_temp in
|
||||
compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
|
||||
distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
|
||||
\-*) ;;
|
||||
*) break;;
|
||||
esac
|
||||
done
|
||||
func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
|
||||
}
|
||||
|
||||
|
||||
_LT_EOF
|
||||
|
||||
case $host_os in
|
||||
|
||||
@ -268,7 +268,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -259,7 +259,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -312,7 +312,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -211,7 +211,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -258,7 +258,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -208,7 +208,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -208,7 +208,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -208,7 +208,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -208,7 +208,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -208,7 +208,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -208,7 +208,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -300,7 +300,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -239,7 +239,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -239,7 +239,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -360,7 +360,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Id: tif_stream.cxx,v 1.12 2014-12-26 16:01:05 bfriesen Exp $ */
|
||||
/* $Id: tif_stream.cxx,v 1.13 2015-05-28 01:50:22 bfriesen Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988-1996 Sam Leffler
|
||||
@ -421,9 +421,10 @@ TIFFStreamOpen(const char* name, istream *is)
|
||||
|
||||
/* vim: set ts=8 sts=8 sw=8 noet: */
|
||||
/*
|
||||
Local Variables:
|
||||
mode: c
|
||||
indent-tabs-mode: true
|
||||
c-basic-offset: 8
|
||||
End:
|
||||
* Local Variables:
|
||||
* mode: c
|
||||
* c-basic-offset: 8
|
||||
* fill-column: 78
|
||||
* End:
|
||||
*/
|
||||
|
||||
|
||||
154
m4/libtool.m4
vendored
154
m4/libtool.m4
vendored
@ -1,6 +1,6 @@
|
||||
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
||||
#
|
||||
# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1996-2001, 2003-2014 Free Software Foundation, Inc.
|
||||
# Written by Gordon Matzigkeit, 1996
|
||||
#
|
||||
# This file is free software; the Free Software Foundation gives
|
||||
@ -103,13 +103,11 @@ dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
|
||||
dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
|
||||
|
||||
|
||||
# _LT_PREPARE_CC_BASENAME
|
||||
# -----------------------
|
||||
m4_defun([_LT_PREPARE_CC_BASENAME], [
|
||||
# _LT_CC_BASENAME(CC)
|
||||
# -------------------
|
||||
# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
|
||||
func_cc_basename ()
|
||||
{
|
||||
for cc_temp in @S|@*""; do
|
||||
m4_defun([_LT_CC_BASENAME],
|
||||
[for cc_temp in $1""; do
|
||||
case $cc_temp in
|
||||
compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
|
||||
distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
|
||||
@ -117,22 +115,7 @@ func_cc_basename ()
|
||||
*) break;;
|
||||
esac
|
||||
done
|
||||
func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
|
||||
}
|
||||
])# _LT_PREPARE_CC_BASENAME
|
||||
|
||||
|
||||
# _LT_CC_BASENAME(CC)
|
||||
# -------------------
|
||||
# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
|
||||
# but that macro is also expanded into generated libtool script, which
|
||||
# arranges for $SED and $ECHO to be set by different means.
|
||||
m4_defun([_LT_CC_BASENAME],
|
||||
[m4_require([_LT_PREPARE_CC_BASENAME])dnl
|
||||
AC_REQUIRE([_LT_DECL_SED])dnl
|
||||
AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
|
||||
func_cc_basename $1
|
||||
cc_basename=$func_cc_basename_result
|
||||
cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
|
||||
])
|
||||
|
||||
|
||||
@ -737,24 +720,11 @@ _LT_CONFIG_SAVE_COMMANDS([
|
||||
_LT_COPYING
|
||||
_LT_LIBTOOL_TAGS
|
||||
|
||||
# Configured defaults for sys_lib_dlsearch_path munging.
|
||||
: \${LT_SYS_LIBRARY_PATH="$LT_SYS_LIBRARY_PATH"}
|
||||
|
||||
# ### BEGIN LIBTOOL CONFIG
|
||||
_LT_LIBTOOL_CONFIG_VARS
|
||||
_LT_LIBTOOL_TAG_VARS
|
||||
# ### END LIBTOOL CONFIG
|
||||
|
||||
_LT_EOF
|
||||
|
||||
cat <<'_LT_EOF' >> "$cfgfile"
|
||||
## -------------------------------------- ##
|
||||
## Shell functions shared with configure. ##
|
||||
## -------------------------------------- ##
|
||||
|
||||
_LT_PREPARE_MUNGE_PATH_LIST
|
||||
_LT_PREPARE_CC_BASENAME
|
||||
|
||||
_LT_EOF
|
||||
|
||||
case $host_os in
|
||||
@ -2232,47 +2202,6 @@ _LT_DECL([], [striplib], [1])
|
||||
])# _LT_CMD_STRIPLIB
|
||||
|
||||
|
||||
# _LT_PREPARE_MUNGE_PATH_LIST
|
||||
# ---------------------------
|
||||
# Make sure func_munge_path_list() is defined correctly.
|
||||
m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
|
||||
[[# func_munge_path_list VARIABLE PATH
|
||||
# -----------------------------------
|
||||
# VARIABLE is name of variable containing _space_ separated list of
|
||||
# directories to be munged by the contents of PATH, which is string
|
||||
# having a format:
|
||||
# "DIR[:DIR]:"
|
||||
# string "DIR[ DIR]" will be prepended to VARIABLE
|
||||
# ":DIR[:DIR]"
|
||||
# string "DIR[ DIR]" will be appended to VARIABLE
|
||||
# "DIRP[:DIRP]::[DIRA:]DIRA"
|
||||
# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
|
||||
# "DIRA[ DIRA]" will be appended to VARIABLE
|
||||
# "DIR[:DIR]"
|
||||
# VARIABLE will be replaced by "DIR[ DIR]"
|
||||
func_munge_path_list ()
|
||||
{
|
||||
case x@S|@2 in
|
||||
x)
|
||||
;;
|
||||
*:)
|
||||
eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \$@S|@1\"
|
||||
;;
|
||||
x:*)
|
||||
eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
|
||||
;;
|
||||
*::*)
|
||||
eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
|
||||
eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
|
||||
;;
|
||||
*)
|
||||
eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
]])# _LT_PREPARE_PATH_LIST
|
||||
|
||||
|
||||
# _LT_SYS_DYNAMIC_LINKER([TAG])
|
||||
# -----------------------------
|
||||
# PORTME Fill in your ld.so characteristics
|
||||
@ -2283,7 +2212,6 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
|
||||
m4_require([_LT_DECL_OBJDUMP])dnl
|
||||
m4_require([_LT_DECL_SED])dnl
|
||||
m4_require([_LT_CHECK_SHELL_FEATURES])dnl
|
||||
m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
|
||||
AC_MSG_CHECKING([dynamic linker characteristics])
|
||||
m4_if([$1],
|
||||
[], [
|
||||
@ -2378,9 +2306,6 @@ hardcode_into_libs=no
|
||||
# flags to be left without arguments
|
||||
need_version=unknown
|
||||
|
||||
AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
|
||||
[User-defined run-time library search path.])
|
||||
|
||||
case $host_os in
|
||||
aix3*)
|
||||
version_type=linux # correct to gnu/linux during the next big refactor
|
||||
@ -2669,7 +2594,6 @@ freebsd* | dragonfly*)
|
||||
case $version_type in
|
||||
freebsd-elf*)
|
||||
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
||||
soname_spec='$libname$release$shared_ext$major'
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
;;
|
||||
@ -2729,11 +2653,10 @@ hpux9* | hpux10* | hpux11*)
|
||||
soname_spec='$libname$release$shared_ext$major'
|
||||
if test 32 = "$HPUX_IA64_MODE"; then
|
||||
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
|
||||
sys_lib_dlsearch_path_spec=/usr/lib/hpux32
|
||||
else
|
||||
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
|
||||
sys_lib_dlsearch_path_spec=/usr/lib/hpux64
|
||||
fi
|
||||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
hppa*64*)
|
||||
shrext_cmds='.sl'
|
||||
@ -2866,12 +2789,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
||||
# before this can be enabled.
|
||||
hardcode_into_libs=yes
|
||||
|
||||
# Ideally, we could use ldconfig to report *all* directores which are
|
||||
# searched for libraries, however this is still not possible. Aside from not
|
||||
# being certain /sbin/ldconfig is available, command
|
||||
# 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
|
||||
# even though it is searched at run-time. Try to do the best guess by
|
||||
# appending ld.so.conf contents (and includes) to the search path.
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
@ -3095,18 +3013,10 @@ fi
|
||||
if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
|
||||
sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
|
||||
fi
|
||||
|
||||
if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
|
||||
sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
|
||||
fi
|
||||
|
||||
# lt_cv_sys_lib... is unaugmented for libtool script decls...
|
||||
lt_cv_sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
|
||||
|
||||
# ..but sys_lib_... needs LT_SYS_LIBRARY_PATH munging for
|
||||
# LT_SYS_DLSEARCH_PATH macro in ltdl.m4 to work with the correct paths:
|
||||
func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
|
||||
|
||||
_LT_DECL([], [variables_saved_for_relink], [1],
|
||||
[Variables whose values should be saved in libtool wrapper scripts and
|
||||
restored at link time])
|
||||
@ -3139,7 +3049,7 @@ _LT_DECL([], [hardcode_into_libs], [0],
|
||||
[Whether we should hardcode library paths into libraries])
|
||||
_LT_DECL([], [sys_lib_search_path_spec], [2],
|
||||
[Compile-time system search path for libraries])
|
||||
_LT_DECL([sys_lib_dlsearch_path_spec], [lt_cv_sys_lib_dlsearch_path_spec], [2],
|
||||
_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
|
||||
[Run-time system search path for libraries])
|
||||
])# _LT_SYS_DYNAMIC_LINKER
|
||||
|
||||
@ -7440,7 +7350,6 @@ func_stripname_cnf ()
|
||||
} # func_stripname_cnf
|
||||
])# _LT_FUNC_STRIPNAME_CNF
|
||||
|
||||
|
||||
# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
|
||||
# ---------------------------------
|
||||
# Figure out "hidden" library dependencies from verbose
|
||||
@ -7619,6 +7528,51 @@ interix[[3-9]]*)
|
||||
_LT_TAGVAR(postdep_objects,$1)=
|
||||
_LT_TAGVAR(postdeps,$1)=
|
||||
;;
|
||||
|
||||
linux*)
|
||||
case `$CC -V 2>&1 | sed 5q` in
|
||||
*Sun\ C*)
|
||||
# Sun C++ 5.9
|
||||
|
||||
# The more standards-conforming stlport4 library is
|
||||
# incompatible with the Cstd library. Avoid specifying
|
||||
# it if it's in CXXFLAGS. Ignore libCrun as
|
||||
# -library=stlport4 depends on it.
|
||||
case " $CXX $CXXFLAGS " in
|
||||
*" -library=stlport4 "*)
|
||||
solaris_use_stlport4=yes
|
||||
;;
|
||||
esac
|
||||
|
||||
if test yes != "$solaris_use_stlport4"; then
|
||||
_LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
solaris*)
|
||||
case $cc_basename in
|
||||
CC* | sunCC*)
|
||||
# The more standards-conforming stlport4 library is
|
||||
# incompatible with the Cstd library. Avoid specifying
|
||||
# it if it's in CXXFLAGS. Ignore libCrun as
|
||||
# -library=stlport4 depends on it.
|
||||
case " $CXX $CXXFLAGS " in
|
||||
*" -library=stlport4 "*)
|
||||
solaris_use_stlport4=yes
|
||||
;;
|
||||
esac
|
||||
|
||||
# Adding this requires a known-good setup of shared libraries for
|
||||
# Sun compiler versions before 5.6, else PIC objects from an old
|
||||
# archive will be linked into the output, leading to subtle bugs.
|
||||
if test yes != "$solaris_use_stlport4"; then
|
||||
_LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
])
|
||||
|
||||
|
||||
2
m4/ltoptions.m4
vendored
2
m4/ltoptions.m4
vendored
@ -1,6 +1,6 @@
|
||||
# Helper functions for option handling. -*- Autoconf -*-
|
||||
#
|
||||
# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
|
||||
# Copyright (C) 2004-2005, 2007-2009, 2011-2014 Free Software
|
||||
# Foundation, Inc.
|
||||
# Written by Gary V. Vaughan, 2004
|
||||
#
|
||||
|
||||
2
m4/ltsugar.m4
vendored
2
m4/ltsugar.m4
vendored
@ -1,6 +1,6 @@
|
||||
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
|
||||
#
|
||||
# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
|
||||
# Copyright (C) 2004-2005, 2007-2008, 2011-2014 Free Software
|
||||
# Foundation, Inc.
|
||||
# Written by Gary V. Vaughan, 2004
|
||||
#
|
||||
|
||||
12
m4/ltversion.m4
vendored
12
m4/ltversion.m4
vendored
@ -1,6 +1,6 @@
|
||||
# ltversion.m4 -- version numbers -*- Autoconf -*-
|
||||
#
|
||||
# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2004, 2011-2014 Free Software Foundation, Inc.
|
||||
# Written by Scott James Remnant, 2004
|
||||
#
|
||||
# This file is free software; the Free Software Foundation gives
|
||||
@ -9,15 +9,15 @@
|
||||
|
||||
# @configure_input@
|
||||
|
||||
# serial 4171 ltversion.m4
|
||||
# serial 4151 ltversion.m4
|
||||
# This file is part of GNU Libtool
|
||||
|
||||
m4_define([LT_PACKAGE_VERSION], [2.4.5])
|
||||
m4_define([LT_PACKAGE_REVISION], [2.4.5])
|
||||
m4_define([LT_PACKAGE_VERSION], [2.4.4])
|
||||
m4_define([LT_PACKAGE_REVISION], [2.4.4])
|
||||
|
||||
AC_DEFUN([LTVERSION_VERSION],
|
||||
[macro_version='2.4.5'
|
||||
macro_revision='2.4.5'
|
||||
[macro_version='2.4.4'
|
||||
macro_revision='2.4.4'
|
||||
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
|
||||
_LT_DECL(, macro_revision, 0)
|
||||
])
|
||||
|
||||
2
m4/lt~obsolete.m4
vendored
2
m4/lt~obsolete.m4
vendored
@ -1,6 +1,6 @@
|
||||
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
|
||||
#
|
||||
# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
|
||||
# Copyright (C) 2004-2005, 2007, 2009, 2011-2014 Free Software
|
||||
# Foundation, Inc.
|
||||
# Written by Scott James Remnant, 2004.
|
||||
#
|
||||
|
||||
@ -240,7 +240,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -258,7 +258,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -490,7 +490,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -368,7 +368,6 @@ LIBTOOL = @LIBTOOL@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Id: tiffcrop.c,v 1.25 2014-12-26 16:32:32 bfriesen Exp $ */
|
||||
/* $Id: tiffcrop.c,v 1.26 2015-05-28 01:50:23 bfriesen Exp $ */
|
||||
|
||||
/* tiffcrop.c -- a port of tiffcp.c extended to include manipulations of
|
||||
* the image data through additional options listed below
|
||||
@ -178,7 +178,7 @@ extern int getopt(int, char**, char*);
|
||||
#define ROTATECW_90 8
|
||||
#define ROTATECW_180 16
|
||||
#define ROTATECW_270 32
|
||||
#define ROTATE_ANY ROTATECW_90 || ROTATECW_180 || ROTATECW_270
|
||||
#define ROTATE_ANY (ROTATECW_90 | ROTATECW_180 | ROTATECW_270)
|
||||
|
||||
#define CROP_NONE 0
|
||||
#define CROP_MARGINS 1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user