ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/ltmain.sh
(Generate patch)

Comparing ircd-hybrid-8/ltmain.sh (file contents):
Revision 1156 by michael, Tue Aug 9 20:29:20 2011 UTC vs.
Revision 1257 by michael, Sun Jan 15 06:28:46 2012 UTC

# Line 1 | Line 1
1  
2 < # libtool (GNU libtool) 2.4
2 > # libtool (GNU libtool) 2.4.2
3   # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
4  
5   # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
6 < # 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
6 > # 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
7   # This is free software; see the source for copying conditions.  There is NO
8   # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
9  
# Line 41 | Line 41
41   #       --quiet, --silent    don't print informational messages
42   #       --no-quiet, --no-silent
43   #                            print informational messages (default)
44 + #       --no-warn            don't display warning messages
45   #       --tag=TAG            use configuration variables from tag TAG
46   #   -v, --verbose            print more informational messages than default
47   #       --no-verbose         don't print the extra informational messages
# Line 69 | Line 70
70   #         compiler:             $LTCC
71   #         compiler flags:               $LTCFLAGS
72   #         linker:               $LD (gnu? $with_gnu_ld)
73 < #         $progname:    (GNU libtool) 2.4
73 > #         $progname:    (GNU libtool) 2.4.2
74   #         automake:     $automake_version
75   #         autoconf:     $autoconf_version
76   #
# Line 79 | Line 80
80  
81   PROGRAM=libtool
82   PACKAGE=libtool
83 < VERSION=2.4
83 > VERSION=2.4.2
84   TIMESTAMP=""
85 < package_revision=1.3293
85 > package_revision=1.3337
86  
87   # Be Bourne compatible
88   if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
# Line 136 | Line 137 | progpath="$0"
137  
138   : ${CP="cp -f"}
139   test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
139 : ${EGREP="grep -E"}
140 : ${FGREP="grep -F"}
141 : ${GREP="grep"}
142 : ${LN_S="ln -s"}
140   : ${MAKE="make"}
141   : ${MKDIR="mkdir"}
142   : ${MV="mv -f"}
143   : ${RM="rm -f"}
147 : ${SED="sed"}
144   : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
145   : ${Xsed="$SED -e 1s/^X//"}
146  
# Line 387 | Line 383 | case $progpath in
383       ;;
384    *)
385       save_IFS="$IFS"
386 <     IFS=:
386 >     IFS=${PATH_SEPARATOR-:}
387       for progdir in $PATH; do
388         IFS="$save_IFS"
389         test -x "$progdir/$progname" && break
# Line 771 | Line 767 | func_help ()
767          s*\$LTCFLAGS*'"$LTCFLAGS"'*
768          s*\$LD*'"$LD"'*
769          s/\$with_gnu_ld/'"$with_gnu_ld"'/
770 <        s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
771 <        s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
770 >        s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
771 >        s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
772          p
773          d
774       }
# Line 1052 | Line 1048 | opt_finish=false
1048   opt_help=false
1049   opt_help_all=false
1050   opt_silent=:
1051 + opt_warning=:
1052   opt_verbose=:
1053   opt_silent=false
1054   opt_verbose=false
# Line 1120 | Line 1117 | esac
1117                          opt_silent=false
1118   func_append preserve_args " $opt"
1119                          ;;
1120 +      --no-warning|--no-warn)
1121 +                        opt_warning=false
1122 + func_append preserve_args " $opt"
1123 +                        ;;
1124        --no-verbose)
1125                          opt_verbose=false
1126   func_append preserve_args " $opt"
# Line 2059 | Line 2060 | func_mode_compile ()
2060      *.[cCFSifmso] | \
2061      *.ada | *.adb | *.ads | *.asm | \
2062      *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
2063 <    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
2063 >    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
2064        func_xform "$libobj"
2065        libobj=$func_xform_result
2066        ;;
# Line 3201 | Line 3202 | func_mode_install ()
3202  
3203        # Set up the ranlib parameters.
3204        oldlib="$destdir/$name"
3205 +      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
3206 +      tool_oldlib=$func_to_tool_file_result
3207  
3208        func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
3209  
3210        if test -n "$stripme" && test -n "$old_striplib"; then
3211 <        func_show_eval "$old_striplib $oldlib" 'exit $?'
3211 >        func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
3212        fi
3213  
3214        # Do each command in the postinstall commands.
# Line 3470 | Line 3473 | static const void *lt_preloaded_setup()
3473            # linked before any other PIC object.  But we must not use
3474            # pic_flag when linking with -static.  The problem exists in
3475            # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
3476 <          *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
3476 >          *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
3477              pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
3478            *-*-hpux*)
3479              pic_flag_for_symtable=" $pic_flag"  ;;
# Line 3982 | Line 3985 | func_exec_program_core ()
3985   # launches target application with the remaining arguments.
3986   func_exec_program ()
3987   {
3988 <  for lt_wr_arg
3989 <  do
3990 <    case \$lt_wr_arg in
3991 <    --lt-*) ;;
3992 <    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
3993 <    esac
3994 <    shift
3995 <  done
3988 >  case \" \$* \" in
3989 >  *\\ --lt-*)
3990 >    for lt_wr_arg
3991 >    do
3992 >      case \$lt_wr_arg in
3993 >      --lt-*) ;;
3994 >      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
3995 >      esac
3996 >      shift
3997 >    done ;;
3998 >  esac
3999    func_exec_program_core \${1+\"\$@\"}
4000   }
4001  
# Line 5057 | Line 5063 | void lt_dump_script (FILE* f)
5063   {
5064   EOF
5065              func_emit_wrapper yes |
5066 <              $SED -e 's/\([\\"]\)/\\\1/g' \
5067 <                   -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
5068 <
5066 >              $SED -n -e '
5067 > s/^\(.\{79\}\)\(..*\)/\1\
5068 > \2/
5069 > h
5070 > s/\([\\"]\)/\\\1/g
5071 > s/$/\\n/
5072 > s/\([^\n]*\).*/  fputs ("\1", f);/p
5073 > g
5074 > D'
5075              cat <<"EOF"
5076   }
5077   EOF
# Line 5643 | Line 5655 | func_mode_link ()
5655          continue
5656          ;;
5657  
5658 <      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
5658 >      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
5659 >      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
5660          func_append compiler_flags " $arg"
5661          func_append compile_command " $arg"
5662          func_append finalize_command " $arg"
# Line 6147 | Line 6160 | func_mode_link ()
6160          lib=
6161          found=no
6162          case $deplib in
6163 <        -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
6163 >        -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
6164 >        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
6165            if test "$linkmode,$pass" = "prog,link"; then
6166              compile_deplibs="$deplib $compile_deplibs"
6167              finalize_deplibs="$deplib $finalize_deplibs"
# Line 6831 | Line 6845 | func_mode_link ()
6845                   test "$hardcode_direct_absolute" = no; then
6846                  add="$dir/$linklib"
6847                elif test "$hardcode_minus_L" = yes; then
6848 <                add_dir="-L$dir"
6848 >                add_dir="-L$absdir"
6849                  # Try looking first in the location we're being installed to.
6850                  if test -n "$inst_prefix_dir"; then
6851                    case $libdir in
# Line 7316 | Line 7330 | func_mode_link ()
7330            # which has an extra 1 added just for fun
7331            #
7332            case $version_type in
7333 +          # correct linux to gnu/linux during the next big refactor
7334            darwin|linux|osf|windows|none)
7335              func_arith $number_major + $number_minor
7336              current=$func_arith_result
# Line 7432 | Line 7447 | func_mode_link ()
7447            versuffix="$major.$revision"
7448            ;;
7449  
7450 <        linux)
7450 >        linux) # correct to gnu/linux during the next big refactor
7451            func_arith $current - $age
7452            major=.$func_arith_result
7453            versuffix="$major.$age.$revision"
# Line 8020 | Line 8035 | EOF
8035  
8036        # Test again, we may have decided not to build it any more
8037        if test "$build_libtool_libs" = yes; then
8038 +        # Remove ${wl} instances when linking with ld.
8039 +        # FIXME: should test the right _cmds variable.
8040 +        case $archive_cmds in
8041 +          *\$LD\ *) wl= ;;
8042 +        esac
8043          if test "$hardcode_into_libs" = yes; then
8044            # Hardcode the library paths
8045            hardcode_libdirs=
# Line 8050 | Line 8070 | EOF
8070              elif test -n "$runpath_var"; then
8071                case "$perm_rpath " in
8072                *" $libdir "*) ;;
8073 <              *) func_apped perm_rpath " $libdir" ;;
8073 >              *) func_append perm_rpath " $libdir" ;;
8074                esac
8075              fi
8076            done
# Line 8058 | Line 8078 | EOF
8078            if test -n "$hardcode_libdir_separator" &&
8079               test -n "$hardcode_libdirs"; then
8080              libdir="$hardcode_libdirs"
8081 <            if test -n "$hardcode_libdir_flag_spec_ld"; then
8062 <              eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
8063 <            else
8064 <              eval dep_rpath=\"$hardcode_libdir_flag_spec\"
8065 <            fi
8081 >            eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
8082            fi
8083            if test -n "$runpath_var" && test -n "$perm_rpath"; then
8084              # We should set the runpath_var.
# Line 9152 | Line 9168 | EOF
9168              esac
9169            done
9170          fi
9171 +        func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
9172 +        tool_oldlib=$func_to_tool_file_result
9173          eval cmds=\"$old_archive_cmds\"
9174  
9175          func_len " $cmds"
# Line 9261 | Line 9279 | EOF
9279                *.la)
9280                  func_basename "$deplib"
9281                  name="$func_basename_result"
9282 <                eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
9282 >                func_resolve_sysroot "$deplib"
9283 >                eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
9284                  test -z "$libdir" && \
9285                    func_fatal_error "\`$deplib' is not a valid libtool archive"
9286                  func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines