is a library for the dynamic creation of images by programmers (PNG, JPEG, GIF, WebP, XPM, BMP support).
| ltmain.sh (libgd-2.3.1) | : | ltmain.sh (libgd-2.3.2) |
|---|
| | |
| skipping to change at line 33 | | skipping to change at line 33 |
|---|
| # GNU Libtool is distributed in the hope that it will be useful, but | | # GNU Libtool is distributed in the hope that it will be useful, but |
| # WITHOUT ANY WARRANTY; without even the implied warranty of | | # WITHOUT ANY WARRANTY; without even the implied warranty of |
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| # General Public License for more details. | | # General Public License for more details. |
| # | | # |
| # You should have received a copy of the GNU General Public License | | # You should have received a copy of the GNU General Public License |
| # along with this program. If not, see <http://www.gnu.org/licenses/>. | | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
| | |
| PROGRAM=libtool | | PROGRAM=libtool |
| PACKAGE=libtool | | PACKAGE=libtool |
|
| VERSION="2.4.6 Debian-2.4.6-2" | | VERSION=2.4.6 |
| package_revision=2.4.6 | | package_revision=2.4.6 |
| | |
| ## ------ ## | | ## ------ ## |
| ## Usage. ## | | ## Usage. ## |
| ## ------ ## | | ## ------ ## |
| | |
| # Run './libtool --help' for help with using this script from the | | # Run './libtool --help' for help with using this script from the |
| # command line. | | # command line. |
| | |
| ## ------------------------------- ## | | ## ------------------------------- ## |
| | |
| skipping to change at line 63 | | skipping to change at line 63 |
|---|
| : ${AUTOMAKE="automake"} | | : ${AUTOMAKE="automake"} |
| | |
| ## -------------------------- ## | | ## -------------------------- ## |
| ## Source external libraries. ## | | ## Source external libraries. ## |
| ## -------------------------- ## | | ## -------------------------- ## |
| | |
| # Much of our low-level functionality needs to be sourced from external | | # Much of our low-level functionality needs to be sourced from external |
| # libraries, which are installed to $pkgauxdir. | | # libraries, which are installed to $pkgauxdir. |
| | |
| # Set a version string for this script. | | # Set a version string for this script. |
|
| scriptversion=2015-01-20.17; # UTC | | scriptversion=2015-10-04.22; # UTC |
| | |
| # General shell script boiler plate, and helper functions. | | # General shell script boiler plate, and helper functions. |
| # Written by Gary V. Vaughan, 2004 | | # Written by Gary V. Vaughan, 2004 |
| | |
| # Copyright (C) 2004-2015 Free Software Foundation, Inc. | | # Copyright (C) 2004-2015 Free Software Foundation, Inc. |
| # This is free software; see the source for copying conditions. There is NO | | # This is free software; see the source for copying conditions. There is NO |
| # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| | |
| # This program is free software; you can redistribute it and/or modify | | # 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 | | # it under the terms of the GNU General Public License as published by |
| | |
| skipping to change at line 1055 | | skipping to change at line 1055 |
|---|
| if test -n "$func_relative_path_result"; then | | if test -n "$func_relative_path_result"; then |
| func_stripname './' '' "$func_relative_path_result" | | func_stripname './' '' "$func_relative_path_result" |
| func_relative_path_result=$func_stripname_result | | func_relative_path_result=$func_stripname_result |
| fi | | fi |
| | |
| test -n "$func_relative_path_result" || func_relative_path_result=. | | test -n "$func_relative_path_result" || func_relative_path_result=. |
| | |
| : | | : |
| } | | } |
| | |
|
| | # func_quote ARG |
| | # -------------- |
| | # Aesthetically quote one ARG, store the result into $func_quote_result. Note |
| | # that we keep attention to performance here (so far O(N) complexity as long as |
| | # func_append is O(1)). |
| | func_quote () |
| | { |
| | $debug_cmd |
| | |
| | func_quote_result=$1 |
| | |
| | case $func_quote_result in |
| | *[\\\`\"\$]*) |
| | case $func_quote_result in |
| | *[\[\*\?]*) |
| | func_quote_result=`$ECHO "$func_quote_result" | $SED "$sed_quote_sub |
| | st"` |
| | return 0 |
| | ;; |
| | esac |
| | |
| | func_quote_old_IFS=$IFS |
| | for _G_char in '\' '`' '"' '$' |
| | do |
| | # STATE($1) PREV($2) SEPARATOR($3) |
| | set start "" "" |
| | func_quote_result=dummy"$_G_char$func_quote_result$_G_char"dummy |
| | IFS=$_G_char |
| | for _G_part in $func_quote_result |
| | do |
| | case $1 in |
| | quote) |
| | func_append func_quote_result "$3$2" |
| | set quote "$_G_part" "\\$_G_char" |
| | ;; |
| | start) |
| | set first "" "" |
| | func_quote_result= |
| | ;; |
| | first) |
| | set quote "$_G_part" "" |
| | ;; |
| | esac |
| | done |
| | IFS=$func_quote_old_IFS |
| | done |
| | ;; |
| | *) ;; |
| | esac |
| | } |
| | |
| # func_quote_for_eval ARG... | | # func_quote_for_eval ARG... |
| # -------------------------- | | # -------------------------- |
| # Aesthetically quote ARGs to be evaled later. | | # Aesthetically quote ARGs to be evaled later. |
| # This function returns two values: | | # This function returns two values: |
| # i) func_quote_for_eval_result | | # i) func_quote_for_eval_result |
| # double-quoted, suitable for a subsequent eval | | # double-quoted, suitable for a subsequent eval |
| # ii) func_quote_for_eval_unquoted_result | | # ii) func_quote_for_eval_unquoted_result |
| # has all characters that are still active within double | | # has all characters that are still active within double |
| # quotes backslashified. | | # quotes backslashified. |
| func_quote_for_eval () | | func_quote_for_eval () |
| { | | { |
| $debug_cmd | | $debug_cmd |
| | |
| func_quote_for_eval_unquoted_result= | | func_quote_for_eval_unquoted_result= |
| func_quote_for_eval_result= | | func_quote_for_eval_result= |
| while test 0 -lt $#; do | | while test 0 -lt $#; do |
|
| case $1 in | | func_quote "$1" |
| *[\\\`\"\$]*) | | _G_unquoted_arg=$func_quote_result |
| _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; | | |
| *) | | |
| _G_unquoted_arg=$1 ;; | | |
| esac | | |
| if test -n "$func_quote_for_eval_unquoted_result"; then | | if test -n "$func_quote_for_eval_unquoted_result"; then |
| func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" | | func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" |
| else | | else |
| func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" | | func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" |
| fi | | fi |
| | |
| case $_G_unquoted_arg in | | case $_G_unquoted_arg in |
| # Double-quote args containing shell metacharacters to delay | | # Double-quote args containing shell metacharacters to delay |
| # word splitting, command substitution and variable expansion | | # word splitting, command substitution and variable expansion |
| # for a subsequent eval. | | # for a subsequent eval. |
| | |
| skipping to change at line 1996 | | skipping to change at line 2042 |
|---|
| Try '$progname --help --mode=MODE' for a more detailed description of MODE. | | Try '$progname --help --mode=MODE' for a more detailed description of MODE. |
| | |
| When reporting a bug, please describe a test case to reproduce it and | | When reporting a bug, please describe a test case to reproduce it and |
| include the following information: | | include the following information: |
| | |
| host-triplet: $host | | host-triplet: $host |
| shell: $SHELL | | shell: $SHELL |
| compiler: $LTCC | | compiler: $LTCC |
| compiler flags: $LTCFLAGS | | compiler flags: $LTCFLAGS |
| linker: $LD (gnu? $with_gnu_ld) | | linker: $LD (gnu? $with_gnu_ld) |
|
| version: $progname $scriptversion Debian-2.4.6-2 | | version: $progname (GNU libtool) 2.4.6 |
| automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` | | automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` |
| autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` | | autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` |
| | |
| Report bugs to <bug-libtool@gnu.org>. | | Report bugs to <bug-libtool@gnu.org>. |
|
| GNU libtool home page: <http://www.gnu.org/s/libtool/>. | | GNU libtool home page: <http://www.gnu.org/software/libtool/>. |
| General help using GNU software: <http://www.gnu.org/gethelp/>." | | General help using GNU software: <http://www.gnu.org/gethelp/>." |
| exit 0 | | exit 0 |
| } | | } |
| | |
| # func_lo2o OBJECT-NAME | | # func_lo2o OBJECT-NAME |
| # --------------------- | | # --------------------- |
| # Transform OBJECT-NAME from a '.lo' suffix to the platform specific | | # Transform OBJECT-NAME from a '.lo' suffix to the platform specific |
| # object suffix. | | # object suffix. |
| | |
| lo2o=s/\\.lo\$/.$objext/ | | lo2o=s/\\.lo\$/.$objext/ |
| | |
| skipping to change at line 5132 | | skipping to change at line 5178 |
|---|
| # This environment variable determines our operation mode. | | # This environment variable determines our operation mode. |
| if test \"\$libtool_install_magic\" = \"$magic\"; then | | if test \"\$libtool_install_magic\" = \"$magic\"; then |
| # install mode needs the following variables: | | # install mode needs the following variables: |
| generated_by_libtool_version='$macro_version' | | generated_by_libtool_version='$macro_version' |
| notinst_deplibs='$notinst_deplibs' | | notinst_deplibs='$notinst_deplibs' |
| else | | else |
| # When we are sourced in execute mode, \$file and \$ECHO are already set. | | # When we are sourced in execute mode, \$file and \$ECHO are already set. |
| if test \"\$libtool_execute_magic\" != \"$magic\"; then | | if test \"\$libtool_execute_magic\" != \"$magic\"; then |
| file=\"\$0\"" | | file=\"\$0\"" |
| | |
|
| qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` | | func_quote "$ECHO" |
| | qECHO=$func_quote_result |
| $ECHO "\ | | $ECHO "\ |
| | |
| # A function that is used when there is no print builtin or printf. | | # A function that is used when there is no print builtin or printf. |
| func_fallback_echo () | | func_fallback_echo () |
| { | | { |
| eval 'cat <<_LTECHO_EOF | | eval 'cat <<_LTECHO_EOF |
| \$1 | | \$1 |
| _LTECHO_EOF' | | _LTECHO_EOF' |
| } | | } |
| ECHO=\"$qECHO\" | | ECHO=\"$qECHO\" |
| | |
| skipping to change at line 7147 | | skipping to change at line 7194 |
|---|
| # -F/path path to uninstalled frameworks, gcc on darwin | | # -F/path path to uninstalled frameworks, gcc on darwin |
| # -p, -pg, --coverage, -fprofile-* profiling flags for GCC | | # -p, -pg, --coverage, -fprofile-* profiling flags for GCC |
| # -fstack-protector* stack protector flags for GCC | | # -fstack-protector* stack protector flags for GCC |
| # @file GCC response files | | # @file GCC response files |
| # -tp=* Portland pgcc target processor selection | | # -tp=* Portland pgcc target processor selection |
| # --sysroot=* for sysroot support | | # --sysroot=* for sysroot support |
| # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimizati
on | | # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimizati
on |
| # -specs=* GCC specs files | | # -specs=* GCC specs files |
| # -stdlib=* select c++ std lib with clang | | # -stdlib=* select c++ std lib with clang |
| # -fsanitize=* Clang/GCC memory and address sanitizer | | # -fsanitize=* Clang/GCC memory and address sanitizer |
|
| | # -fuse-ld=* Linker select flags for GCC |
| -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ | | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ |
| -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*|
\ | | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*|
\ |
| -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|
\ | | -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|
\ |
|
| -specs=*|-fsanitize=*) | | -specs=*|-fsanitize=*|-fuse-ld=*) |
| func_quote_for_eval "$arg" | | func_quote_for_eval "$arg" |
| arg=$func_quote_for_eval_result | | arg=$func_quote_for_eval_result |
| func_append compile_command " $arg" | | func_append compile_command " $arg" |
| func_append finalize_command " $arg" | | func_append finalize_command " $arg" |
| func_append compiler_flags " $arg" | | func_append compiler_flags " $arg" |
| continue | | continue |
| ;; | | ;; |
| | |
| -Z*) | | -Z*) |
| if test os2 = "`expr $host : '.*\(os2\)'`"; then | | if test os2 = "`expr $host : '.*\(os2\)'`"; then |
| | |
| skipping to change at line 7443 | | skipping to change at line 7491 |
|---|
| | |
| if test lib,link = "$linkmode,$pass" || | | if test lib,link = "$linkmode,$pass" || |
| test prog,scan = "$linkmode,$pass"; then | | test prog,scan = "$linkmode,$pass"; then |
| libs=$deplibs | | libs=$deplibs |
| deplibs= | | deplibs= |
| fi | | fi |
| if test prog = "$linkmode"; then | | if test prog = "$linkmode"; then |
| case $pass in | | case $pass in |
| dlopen) libs=$dlfiles ;; | | dlopen) libs=$dlfiles ;; |
| dlpreopen) libs=$dlprefiles ;; | | dlpreopen) libs=$dlprefiles ;; |
|
| link) | | link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; |
| libs="$deplibs %DEPLIBS%" | | |
| test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" | | |
| ;; | | |
| esac | | esac |
| fi | | fi |
| if test lib,dlpreopen = "$linkmode,$pass"; then | | if test lib,dlpreopen = "$linkmode,$pass"; then |
| # Collect and forward deplibs of preopened libtool libs | | # Collect and forward deplibs of preopened libtool libs |
| for lib in $dlprefiles; do | | for lib in $dlprefiles; do |
| # Ignore non-libtool-libs | | # Ignore non-libtool-libs |
| dependency_libs= | | dependency_libs= |
| func_resolve_sysroot "$lib" | | func_resolve_sysroot "$lib" |
| case $lib in | | case $lib in |
| *.la) func_source "$func_resolve_sysroot_result" ;; | | *.la) func_source "$func_resolve_sysroot_result" ;; |
| | |
| skipping to change at line 7764 | | skipping to change at line 7809 |
|---|
| if test conv = "$pass"; then | | if test conv = "$pass"; then |
| # Only check for convenience libraries | | # Only check for convenience libraries |
| deplibs="$lib $deplibs" | | deplibs="$lib $deplibs" |
| if test -z "$libdir"; then | | if test -z "$libdir"; then |
| if test -z "$old_library"; then | | if test -z "$old_library"; then |
| func_fatal_error "cannot find name of link library for '$lib'" | | func_fatal_error "cannot find name of link library for '$lib'" |
| fi | | fi |
| # It is a libtool convenience library, so add in its objects. | | # It is a libtool convenience library, so add in its objects. |
| func_append convenience " $ladir/$objdir/$old_library" | | func_append convenience " $ladir/$objdir/$old_library" |
| func_append old_convenience " $ladir/$objdir/$old_library" | | func_append old_convenience " $ladir/$objdir/$old_library" |
|
| tmp_libs= | | |
| for deplib in $dependency_libs; do | | |
| deplibs="$deplib $deplibs" | | |
| if $opt_preserve_dup_deps; then | | |
| case "$tmp_libs " in | | |
| *" $deplib "*) func_append specialdeplibs " $deplib" ;; | | |
| esac | | |
| fi | | |
| func_append tmp_libs " $deplib" | | |
| done | | |
| elif test prog != "$linkmode" && test lib != "$linkmode"; then | | elif test prog != "$linkmode" && test lib != "$linkmode"; then |
| func_fatal_error "'$lib' is not a convenience library" | | func_fatal_error "'$lib' is not a convenience library" |
| fi | | fi |
|
| | tmp_libs= |
| | for deplib in $dependency_libs; do |
| | deplibs="$deplib $deplibs" |
| | if $opt_preserve_dup_deps; then |
| | case "$tmp_libs " in |
| | *" $deplib "*) func_append specialdeplibs " $deplib" ;; |
| | esac |
| | fi |
| | func_append tmp_libs " $deplib" |
| | done |
| continue | | continue |
| fi # $pass = conv | | fi # $pass = conv |
| | |
| # Get the name of the library we link against. | | # Get the name of the library we link against. |
| linklib= | | linklib= |
| if test -n "$old_library" && | | if test -n "$old_library" && |
| { test yes = "$prefer_static_libs" || | | { test yes = "$prefer_static_libs" || |
| test built,no = "$prefer_static_libs,$installed"; }; then | | test built,no = "$prefer_static_libs,$installed"; }; then |
| linklib=$old_library | | linklib=$old_library |
| else | | else |
| | |
| skipping to change at line 8698 | | skipping to change at line 8743 |
|---|
| revision=$number_minor | | revision=$number_minor |
| age=0 | | age=0 |
| ;; | | ;; |
| irix|nonstopux) | | irix|nonstopux) |
| func_arith $number_major + $number_minor | | func_arith $number_major + $number_minor |
| current=$func_arith_result | | current=$func_arith_result |
| age=$number_minor | | age=$number_minor |
| revision=$number_minor | | revision=$number_minor |
| lt_irix_increment=no | | lt_irix_increment=no |
| ;; | | ;; |
|
| *) | | |
| func_fatal_configuration "$modename: unknown library version type '$v | | |
| ersion_type'" | | |
| ;; | | |
| esac | | esac |
| ;; | | ;; |
| no) | | no) |
| current=$1 | | current=$1 |
| revision=$2 | | revision=$2 |
| age=$3 | | age=$3 |
| ;; | | ;; |
| esac | | esac |
| | |
| # Check that each of the things are valid numbers. | | # Check that each of the things are valid numbers. |
| | |
| skipping to change at line 10382 | | skipping to change at line 10424 |
|---|
| for var in $variables_saved_for_relink; do | | for var in $variables_saved_for_relink; do |
| if eval test -z \"\${$var+set}\"; then | | if eval test -z \"\${$var+set}\"; then |
| relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $va
r=; export $var; }; }; $relink_command" | | relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $va
r=; export $var; }; }; $relink_command" |
| elif eval var_value=\$$var; test -z "$var_value"; then | | elif eval var_value=\$$var; test -z "$var_value"; then |
| relink_command="$var=; export $var; $relink_command" | | relink_command="$var=; export $var; $relink_command" |
| else | | else |
| func_quote_for_eval "$var_value" | | func_quote_for_eval "$var_value" |
| relink_command="$var=$func_quote_for_eval_result; export $var; $relin
k_command" | | relink_command="$var=$func_quote_for_eval_result; export $var; $relin
k_command" |
| fi | | fi |
| done | | done |
|
| relink_command="(cd `pwd`; $relink_command)" | | func_quote "(cd `pwd`; $relink_command)" |
| relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` | | relink_command=$func_quote_result |
| fi | | fi |
| | |
| # Only actually do things if not in dry run mode. | | # Only actually do things if not in dry run mode. |
| $opt_dry_run || { | | $opt_dry_run || { |
| # win32 will think the script is a binary if it has | | # win32 will think the script is a binary if it has |
| # a .exe suffix, so we strip it off here. | | # a .exe suffix, so we strip it off here. |
| case $output in | | case $output in |
| *.exe) func_stripname '' '.exe' "$output" | | *.exe) func_stripname '' '.exe' "$output" |
| output=$func_stripname_result ;; | | output=$func_stripname_result ;; |
| esac | | esac |
| | |
| skipping to change at line 10629 | | skipping to change at line 10671 |
|---|
| relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=
; export $var; }; }; $relink_command" | | relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=
; export $var; }; }; $relink_command" |
| elif eval var_value=\$$var; test -z "$var_value"; then | | elif eval var_value=\$$var; test -z "$var_value"; then |
| relink_command="$var=; export $var; $relink_command" | | relink_command="$var=; export $var; $relink_command" |
| else | | else |
| func_quote_for_eval "$var_value" | | func_quote_for_eval "$var_value" |
| relink_command="$var=$func_quote_for_eval_result; export $var; $relink_
command" | | relink_command="$var=$func_quote_for_eval_result; export $var; $relink_
command" |
| fi | | fi |
| done | | done |
| # Quote the link command for shipping. | | # Quote the link command for shipping. |
| relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=reli
nk $libtool_args @inst_prefix_dir@)" | | relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=reli
nk $libtool_args @inst_prefix_dir@)" |
|
| relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` | | func_quote "$relink_command" |
| | relink_command=$func_quote_result |
| if test yes = "$hardcode_automatic"; then | | if test yes = "$hardcode_automatic"; then |
| relink_command= | | relink_command= |
| fi | | fi |
| | |
| # Only create the output if not a dry run. | | # Only create the output if not a dry run. |
| $opt_dry_run || { | | $opt_dry_run || { |
| for installed in no yes; do | | for installed in no yes; do |
| if test yes = "$installed"; then | | if test yes = "$installed"; then |
| if test -z "$install_libdir"; then | | if test -z "$install_libdir"; then |
| break | | break |
| | | |
| End of changes. 15 change blocks. |
|---|
| 33 lines changed or deleted | | 76 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 