Revert 126715 - Update the tcmalloc vendor branch to r144 (gperftools 2.0).

third_party/tcmalloc/vendor/configure.ac

 ## Process this file with autoconf to produce configure.
 ## In general, the safest way to proceed is to run ./autogen.sh
 
 # make sure we're interpreted by some minimal autoconf
 AC_PREREQ(2.57)
 
-AC_INIT(gperftools, 2.0, google-perftools@googlegroups.com)
+AC_INIT(google-perftools, 1.8, opensource@google.com)
 # Update this value for every release!  (A:B:C will map to foo.so.(A-C).C.B)
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-TCMALLOC_SO_VERSION=5:0:1
-PROFILER_SO_VERSION=3:0:3
+TCMALLOC_SO_VERSION=2:0:2
+PROFILER_SO_VERSION=1:1:1
 
 AC_SUBST(TCMALLOC_SO_VERSION)
 AC_SUBST(PROFILER_SO_VERSION)
 
 # The argument here is just something that should be in the current directory
 # (for sanity checking)
 AC_CONFIG_SRCDIR(README)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([dist-zip])
 AM_CONFIG_HEADER(src/config.h)
 
 # Export the version information (for tc_version and friends)
 TC_VERSION_MAJOR=`expr "$PACKAGE_VERSION" : '\([[0-9]]*\)'`
-TC_VERSION_MINOR=`expr "$PACKAGE_VERSION" : '[[0-9]]*\.\([[0-9]]*\)'`
-TC_VERSION_PATCH=`expr "$PACKAGE_VERSION" : '[[0-9]]*\.[[0-9]]*\(.*\)$'`
+TC_VERSION_MINOR=`expr "$PACKAGE_VERSION" : '[[^.]]*\.\([[0-9]]*\)'`
+TC_VERSION_PATCH=`expr "$PACKAGE_VERSION" : '[[^.0-9]]*\([[^0-9]]*\)$'`
 AC_SUBST(TC_VERSION_MAJOR)
 AC_SUBST(TC_VERSION_MINOR)
 AC_SUBST(TC_VERSION_PATCH)
 AC_SUBST(PACKAGE_STRING)
 
 # The user can choose not to compile in the heap-profiler, the
 # heap-checker, or the cpu-profiler.  There's also the possibility
 # for a 'fully minimal' compile, which leaves out the stacktrace
 # code as well.  By default, we include all of these that the
 # target system supports.
@@ skipping 37 matching lines @@
               [],
               [enable_minimal="$default_enable_minimal"])
 if test "$enable_minimal" = yes; then
   enable_cpu_profiler=no
   enable_heap_profiler=no
   enable_heap_checker=no
 fi
 
 
 # Checks for programs.
-AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_CPP
+AC_PROG_CXX
 AM_CONDITIONAL(GCC, test "$GCC" = yes)   # let the Makefile know if we're gcc
 AM_PROG_CC_C_O      # shrug: autogen.sh suddenly needs this for some reason
 
 # Check if we have an objcopy installed that supports -W
 AC_CHECK_TOOL([OBJCOPY], [objcopy], [])
 AS_IF([test -n "$OBJCOPY"], [dnl
   AC_CACHE_CHECK([if $OBJCOPY supports -W], gpt_cv_objcopy_weaken, [dnl
     AC_LINK_IFELSE([void foo() {} int main() {return 0;}], [dnl
       AS_IF(["$OBJCOPY" -W foo conftest$ac_exeext /dev/null],
             [gpt_cv_objcopy_weaken=yes], [gpt_cv_objcopy_weaken=no])],
@@ skipping 61 matching lines @@
 AC_CHECK_DECLS([cfree,
                 posix_memalign,
                 memalign,
                 valloc,
                 pvalloc],,,
                [#define _XOPEN_SOURCE 600
                 #include <stdlib.h>
                 #include <malloc.h>])
 
 if test "$ac_cv_type_struct_mallinfo" = yes; then
-  AC_SUBST(ac_cv_have_struct_mallinfo, 1)   # gperftools/tcmalloc.h needs this
+  AC_SUBST(ac_cv_have_struct_mallinfo, 1)   # google/tcmalloc.h needs this
 else
   AC_SUBST(ac_cv_have_struct_mallinfo, 0)
 fi
 
 # We need to check for mmap.  cygwin supports mmap, but the autoconf
 # test doesn't work on cygwin:
 #    http://www.cygwin.com/ml/cygwin/2002-04/msg00412.html
 # This workaround comes from
 #    http://cygwin.com/ml/cygwin/2004-11/msg00138.html
 case "$host" in
@@ skipping 51 matching lines @@
 CFLAGS="$CFLAGS -S -O2 -o fp.s"
 # This test will always fail because we don't name our output file properly.
 # We do our own determination of success/failure in the grep, below.
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int f(int x) {return x;}], [return f(0);])],
                   [:], [:])
 AM_CONDITIONAL(X86_64_AND_NO_FP_BY_DEFAULT,
                test "$is_x86_64" = yes && ! grep 'mov.*rsp.*rbp' fp.s >/dev/null 2>&1)
 rm fp.s
 CFLAGS="$OLD_CFLAGS"
 
-# We need to know if we're i386 so we can turn on -mmms, which is not
-# on by default for i386 (it is for x86_64).
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [return __i386__ == 1 ? 0 : 1])],
-                  [is_i386=yes], [is_i386=no])
-AM_CONDITIONAL(I386, test "$is_i386" = yes)
-
 # See if the compiler supports -Wno-unused-result.
 # Newer ubuntu's turn on -D_FORTIFY_SOURCE=2, enabling
 # __attribute__((warn_unused_result)) for things like write(),
 # which we don't care about.
 AC_CACHE_CHECK([if the compiler supports -Wno-unused-result],
                perftools_cv_w_no_unused_result,
                [OLD_CFLAGS="$CFLAGS"
                 CFLAGS="$CFLAGS -Wno-error -Wno-unused-result"
                 # gcc doesn't warn about unknown flags unless it's
                 # also warning for some other purpose, hence the
@@ skipping 47 matching lines @@
                 AC_MSG_RESULT([yes])],
                [AC_MSG_RESULT([no])])
 
 # glibc's __malloc_hook/etc were declared volatile starting in glibc 2.14
 AC_MSG_CHECKING([if __malloc_hook is declared volatile])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <malloc.h>
 void* (* volatile __malloc_hook)(size_t, const void*) = 0;],)],
                   [AC_DEFINE(MALLOC_HOOK_MAYBE_VOLATILE, volatile,
                              Define to 'volatile' if __malloc_hook is declared volatile)
                    AC_MSG_RESULT([yes])],
-                  [AC_DEFINE(MALLOC_HOOK_MAYBE_VOLATILE, )
+                  [AC_DEFINE(MALLOC_HOOK_MAYBE_VOLATILE, ),
                    AC_MSG_RESULT([no])])
 
 # Nanosleep requires extra libraries on some architectures (solaris).
 # This sets NANOSLEEP_LIBS.  nanosleep doesn't exist on mingw, which
 # is fine for us because we don't compile libspinlock, which uses it.
 if test "$need_nanosleep" = yes; then
   ACX_NANOSLEEP
   AC_SUBST(NANOSLEEP_LIBS)
 fi
 
@@ skipping 30 matching lines @@
            It's safe to define this here because config.h is only used
            internally, to compile the DLL, and every DLL source file
            #includes "config.h" before anything else.])
 
 # In theory, config.h files shouldn't need a header guard, but we do,
 # because we (maybe) #include windows/mingw.h from within config.h,
 # and it #includes other .h files.  These all have header guards, so
 # the end result is if config.h is #included twice, its #undefs get
 # evaluated twice, but all the ones in mingw.h/etc only get evaluated
 # once, potentially causing trouble.  c.f.
-#   http://code.google.com/p/gperftools/issues/detail?id=246
+#   http://code.google.com/p/google-perftools/issues/detail?id=246
 AH_TOP([
-#ifndef GPERFTOOLS_CONFIG_H_
-#define GPERFTOOLS_CONFIG_H_
+#ifndef GOOGLE_PERFTOOLS_CONFIG_H_
+#define GOOGLE_PERFTOOLS_CONFIG_H_
 ])
 
 AH_VERBATIM([PTHREADS_CRASHES_IF_RUN_TOO_EARLY],
             [/* Mark the systems where we know it's bad if pthreads runs too
    early before main (before threads are initialized, presumably).  */
 #ifdef __FreeBSD__
 #define PTHREADS_CRASHES_IF_RUN_TOO_EARLY 1
 #endif])
 
 # MinGW uses autoconf, but also needs the windows shim routines
 # (since it doesn't have its own support for, say, pthreads).
 # This requires us to #include a special header file, and also to
 # link in some windows versions of .o's instead of the unix versions.
 #
 # Also, manually mark systems where we have to be careful how early
 # we run pthreads.  TODO(csilvers): turn this into an autoconf check.
 AH_BOTTOM([
 #ifdef __MINGW32__
 #include "windows/mingw.h"
 #endif
 
-#endif  /* #ifndef GPERFTOOLS_CONFIG_H_ */
+#endif  /* #ifndef GOOGLE_PERFTOOLS_CONFIG_H_ */
 ])
 AM_CONDITIONAL(MINGW, expr $host : '.*-mingw' >/dev/null 2>&1)
 AM_CONDITIONAL(OSX, expr $host : '.*-apple-darwin.*' >/dev/null 2>&1)
 
 # Redhat 7 (and below?) has sys/ucontext.h, but if you try to #include
 # it directly, the compiler gets upset.  So we pretend we don't have
 # it.
 if cat /etc/redhat-release 2>/dev/null | grep "Red Hat Linux release 7" >/dev/null 2>&1; then
 AC_DEFINE(HAVE_SYS_UCONTEXT_H, 0, [<sys/ucontext.h> is broken on redhat 7])
 fi
 
 # Export the --enable flags we set above.  We do this at the end so
 # other configure rules can enable or disable targets based on what
 # they find.
 AM_CONDITIONAL(WITH_CPU_PROFILER, test "$enable_cpu_profiler" = yes)
 AM_CONDITIONAL(WITH_HEAP_PROFILER, test "$enable_heap_profiler" = yes)
 AM_CONDITIONAL(WITH_HEAP_CHECKER, test "$enable_heap_checker" = yes)
 AM_CONDITIONAL(WITH_DEBUGALLOC, test "$enable_debugalloc" = yes)
 # We make tcmalloc.so if either heap-profiler or heap-checker is asked for.
 AM_CONDITIONAL(WITH_HEAP_PROFILER_OR_CHECKER,
                test "$enable_heap_profiler" = yes -o \
                     "$enable_heap_checker" = yes)
 # If we don't use any profilers, we don't need stack traces (or pprof)
 AM_CONDITIONAL(WITH_STACK_TRACE, test "$enable_cpu_profiler" = yes -o \
                                       "$enable_heap_profiler" = yes -o \
                                       "$enable_heap_checker" = yes)
 
 # Write generated configuration file
-AC_CONFIG_FILES([Makefile
-                 src/gperftools/tcmalloc.h src/windows/gperftools/tcmalloc.h])
+AC_CONFIG_FILES([Makefile src/google/tcmalloc.h src/windows/google/tcmalloc.h])
 AC_OUTPUT