| Index: third_party/libxml/src/m4/ltoptions.m4
|
| diff --git a/third_party/tcmalloc/vendor/m4/ltoptions.m4 b/third_party/libxml/src/m4/ltoptions.m4
|
| similarity index 69%
|
| copy from third_party/tcmalloc/vendor/m4/ltoptions.m4
|
| copy to third_party/libxml/src/m4/ltoptions.m4
|
| index 34151a3ba625f326e6645d6afc79586f10746a3e..94b082976667c0c9edf2e9ff7a668c1fd7d997bf 100644
|
| --- a/third_party/tcmalloc/vendor/m4/ltoptions.m4
|
| +++ b/third_party/libxml/src/m4/ltoptions.m4
|
| @@ -1,13 +1,14 @@
|
| # Helper functions for option handling. -*- Autoconf -*-
|
| #
|
| -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
|
| +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
|
| +# Foundation, Inc.
|
| # Written by Gary V. Vaughan, 2004
|
| #
|
| # 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 6 ltoptions.m4
|
| +# serial 8 ltoptions.m4
|
|
|
| # This is to help aclocal find these macros, as it can't see m4_define.
|
| AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
|
| @@ -28,7 +29,7 @@ m4_define([_LT_SET_OPTION],
|
| [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
|
| m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
|
| _LT_MANGLE_DEFUN([$1], [$2]),
|
| - [m4_warning([Unknown $1 option `$2'])])[]dnl
|
| + [m4_warning([Unknown $1 option '$2'])])[]dnl
|
| ])
|
|
|
|
|
| @@ -74,13 +75,15 @@ m4_if([$1],[LT_INIT],[
|
| dnl
|
| dnl If no reference was made to various pairs of opposing options, then
|
| dnl we run the default mode handler for the pair. For example, if neither
|
| - dnl `shared' nor `disable-shared' was passed, we enable building of shared
|
| + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
|
| dnl archives by default:
|
| _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
|
| _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
|
| _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
|
| _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
|
| - [_LT_ENABLE_FAST_INSTALL])
|
| + [_LT_ENABLE_FAST_INSTALL])
|
| + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
|
| + [_LT_WITH_AIX_SONAME([aix])])
|
| ])
|
| ])# _LT_SET_OPTIONS
|
|
|
| @@ -111,7 +114,7 @@ AU_DEFUN([AC_LIBTOOL_DLOPEN],
|
| [_LT_SET_OPTION([LT_INIT], [dlopen])
|
| AC_DIAGNOSE([obsolete],
|
| [$0: Remove this warning and the call to _LT_SET_OPTION when you
|
| -put the `dlopen' option into LT_INIT's first parameter.])
|
| +put the 'dlopen' option into LT_INIT's first parameter.])
|
| ])
|
|
|
| dnl aclocal-1.4 backwards compatibility:
|
| @@ -125,7 +128,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
|
| [enable_win32_dll=yes
|
|
|
| case $host in
|
| -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
|
| +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
| AC_CHECK_TOOL(AS, as, false)
|
| AC_CHECK_TOOL(DLLTOOL, dlltool, false)
|
| AC_CHECK_TOOL(OBJDUMP, objdump, false)
|
| @@ -133,13 +136,13 @@ case $host in
|
| esac
|
|
|
| test -z "$AS" && AS=as
|
| -_LT_DECL([], [AS], [0], [Assembler program])dnl
|
| +_LT_DECL([], [AS], [1], [Assembler program])dnl
|
|
|
| test -z "$DLLTOOL" && DLLTOOL=dlltool
|
| -_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
|
| +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
|
|
|
| test -z "$OBJDUMP" && OBJDUMP=objdump
|
| -_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
|
| +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
|
| ])# win32-dll
|
|
|
| AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
|
| @@ -147,7 +150,7 @@ AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
|
| _LT_SET_OPTION([LT_INIT], [win32-dll])
|
| AC_DIAGNOSE([obsolete],
|
| [$0: Remove this warning and the call to _LT_SET_OPTION when you
|
| -put the `win32-dll' option into LT_INIT's first parameter.])
|
| +put the 'win32-dll' option into LT_INIT's first parameter.])
|
| ])
|
|
|
| dnl aclocal-1.4 backwards compatibility:
|
| @@ -156,9 +159,9 @@ dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
|
|
|
| # _LT_ENABLE_SHARED([DEFAULT])
|
| # ----------------------------
|
| -# implement the --enable-shared flag, and supports the `shared' and
|
| -# `disable-shared' LT_INIT options.
|
| -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
|
| +# implement the --enable-shared flag, and supports the 'shared' and
|
| +# 'disable-shared' LT_INIT options.
|
| +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
|
| m4_define([_LT_ENABLE_SHARED],
|
| [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
|
| AC_ARG_ENABLE([shared],
|
| @@ -171,14 +174,14 @@ AC_ARG_ENABLE([shared],
|
| *)
|
| enable_shared=no
|
| # Look at the argument we got. We use all the common list separators.
|
| - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
|
| + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
| for pkg in $enableval; do
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| if test "X$pkg" = "X$p"; then
|
| enable_shared=yes
|
| fi
|
| done
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| ;;
|
| esac],
|
| [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
|
| @@ -210,9 +213,9 @@ dnl AC_DEFUN([AM_DISABLE_SHARED], [])
|
|
|
| # _LT_ENABLE_STATIC([DEFAULT])
|
| # ----------------------------
|
| -# implement the --enable-static flag, and support the `static' and
|
| -# `disable-static' LT_INIT options.
|
| -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
|
| +# implement the --enable-static flag, and support the 'static' and
|
| +# 'disable-static' LT_INIT options.
|
| +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
|
| m4_define([_LT_ENABLE_STATIC],
|
| [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
|
| AC_ARG_ENABLE([static],
|
| @@ -225,14 +228,14 @@ AC_ARG_ENABLE([static],
|
| *)
|
| enable_static=no
|
| # Look at the argument we got. We use all the common list separators.
|
| - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
|
| + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
| for pkg in $enableval; do
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| if test "X$pkg" = "X$p"; then
|
| enable_static=yes
|
| fi
|
| done
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| ;;
|
| esac],
|
| [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
|
| @@ -264,9 +267,9 @@ dnl AC_DEFUN([AM_DISABLE_STATIC], [])
|
|
|
| # _LT_ENABLE_FAST_INSTALL([DEFAULT])
|
| # ----------------------------------
|
| -# implement the --enable-fast-install flag, and support the `fast-install'
|
| -# and `disable-fast-install' LT_INIT options.
|
| -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
|
| +# implement the --enable-fast-install flag, and support the 'fast-install'
|
| +# and 'disable-fast-install' LT_INIT options.
|
| +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
|
| m4_define([_LT_ENABLE_FAST_INSTALL],
|
| [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
|
| AC_ARG_ENABLE([fast-install],
|
| @@ -279,14 +282,14 @@ AC_ARG_ENABLE([fast-install],
|
| *)
|
| enable_fast_install=no
|
| # Look at the argument we got. We use all the common list separators.
|
| - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
|
| + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
| for pkg in $enableval; do
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| if test "X$pkg" = "X$p"; then
|
| enable_fast_install=yes
|
| fi
|
| done
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| ;;
|
| esac],
|
| [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
|
| @@ -303,14 +306,14 @@ AU_DEFUN([AC_ENABLE_FAST_INSTALL],
|
| [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
|
| AC_DIAGNOSE([obsolete],
|
| [$0: Remove this warning and the call to _LT_SET_OPTION when you put
|
| -the `fast-install' option into LT_INIT's first parameter.])
|
| +the 'fast-install' option into LT_INIT's first parameter.])
|
| ])
|
|
|
| AU_DEFUN([AC_DISABLE_FAST_INSTALL],
|
| [_LT_SET_OPTION([LT_INIT], [disable-fast-install])
|
| AC_DIAGNOSE([obsolete],
|
| [$0: Remove this warning and the call to _LT_SET_OPTION when you put
|
| -the `disable-fast-install' option into LT_INIT's first parameter.])
|
| +the 'disable-fast-install' option into LT_INIT's first parameter.])
|
| ])
|
|
|
| dnl aclocal-1.4 backwards compatibility:
|
| @@ -318,19 +321,85 @@ dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
|
| dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
|
|
|
|
|
| +# _LT_WITH_AIX_SONAME([DEFAULT])
|
| +# ----------------------------------
|
| +# implement the --with-aix-soname flag, and support the `aix-soname=aix'
|
| +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
|
| +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
|
| +m4_define([_LT_WITH_AIX_SONAME],
|
| +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
|
| +shared_archive_member_spec=
|
| +case $host,$enable_shared in
|
| +power*-*-aix[[5-9]]*,yes)
|
| + AC_MSG_CHECKING([which variant of shared library versioning to provide])
|
| + AC_ARG_WITH([aix-soname],
|
| + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
|
| + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
|
| + [case $withval in
|
| + aix|svr4|both)
|
| + ;;
|
| + *)
|
| + AC_MSG_ERROR([Unknown argument to --with-aix-soname])
|
| + ;;
|
| + esac
|
| + lt_cv_with_aix_soname=$with_aix_soname],
|
| + [AC_CACHE_VAL([lt_cv_with_aix_soname],
|
| + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
|
| + with_aix_soname=$lt_cv_with_aix_soname])
|
| + AC_MSG_RESULT([$with_aix_soname])
|
| + if test aix != "$with_aix_soname"; then
|
| + # For the AIX way of multilib, we name the shared archive member
|
| + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
|
| + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
|
| + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
|
| + # the AIX toolchain works better with OBJECT_MODE set (default 32).
|
| + if test 64 = "${OBJECT_MODE-32}"; then
|
| + shared_archive_member_spec=shr_64
|
| + else
|
| + shared_archive_member_spec=shr
|
| + fi
|
| + fi
|
| + ;;
|
| +*)
|
| + with_aix_soname=aix
|
| + ;;
|
| +esac
|
| +
|
| +_LT_DECL([], [shared_archive_member_spec], [0],
|
| + [Shared archive member basename, for filename based shared library versioning on AIX])dnl
|
| +])# _LT_WITH_AIX_SONAME
|
| +
|
| +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
|
| +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
|
| +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
|
| +
|
| +
|
| # _LT_WITH_PIC([MODE])
|
| # --------------------
|
| -# implement the --with-pic flag, and support the `pic-only' and `no-pic'
|
| +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
|
| # LT_INIT options.
|
| -# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
|
| +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'.
|
| m4_define([_LT_WITH_PIC],
|
| [AC_ARG_WITH([pic],
|
| - [AS_HELP_STRING([--with-pic],
|
| + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
|
| [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
|
| - [pic_mode="$withval"],
|
| - [pic_mode=default])
|
| -
|
| -test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
|
| + [lt_p=${PACKAGE-default}
|
| + case $withval in
|
| + yes|no) pic_mode=$withval ;;
|
| + *)
|
| + pic_mode=default
|
| + # Look at the argument we got. We use all the common list separators.
|
| + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
| + for lt_pkg in $withval; do
|
| + IFS=$lt_save_ifs
|
| + if test "X$lt_pkg" = "X$lt_p"; then
|
| + pic_mode=yes
|
| + fi
|
| + done
|
| + IFS=$lt_save_ifs
|
| + ;;
|
| + esac],
|
| + [pic_mode=m4_default([$1], [default])])
|
|
|
| _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
|
| ])# _LT_WITH_PIC
|
| @@ -343,7 +412,7 @@ AU_DEFUN([AC_LIBTOOL_PICMODE],
|
| [_LT_SET_OPTION([LT_INIT], [pic-only])
|
| AC_DIAGNOSE([obsolete],
|
| [$0: Remove this warning and the call to _LT_SET_OPTION when you
|
| -put the `pic-only' option into LT_INIT's first parameter.])
|
| +put the 'pic-only' option into LT_INIT's first parameter.])
|
| ])
|
|
|
| dnl aclocal-1.4 backwards compatibility:
|
|
|