third_party/libevent/aclocal.m4 - Issue 412006: posix: upgrade libevent from 1.4.7 to 1.4.13

Unified Diff: third_party/libevent/aclocal.m4

Issue 412006: posix: upgrade libevent from 1.4.7 to 1.4.13 (Closed)

Patch Set: better readme Created 11 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: third_party/libevent/aclocal.m4

diff --git a/third_party/libevent/aclocal.m4 b/third_party/libevent/aclocal.m4

index 9a56444e0ef5a06aeadffa97f7845f5c9978f397..4af9376529adb38567f74848c9cefb9f5a7c0c18 100644

--- a/third_party/libevent/aclocal.m4

+++ b/third_party/libevent/aclocal.m4

@@ -1,7 +1,7 @@

-# generated automatically by aclocal 1.10 -*- Autoconf -*-

+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-

-# 2005, 2006 Free Software Foundation, Inc.

+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

# with or without modifications, as long as this notice is preserved.

@@ -11,14 +11,17 @@

# even the implied warranty of MERCHANTABILITY or FITNESS FOR A

# PARTICULAR PURPOSE.

-m4_if(m4_PACKAGE_VERSION, [2.61],,

-[m4_fatal([this file was generated for autoconf 2.61.

-You have another version of autoconf. If you want to use that,

-you should regenerate the build system entirely.], [63])])

+m4_ifndef([AC_AUTOCONF_VERSION],

+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

+m4_if(AC_AUTOCONF_VERSION, [2.63],,

+[m4_warning([this file was generated for autoconf 2.63.

+You have another version of autoconf. It may work, but is not guaranteed to.

+If you have problems, you may need to regenerate the build system entirely.

+To do so, use the procedure documented by the package, typically `autoreconf'.])])

# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-

-# serial 51 AC_PROG_LIBTOOL

+# serial 52 AC_PROG_LIBTOOL

# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)

@@ -106,7 +109,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl

AC_REQUIRE([AC_OBJEXT])dnl

AC_REQUIRE([AC_EXEEXT])dnl

dnl

AC_LIBTOOL_SYS_MAX_CMD_LEN

AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE

AC_LIBTOOL_OBJDIR

@@ -208,6 +210,8 @@ file_magic*)

;;

esac

+_LT_REQUIRED_DARWIN_CHECKS

AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)

AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],

enable_win32_dll=yes, enable_win32_dll=no)

@@ -287,9 +291,80 @@ ac_outfile=conftest.$ac_objext

echo "$lt_simple_link_test_code" >conftest.$ac_ext

eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

_lt_linker_boilerplate=`cat conftest.err`

-$rm conftest*

+$rm -r conftest*

])# _LT_LINKER_BOILERPLATE

+# _LT_REQUIRED_DARWIN_CHECKS

+# --------------------------

+# Check for some things on darwin

+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[

+ case $host_os in

+ rhapsody* | darwin*)

+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])

+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])

+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],

+ [lt_cv_apple_cc_single_mod=no

+ if test -z "${LT_MULTI_MODULE}"; then

+ # By default we will add the -single_module flag. You can override

+ # by either setting the environment variable LT_MULTI_MODULE

+ # non-empty at configure time, or by adding -multi_module to the

+ # link flags.

+ echo "int foo(void){return 1;}" > conftest.c

+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \

+ -dynamiclib ${wl}-single_module conftest.c

+ if test -f libconftest.dylib; then

+ lt_cv_apple_cc_single_mod=yes

+ rm -rf libconftest.dylib*

+ fi

+ rm conftest.c

+ fi])

+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],

+ [lt_cv_ld_exported_symbols_list],

+ [lt_cv_ld_exported_symbols_list=no

+ save_LDFLAGS=$LDFLAGS

+ echo "_main" > conftest.sym

+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"

+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],

+ [lt_cv_ld_exported_symbols_list=yes],

+ [lt_cv_ld_exported_symbols_list=no])

+ LDFLAGS="$save_LDFLAGS"

+ ])

+ case $host_os in

+ rhapsody* | darwin1.[[0123]])

+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;

+ darwin1.*)

+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;

+ darwin*)

+ # if running on 10.5 or later, the deployment target defaults

+ # to the OS version, if on x86, and 10.4, the deployment

+ # target defaults to 10.4. Don't you love it?

+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in

+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)

+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;

+ 10.[[012]]*)

+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;

+ 10.*)

+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;

+ esac

+ ;;

+ esac

+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then

+ _lt_dar_single_mod='$single_module'

+ fi

+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then

+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'

+ else

+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"

+ fi

+ if test "$DSYMUTIL" != ":"; then

+ _lt_dsymutil="~$DSYMUTIL \$lib || :"

+ else

+ _lt_dsymutil=

+ fi

+ ;;

+ esac

+])

# _LT_AC_SYS_LIBPATH_AIX

# ----------------------

@@ -614,7 +689,11 @@ sparc*-*solaris*)

*64-bit*)

case $lt_cv_prog_gnu_ld in

yes*) LD="${LD-ld} -m elf64_sparc" ;;

- *) LD="${LD-ld} -64" ;;

+ *)

+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then

+ LD="${LD-ld} -64"

+ fi

+ ;;

esac

;;

esac

@@ -707,7 +786,7 @@ AC_CACHE_CHECK([$1], [$2],

$2=yes

- $rm conftest*

+ $rm -r conftest*

LDFLAGS="$save_LDFLAGS"

])

@@ -978,7 +1057,7 @@ else

AC_CHECK_FUNC([shl_load],

[lt_cv_dlopen="shl_load"],

[AC_CHECK_LIB([dld], [shl_load],

- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],

+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],

[AC_CHECK_FUNC([dlopen],

[lt_cv_dlopen="dlopen"],

[AC_CHECK_LIB([dl], [dlopen],

@@ -986,7 +1065,7 @@ else

[AC_CHECK_LIB([svld], [dlopen],

[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],

[AC_CHECK_LIB([dld], [dld_link],

- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])

+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])

])

@@ -1303,7 +1382,7 @@ aix3*)

soname_spec='${libname}${release}${shared_ext}$major'

;;

-aix4* | aix5*)

+aix[[4-9]]*)

version_type=linux

need_lib_prefix=no

need_version=no

@@ -1824,6 +1903,13 @@ esac

AC_MSG_RESULT([$dynamic_linker])

test "$dynamic_linker" = no && can_build_shared=no

+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],

+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])

+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"

+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],

+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])

+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

if test "$GCC" = yes; then

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

@@ -2323,7 +2409,7 @@ lt_cv_deplibs_check_method='unknown'

# whether `pass_all' will *always* work, you probably want this one.

case $host_os in

-aix4* | aix5*)

+aix[[4-9]]*)

lt_cv_deplibs_check_method=pass_all

;;

@@ -2759,7 +2845,7 @@ aix3*)

;;

-aix4* | aix5*)

+aix[[4-9]]*)

if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then

test "$enable_shared" = yes && enable_static=no

@@ -2816,6 +2902,7 @@ _LT_AC_TAGVAR(postdep_objects, $1)=

_LT_AC_TAGVAR(predeps, $1)=

_LT_AC_TAGVAR(postdeps, $1)=

_LT_AC_TAGVAR(compiler_lib_search_path, $1)=

+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=

# Source file extension for C++ test sources.

ac_ext=cpp

@@ -2925,7 +3012,7 @@ case $host_os in

# FIXME: insert proper C++ library support

_LT_AC_TAGVAR(ld_shlibs, $1)=no

;;

- aix4* | aix5*)

+ aix[[4-9]]*)

if test "$host_cpu" = ia64; then

# On IA64, the linker does run time linking by default, so we don't

# have to do anything special.

@@ -2938,7 +3025,7 @@ case $host_os in

# Test if we are trying to use run time linking or normal

# AIX style linking. If -brtl is somewhere in LDFLAGS, we

# need to do runtime linking.

- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)

+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)

for ld_flag in $LDFLAGS; do

case $ld_flag in

*-brtl*)

@@ -3084,51 +3171,23 @@ case $host_os in

;;

darwin* | rhapsody*)

- case $host_os in

- rhapsody* | darwin1.[[012]])

- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'

- ;;

- *) # Darwin 1.3 on

- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then

- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'

- else

- case ${MACOSX_DEPLOYMENT_TARGET} in

- 10.[[012]])

- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'

- ;;

- 10.*)

- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'

- ;;

- esac

- fi

- ;;

- esac

_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no

_LT_AC_TAGVAR(hardcode_direct, $1)=no

_LT_AC_TAGVAR(hardcode_automatic, $1)=yes

_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported

_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''

_LT_AC_TAGVAR(link_all_deplibs, $1)=yes

- if test "$GXX" = yes ; then

- lt_int_apple_cc_single_mod=no

+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"

+ if test "$GXX" = yes ; then

output_verbose_link_cmd='echo'

- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then

- lt_int_apple_cc_single_mod=yes

+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"

+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"

+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"

+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"

+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then

+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"

+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"

- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then

- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'

- else

- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'

- fi

- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'

- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds

- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then

- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

- else

- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

- fi

- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

else

case $cc_basename in

xlc*)

@@ -3379,7 +3438,7 @@ case $host_os in

_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'

_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'

;;

- pgCC*)

+ pgCC* | pgcpp*)

# Portland Group C++ compiler

_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'

_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'

@@ -3814,7 +3873,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld

# compiler output when linking a shared library.

# Parse the compiler output and extract the necessary

# objects, libraries and library flags.

-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[

+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],

+[AC_REQUIRE([LT_AC_PROG_SED])dnl

dnl we can't use the lt_simple_compile_test_code here,

dnl because it contains code intended for an executable,

dnl not a library. It's possible we should let each

@@ -3939,6 +3999,11 @@ fi

$rm -f confest.$objext

+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=

+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then

+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`

+fi

# PORTME: override above test on systems where it is broken

ifelse([$1],[CXX],

[case $host_os in

@@ -3995,7 +4060,6 @@ solaris*)

;;

esac

])

case " $_LT_AC_TAGVAR(postdeps, $1) " in

*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;

esac

@@ -4080,7 +4144,7 @@ aix3*)

postinstall_cmds='$RANLIB $lib'

;;

-aix4* | aix5*)

+aix[[4-9]]*)

if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then

test "$enable_shared" = yes && enable_static=no

@@ -4257,6 +4321,7 @@ if test -f "$ltmain"; then

_LT_AC_TAGVAR(predeps, $1) \

_LT_AC_TAGVAR(postdeps, $1) \

_LT_AC_TAGVAR(compiler_lib_search_path, $1) \

+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \

_LT_AC_TAGVAR(archive_cmds, $1) \

_LT_AC_TAGVAR(archive_expsym_cmds, $1) \

_LT_AC_TAGVAR(postinstall_cmds, $1) \

@@ -4319,7 +4384,7 @@ ifelse([$1], [],

# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)

# NOTE: Changes made to this file will be lost: look at ltmain.sh.

# Free Software Foundation, Inc.

# This file is part of GNU Libtool:

@@ -4556,6 +4621,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)

# shared library.

postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)

+# The directories searched by this compiler when creating a shared

+# library

+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)

# The library search path used internally by the compiler when linking

# a shared library.

compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)

@@ -4905,7 +4974,7 @@ EOF

echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD

cat conftest.$ac_ext >&5

- rm -f conftest* conftst*

+ rm -rf conftest* conftst*

# Do not use the global_symbol_pipe unless it works.

if test "$pipe_works" = yes; then

@@ -4962,7 +5031,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

# built for inclusion in a dll (and should export symbols for example).

# Although the cygwin gcc ignores -fPIC, still need this for old-style

# (--disable-auto-import) libraries

- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'

+ m4_if([$1], [GCJ], [],

+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])

;;

darwin* | rhapsody*)

# PIC is the default on this platform

@@ -4999,7 +5069,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

esac

else

case $host_os in

- aix4* | aix5*)

+ aix[[4-9]]*)

# All AIX code is PIC.

if test "$host_cpu" = ia64; then

# AIX 5 now supports IA64 processor

@@ -5095,7 +5165,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'

;;

- pgCC*)

+ pgCC* | pgcpp*)

# Portland Group C++ compiler.

_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'

@@ -5246,7 +5316,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

# built for inclusion in a dll (and should export symbols for example).

# Although the cygwin gcc ignores -fPIC, still need this for old-style

# (--disable-auto-import) libraries

- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'

+ m4_if([$1], [GCJ], [],

+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])

;;

darwin* | rhapsody*)

@@ -5316,7 +5387,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

mingw* | cygwin* | pw32* | os2*)

# This hack is so that the source file can tell whether it is being

# built for inclusion in a dll (and should export symbols for example).

- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'

+ m4_if([$1], [GCJ], [],

+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])

;;

hpux9* | hpux10* | hpux11*)

@@ -5453,7 +5525,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])

if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then

AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],

- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),

+ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),

[$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],

[case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in

"" | " "*) ;;

@@ -5477,7 +5549,7 @@ esac

wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"

AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],

- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),

+ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),

$lt_tmp_static_flag,

[],

[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])

@@ -5493,7 +5565,7 @@ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])

ifelse([$1],[CXX],[

_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

case $host_os in

- aix4* | aix5*)

+ aix[[4-9]]*)

# If we're using GNU nm, then we don't want the "-C" option.

# -C means demangle to AIX nm, but means don't demangle with GNU nm

if $NM -V 2>&1 | grep 'GNU' > /dev/null; then

@@ -5512,6 +5584,7 @@ ifelse([$1],[CXX],[

_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

;;

esac

+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']

],[

runpath_var=

_LT_AC_TAGVAR(allow_undefined_flag, $1)=

@@ -5542,12 +5615,14 @@ ifelse([$1],[CXX],[

# it will be wrapped by ` (' and `)$', so one must not match beginning or

# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',

# as well as any symbol that contains `d'.

- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"

+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']

# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out

# platforms (ab)use it in PIC code, but their linkers get confused if

# the symbol is explicitly referenced. Since portable code cannot

# rely on this symbol name, it's probably fine to never include it in

# preloaded symbol tables.

+ # Exclude shared library initialization/finalization symbols.

+dnl Note also adjust exclude_expsyms for C++ above.

extract_expsyms_cmds=

# Just being paranoid about ensuring that cc_basename is set.

_LT_CC_BASENAME([$compiler])

@@ -5597,7 +5672,7 @@ ifelse([$1],[CXX],[

# See if GNU ld supports shared libraries.

case $host_os in

- aix3* | aix4* | aix5*)

+ aix[[3-9]]*)

# On AIX/PPC, the GNU linker is very broken

if test "$host_cpu" != ia64; then

_LT_AC_TAGVAR(ld_shlibs, $1)=no

@@ -5816,7 +5891,7 @@ _LT_EOF

;;

- aix4* | aix5*)

+ aix[[4-9]]*)

if test "$host_cpu" = ia64; then

# On IA64, the linker does run time linking by default, so we don't

# have to do anything special.

@@ -5836,7 +5911,7 @@ _LT_EOF

# Test if we are trying to use run time linking or normal

# AIX style linking. If -brtl is somewhere in LDFLAGS, we

# need to do runtime linking.

- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)

+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)

for ld_flag in $LDFLAGS; do

if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then

aix_use_runtimelinking=yes

@@ -5969,25 +6044,7 @@ _LT_EOF

;;

darwin* | rhapsody*)

- case $host_os in

- rhapsody* | darwin1.[[012]])

- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'

- ;;

- *) # Darwin 1.3 on

- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then

- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'

- else

- case ${MACOSX_DEPLOYMENT_TARGET} in

- 10.[[012]])

- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'

- ;;

- 10.*)

- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'

- ;;

- esac

- fi

- ;;

- esac

+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"

_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no

_LT_AC_TAGVAR(hardcode_direct, $1)=no

_LT_AC_TAGVAR(hardcode_automatic, $1)=yes

@@ -5996,11 +6053,10 @@ _LT_EOF

_LT_AC_TAGVAR(link_all_deplibs, $1)=yes

if test "$GCC" = yes ; then

output_verbose_link_cmd='echo'

- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'

- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'

- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds

- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"

+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"

else

case $cc_basename in

xlc*)

@@ -6581,7 +6637,7 @@ AC_SUBST([SED])

AC_MSG_RESULT([$SED])

])

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

@@ -6596,7 +6652,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],

[am__api_version='1.10'

dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to

dnl require some minimum version. Point them to the right macro.

-m4_if([$1], [1.10], [],

+m4_if([$1], [1.10.1], [],

[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl

])

@@ -6612,8 +6668,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])

# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.

AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

-[AM_AUTOMAKE_VERSION([1.10])dnl

-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])

+[AM_AUTOMAKE_VERSION([1.10.1])dnl

+m4_ifndef([AC_AUTOCONF_VERSION],

+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])

# AM_AUX_DIR_EXPAND -*- Autoconf -*-

@@ -6885,7 +6943,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],

# each Makefile.in and add a new line on top of each file to say so.

# Grep'ing the whole file is not good either: AIX grep has a line

# limit of 2048, but all sed's we know have understand at least 4000.

- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then

+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

dirpart=`AS_DIRNAME("$mf")`

else

continue

@@ -6945,13 +7003,13 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])

# Do all the work for Automake. -*- Autoconf -*-

-# 2005, 2006 Free Software Foundation, Inc.

+# 2005, 2006, 2008 Free Software Foundation, Inc.

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

# with or without modifications, as long as this notice is preserved.

-# serial 12

+# serial 13

# This macro actually does too much. Some checks are only needed if

# your package does certain things. But this isn't really a big deal.

@@ -7056,16 +7114,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],

# our stamp files there.

AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],

[# Compute $1's index in $config_headers.

+_am_arg=$1

_am_stamp_count=1

for _am_header in $config_headers :; do

case $_am_header in

- $1 | $1:* )

+ $_am_arg | $_am_arg:* )

break ;;

* )

_am_stamp_count=`expr $_am_stamp_count + 1` ;;

esac

done

-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])

+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])

@@ -7337,7 +7396,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])

# _AM_SUBST_NOTMAKE(VARIABLE)

# ---------------------------

-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.

+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.

# This macro is traced by Automake.

AC_DEFUN([_AM_SUBST_NOTMAKE])

« third_party/libevent/README.chromium ('K') | « third_party/libevent/README.chromium ('k') | third_party/libevent/buffer.c » ('j') | third_party/libevent/chromium.patch » ('J')