Changeset 8ce897a in mod_gnutls for config/ltmain.sh
- Timestamp:
- Jan 11, 2013, 12:57:01 AM (8 years ago)
- Branches:
- debian/master, debian/stretch-backports, jessie-backports, upstream
- Children:
- 54b3065, f8ffc43
- Parents:
- 9d9b093
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
config/ltmain.sh
r9d9b093 r8ce897a 3 3 # 4 4 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 5 # 2007 Free Software Foundation, Inc.5 # 2007, 2008 Free Software Foundation, Inc. 6 6 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 7 7 # … … 44 44 PROGRAM=ltmain.sh 45 45 PACKAGE=libtool 46 VERSION="1.5.2 4 Debian 1.5.24-1ubuntu1"47 TIMESTAMP=" (1.1220.2.4 56 2007/06/24 02:25:32)"46 VERSION="1.5.26 Debian 1.5.26-1ubuntu1" 47 TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" 48 48 49 49 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). … … 114 114 # e.g. LANG=C (notably SCO). 115 115 # We save the old values to restore during execute mode. 116 for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES 116 lt_env= 117 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES 117 118 do 118 119 eval "if test \"\${$lt_var+set}\" = set; then 119 120 save_$lt_var=\$$lt_var 121 lt_env=\"$lt_var=\$$lt_var \$lt_env\" 120 122 $lt_var=C 121 123 export $lt_var 122 124 fi" 123 125 done 126 127 if test -n "$lt_env"; then 128 lt_env="env $lt_env" 129 fi 124 130 125 131 # Make sure IFS has a sensible default … … 486 492 $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP 487 493 488 Copyright (C) 200 7Free Software Foundation, Inc.494 Copyright (C) 2008 Free Software Foundation, Inc. 489 495 This is free software; see the source for copying conditions. There is NO 490 496 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." … … 789 795 *.java) xform=java ;; 790 796 *.obj) xform=obj ;; 797 *.sx) xform=sx ;; 791 798 esac 792 799 … … 957 964 958 965 $show "$command" 959 if $run eval "$command"; then :966 if $run eval $lt_env "$command"; then : 960 967 else 961 968 test -n "$output_obj" && $run $rm $removelist … … 1029 1036 $run $rm "$obj" "$output_obj" 1030 1037 $show "$command" 1031 if $run eval "$command"; then :1038 if $run eval $lt_env "$command"; then : 1032 1039 else 1033 1040 $run $rm $removelist … … 1162 1169 vinfo= 1163 1170 vinfo_number=no 1171 single_module="${wl}-single_module" 1164 1172 1165 1173 func_infer_tag $base_compile … … 1647 1655 ;; 1648 1656 1657 -multi_module) 1658 single_module="${wl}-multi_module" 1659 continue 1660 ;; 1661 1649 1662 -module) 1650 1663 module=yes … … 2153 2166 fi 2154 2167 name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` 2155 for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do 2168 if test "$linkmode" = lib; then 2169 searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" 2170 else 2171 searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" 2172 fi 2173 for searchdir in $searchdirs; do 2156 2174 for search_ext in .la $std_shrext .so .a; do 2157 2175 # Search the libtool library … … 2949 2967 # but need to link against shared 2950 2968 eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` 2969 eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` 2951 2970 if test -n "$deplibrary_names" ; then 2952 2971 for tmp in $deplibrary_names ; do 2953 2972 depdepl=$tmp 2954 2973 done 2955 if test -f "$path/$depdepl" ; then 2974 if test -f "$deplibdir/$depdepl" ; then 2975 depdepl="$deplibdir/$depdepl" 2976 elif test -f "$path/$depdepl" ; then 2956 2977 depdepl="$path/$depdepl" 2978 else 2979 # Can't find it, oh well... 2980 depdepl= 2957 2981 fi 2958 2982 # do not add paths which are already there … … 3102 3126 case $linkmode in 3103 3127 oldlib) 3104 if test -n "$deplibs"; then 3105 $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 3106 fi 3128 case " $deplibs" in 3129 *\ -l* | *\ -L*) 3130 $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; 3131 esac 3107 3132 3108 3133 if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then … … 4246 4271 4247 4272 obj) 4248 if test -n "$deplibs"; then 4249 $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 4250 fi 4273 case " $deplibs" in 4274 *\ -l* | *\ -L*) 4275 $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; 4276 esac 4251 4277 4252 4278 if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then … … 6487 6513 6488 6514 # Restore saved environment variables 6489 for lt_var in LANG L C_ALL LC_CTYPE LC_COLLATE LC_MESSAGES6515 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES 6490 6516 do 6491 6517 eval "if test \"\${save_$lt_var+set}\" = set; then
Note: See TracChangeset
for help on using the changeset viewer.