| Index: third_party/libevent/ltmain.sh
|
| diff --git a/third_party/libevent/ltmain.sh b/third_party/libevent/ltmain.sh
|
| index 4598ec61ccf4cc241f4a9b7bd242f238e4238e99..27d498a080759753f92cceeaf4def8a27022e2c6 100644
|
| --- a/third_party/libevent/ltmain.sh
|
| +++ b/third_party/libevent/ltmain.sh
|
| @@ -2,7 +2,7 @@
|
| # NOTE: Changing this file will not affect anything until you rerun configure.
|
| #
|
| # 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
|
| #
|
| # This program is free software; you can redistribute it and/or modify
|
| @@ -43,8 +43,8 @@ EXIT_FAILURE=1
|
|
|
| PROGRAM=ltmain.sh
|
| PACKAGE=libtool
|
| -VERSION=1.5.24
|
| -TIMESTAMP=" (1.1220.2.455 2007/06/24 02:13:29)"
|
| +VERSION=1.5.26
|
| +TIMESTAMP=" (1.1220.2.492 2008/01/30 06:40:56)"
|
|
|
| # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
|
| if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
| @@ -113,15 +113,21 @@ esac
|
| # These must not be set unconditionally because not all systems understand
|
| # 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
|
| lt_nl='
|
| '
|
| @@ -485,7 +491,7 @@ do
|
| echo "\
|
| $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."
|
| exit $?
|
| @@ -788,6 +794,7 @@ if test -z "$show_help"; then
|
| *.for) xform=for ;;
|
| *.java) xform=java ;;
|
| *.obj) xform=obj ;;
|
| + *.sx) xform=sx ;;
|
| esac
|
|
|
| libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
|
| @@ -956,7 +963,7 @@ EOF
|
| $run $rm "$lobj" "$output_obj"
|
|
|
| $show "$command"
|
| - if $run eval "$command"; then :
|
| + if $run eval $lt_env "$command"; then :
|
| else
|
| test -n "$output_obj" && $run $rm $removelist
|
| exit $EXIT_FAILURE
|
| @@ -1028,7 +1035,7 @@ EOF
|
| command="$command$suppress_output"
|
| $run $rm "$obj" "$output_obj"
|
| $show "$command"
|
| - if $run eval "$command"; then :
|
| + if $run eval $lt_env "$command"; then :
|
| else
|
| $run $rm $removelist
|
| exit $EXIT_FAILURE
|
| @@ -1161,6 +1168,7 @@ EOF
|
| thread_safe=no
|
| vinfo=
|
| vinfo_number=no
|
| + single_module="${wl}-single_module"
|
|
|
| func_infer_tag $base_compile
|
|
|
| @@ -1646,6 +1654,11 @@ EOF
|
| continue
|
| ;;
|
|
|
| + -multi_module)
|
| + single_module="${wl}-multi_module"
|
| + continue
|
| + ;;
|
| +
|
| -module)
|
| module=yes
|
| continue
|
| @@ -2149,7 +2162,12 @@ EOF
|
| continue
|
| 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
|
| lib="$searchdir/lib${name}${search_ext}"
|
| @@ -2945,12 +2963,18 @@ EOF
|
| # we do not want to link against static libs,
|
| # 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
|
| case " $newlib_search_path " in
|
| @@ -3098,9 +3122,10 @@ EOF
|
|
|
| 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
|
| $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
|
| @@ -4237,9 +4262,10 @@ EOF
|
| ;;
|
|
|
| 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
|
| $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
|
| @@ -6478,7 +6504,7 @@ relink_command=\"$relink_command\""
|
| fi
|
|
|
| # 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
|
| $lt_var=\$save_$lt_var; export $lt_var
|
|
|