third_party/tcmalloc/vendor/aclocal.m4 - Issue 9316021: Update the tcmalloc vendor branch to r144 (gperftools 2.0).

Unified Diff: third_party/tcmalloc/vendor/aclocal.m4

Issue 9316021: Update the tcmalloc vendor branch to r144 (gperftools 2.0). (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Reuploading Created 8 years, 9 months 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

Download patch

Index: third_party/tcmalloc/vendor/aclocal.m4

diff --git a/third_party/tcmalloc/vendor/aclocal.m4 b/third_party/tcmalloc/vendor/aclocal.m4

index 3727b5e9dd9757f6346f406a3bbdc38fb31b3f62..56700c7e744fd2154bee7f3c6413dffffa7ccef7 100644

--- a/third_party/tcmalloc/vendor/aclocal.m4

+++ b/third_party/tcmalloc/vendor/aclocal.m4

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

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

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

-# 2005 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,7 +11,15 @@

# even the implied warranty of MERCHANTABILITY or FITNESS FOR A

# PARTICULAR PURPOSE.

+m4_ifndef([AC_AUTOCONF_VERSION],

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

+m4_if(AC_AUTOCONF_VERSION, [2.65],,

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

+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'.])])

# This file is free software; the Free Software Foundation

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

@@ -21,14 +29,31 @@

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

# Automake X.Y traces this macro to ensure aclocal.m4 has been

# generated from the m4 files accompanying Automake X.Y.

-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])

+# (This private macro should not be called outside this file.)

+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.1], [],

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

+])

+# _AM_AUTOCONF_VERSION(VERSION)

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

+# aclocal traces this macro to find the Autoconf version.

+# This is a private macro too. Using m4_define simplifies

+# the logic in aclocal, which can simply ignore this definition.

+m4_define([_AM_AUTOCONF_VERSION], [])

# AM_SET_CURRENT_AUTOMAKE_VERSION

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

-# Call AM_AUTOMAKE_VERSION so it can be traced.

+# 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.9.6])])

+[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 -*-

@@ -85,14 +110,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`

# AM_CONDITIONAL -*- Autoconf -*-

# 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 7

+# serial 8

# AM_CONDITIONAL(NAME, SHELL-CONDITION)

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

@@ -101,8 +126,10 @@ AC_DEFUN([AM_CONDITIONAL],

[AC_PREREQ(2.52)dnl

ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],

[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl

-AC_SUBST([$1_TRUE])

-AC_SUBST([$1_FALSE])

+AC_SUBST([$1_TRUE])dnl

+AC_SUBST([$1_FALSE])dnl

+_AM_SUBST_NOTMAKE([$1_TRUE])dnl

+_AM_SUBST_NOTMAKE([$1_FALSE])dnl

if $2; then

$1_TRUE=

$1_FALSE='#'

@@ -116,15 +143,14 @@ AC_CONFIG_COMMANDS_PRE(

Usually this means the macro was only invoked conditionally.]])

fi])])

# 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 8

+# serial 9

# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be

# written in clear, in which case automake, when reading aclocal.m4,

@@ -152,6 +178,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl

ifelse([$1], CC, [depcc="$CC" am_compiler_list=],

[$1], CXX, [depcc="$CXX" am_compiler_list=],

[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],

+ [$1], UPC, [depcc="$UPC" am_compiler_list=],

[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],

[depcc="$$1" am_compiler_list=])

@@ -217,6 +244,7 @@ AC_CACHE_CHECK([dependency style of $depcc],

depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

>/dev/null 2>conftest.err &&

+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

${MAKE-make} -s -f confmf > /dev/null 2>&1; then

@@ -269,7 +297,8 @@ if test "x$enable_dependency_tracking" != xno; then

AMDEPBACKSLASH='\'

AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])

-AC_SUBST([AMDEPBACKSLASH])

+AC_SUBST([AMDEPBACKSLASH])dnl

+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl

])

# Generate code to set up dependency tracking. -*- Autoconf -*-

@@ -294,8 +323,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],

# some people rename them; so instead we look at the file content.

# Grep'ing the first line is not enough: some people post-process

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

- # So let's grep whole file.

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

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

dirpart=`AS_DIRNAME("$mf")`

else

continue

@@ -354,14 +384,14 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])

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

-# 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.

@@ -378,16 +408,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])

# arguments mandatory, and then we can depend on a new Autoconf

# release and drop the old call support.

AC_DEFUN([AM_INIT_AUTOMAKE],

-[AC_PREREQ([2.58])dnl

+[AC_PREREQ([2.60])dnl

dnl Autoconf wants to disallow AM_ names. We explicitly allow

dnl the ones we care about.

m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl

AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl

AC_REQUIRE([AC_PROG_INSTALL])dnl

-# test to see if srcdir already configured

-if test "`cd $srcdir && pwd`" != "`pwd`" &&

- test -f $srcdir/config.status; then

- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])

+if test "`cd $srcdir && pwd`" != "`pwd`"; then

+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output

+ # is not polluted with repeated "-I."

+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl

+ # test to see if srcdir already configured

+ if test -f $srcdir/config.status; then

+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])

+ fi

# test whether we have cygpath

@@ -407,6 +441,9 @@ m4_ifval([$2],

AC_SUBST([PACKAGE], [$1])dnl

AC_SUBST([VERSION], [$2])],

[_AM_SET_OPTIONS([$1])dnl

+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.

+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,

+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl

AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl

AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl

@@ -442,6 +479,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],

[_AM_DEPENDENCIES(CXX)],

[define([AC_PROG_CXX],

defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl

+AC_PROVIDE_IFELSE([AC_PROG_OBJC],

+ [_AM_DEPENDENCIES(OBJC)],

+ [define([AC_PROG_OBJC],

+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl

])

@@ -455,16 +496,17 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],

# 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])

@@ -477,7 +519,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])

# Define $install_sh.

AC_DEFUN([AM_PROG_INSTALL_SH],

[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

-install_sh=${install_sh-"$am_aux_dir/install-sh"}

+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}

AC_SUBST(install_sh)])

@@ -553,13 +595,14 @@ AC_MSG_RESULT([$_am_result])

rm -f confinc confmf

])

+# 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 3

+# serial 5

# AM_PROG_CC_C_O

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

@@ -567,6 +610,7 @@ rm -f confinc confmf

AC_DEFUN([AM_PROG_CC_C_O],

[AC_REQUIRE([AC_PROG_CC_C_O])dnl

AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

+AC_REQUIRE_AUX_FILE([compile])dnl

# FIXME: we rely on the cache variable name because

# there is no other way.

set dummy $CC

@@ -579,18 +623,22 @@ if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then

# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"

CC="$am_aux_dir/compile $CC"

+dnl Make sure AC_PROG_CC is never called again, or it will override our

+dnl setting of CC.

+m4_define([AC_PROG_CC],

+ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])

])

# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-

# 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 4

+# serial 5

# AM_MISSING_PROG(NAME, PROGRAM)

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

@@ -606,6 +654,7 @@ AC_SUBST($1)])

# If it does, set am_missing_run to use it, otherwise, to nothing.

AC_DEFUN([AM_MISSING_HAS_RUN],

[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

+AC_REQUIRE_AUX_FILE([missing])dnl

test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"

# Use eval to expand $SHELL

if eval "$MISSING --run true"; then

@@ -616,7 +665,7 @@ else

])

# This file is free software; the Free Software Foundation

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

@@ -624,60 +673,23 @@ fi

# AM_PROG_MKDIR_P

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

-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.

-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories

-# created by `make install' are always world readable, even if the

-# installer happens to have an overly restrictive umask (e.g. 077).

-# This was a mistake. There are at least two reasons why we must not

-# use `-m 0755':

-# - it causes special bits like SGID to be ignored,

-# - it may be too restrictive (some setups expect 775 directories).

-# Do not use -m 0755 and let people choose whatever they expect by

-# setting umask.

-# We cannot accept any implementation of `mkdir' that recognizes `-p'.

-# Some implementations (such as Solaris 8's) are not thread-safe: if a

-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'

-# concurrently, both version can detect that a/ is missing, but only

-# one can create it and the other will error out. Consequently we

-# restrict ourselves to GNU make (using the --version option ensures

-# this.)

+# Check for `mkdir -p'.

AC_DEFUN([AM_PROG_MKDIR_P],

-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then

- # We used to keeping the `.' as first argument, in order to

- # allow $(mkdir_p) to be used without argument. As in

- # $(mkdir_p) $(somedir)

- # where $(somedir) is conditionally defined. However this is wrong

- # for two reasons:

- # 1. if the package is installed by a user who cannot write `.'

- # make install will fail,

- # 2. the above comment should most certainly read

- # $(mkdir_p) $(DESTDIR)$(somedir)

- # so it does not work when $(somedir) is undefined and

- # $(DESTDIR) is not.

- # To support the latter case, we have to write

- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),

- # so the `.' trick is pointless.

- mkdir_p='mkdir -p --'

-else

- # On NextStep and OpenStep, the `mkdir' command does not

- # recognize any option. It will interpret all options as

- # directories to create, and then abort because `.' already

- # exists.

- for d in ./-p ./--version;

- do

- test -d $d && rmdir $d

- done

- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.

- if test -f "$ac_aux_dir/mkinstalldirs"; then

- mkdir_p='$(mkinstalldirs)'

- else

- mkdir_p='$(install_sh) -d'

- fi

-fi

-AC_SUBST([mkdir_p])])

+[AC_PREREQ([2.60])dnl

+AC_REQUIRE([AC_PROG_MKDIR_P])dnl

+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,

+dnl while keeping a definition of mkdir_p for backward compatibility.

+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.

+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of

+dnl Makefile.ins that do not define MKDIR_P, so we do our own

+dnl adjustment using top_builddir (which is defined more often than

+dnl MKDIR_P).

+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl

+case $mkdir_p in

+ [[\\/$]]* | ?:[[\\/]]*) ;;

+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;

+esac

+])

# Helper functions for option handling. -*- Autoconf -*-

@@ -789,9 +801,21 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.

if test "$cross_compiling" != no; then

AC_CHECK_TOOL([STRIP], [strip], :)

-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"

+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"

AC_SUBST([INSTALL_STRIP_PROGRAM])])

+# 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.

+# _AM_SUBST_NOTMAKE(VARIABLE)

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

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

+# This macro is traced by Automake.

+AC_DEFUN([_AM_SUBST_NOTMAKE])

# Check how to create a tarball. -*- Autoconf -*-

« no previous file with comments | « third_party/tcmalloc/vendor/README_windows.txt ('k') | third_party/tcmalloc/vendor/autogen.sh » ('j') | no next file with comments »