Changeset 8ce897a in mod_gnutls for config/ltmain.sh

Timestamp:

Jan 11, 2013, 12:57:01 AM (7 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, upstream

Children:

54b3065, f8ffc43

Parents:

9d9b093

Message:

Imported Upstream version 0.5.2

File:

• config/ltmain.sh (modified) (14 diffs)

config/ltmain.sh

@@ -3 +3 @@
 #
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007  Free Software Foundation, Inc.
+# 2007, 2008  Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -44 +44 @@
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="1.5.24 Debian 1.5.24-1ubuntu1"
-TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
+VERSION="1.5.26 Debian 1.5.26-1ubuntu1"
+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
 
 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
@@ -114 +114 @@
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+lt_env=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 do
   eval "if test \"\${$lt_var+set}\" = set; then
           save_$lt_var=\$$lt_var
+          lt_env=\"$lt_var=\$$lt_var \$lt_env\"
           $lt_var=C
           export $lt_var
         fi"
 done
+
+if test -n "$lt_env"; then
+  lt_env="env $lt_env"
+fi
 
 # Make sure IFS has a sensible default
@@ -486 +492 @@
 $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
 
-Copyright (C) 2007  Free Software Foundation, Inc.
+Copyright (C) 2008  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."
@@ -789 +795 @@
     *.java) xform=java ;;
     *.obj) xform=obj ;;
+    *.sx) xform=sx ;;
     esac
 
@@ -957 +964 @@
 
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
         test -n "$output_obj" && $run $rm $removelist
@@ -1029 +1036 @@
       $run $rm "$obj" "$output_obj"
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
         $run $rm $removelist
@@ -1162 +1169 @@
     vinfo=
     vinfo_number=no
+    single_module="${wl}-single_module"
 
     func_infer_tag $base_compile
@@ -1647 +1655 @@
         ;;
 
+      -multi_module)
+        single_module="${wl}-multi_module"
+        continue
+        ;;
+
       -module)
         module=yes
@@ -2153 +2166 @@
           fi
           name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-          for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+          if test "$linkmode" = lib; then
+            searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+          else
+            searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+          fi
+          for searchdir in $searchdirs; do
             for search_ext in .la $std_shrext .so .a; do
               # Search the libtool library
@@ -2949 +2967 @@
                   # but need to link against shared
                   eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+                  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
                   if test -n "$deplibrary_names" ; then
                     for tmp in $deplibrary_names ; do
                       depdepl=$tmp
                     done
-                    if test -f "$path/$depdepl" ; then
+                    if test -f "$deplibdir/$depdepl" ; then
+                      depdepl="$deplibdir/$depdepl"
+                    elif test -f "$path/$depdepl" ; then
                       depdepl="$path/$depdepl"
+                    else
+                      # Can't find it, oh well...
+                      depdepl=
                     fi
                     # do not add paths which are already there
@@ -3102 +3126 @@
     case $linkmode in
     oldlib)
-      if test -n "$deplibs"; then
-        $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+        $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
@@ -4246 +4271 @@
 
     obj)
-      if test -n "$deplibs"; then
-        $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+        $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
@@ -6487 +6513 @@
 
       # Restore saved environment variables
-      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
       do
         eval "if test \"\${save_$lt_var+set}\" = set; then