toolkit/crashreporter/breakpad-patches/02-cfi-rule-repr.patch

Sat, 03 Jan 2015 20:18:00 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Sat, 03 Jan 2015 20:18:00 +0100
branch
TOR_BUG_3246
changeset 7
129ffea94266
permissions
-rw-r--r--

Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.

     1 # HG changeset patch
     2 # User Ted Mielczarek <ted.mielczarek@gmail.com>
     3 # Date 1360255133 18000
     4 # Node ID d23a69a6c34a1f1c21e241f37b388c8689f2386b
     5 # Parent  c3b1109dd392c16a9fe4e85da693010966dbbf0b
     6 Change the representation of CFI rules to avoid postfix expressions in most cases
     7 Patch by Julian Seward <jseward@acm.org>
     8 R=ted
    10 diff --git a/Makefile.am b/Makefile.am
    11 --- a/Makefile.am
    12 +++ b/Makefile.am
    13 @@ -133,16 +133,17 @@
    14  	src/google_breakpad/processor/source_line_resolver_base.h \
    15  	src/google_breakpad/processor/source_line_resolver_interface.h \
    16  	src/google_breakpad/processor/stack_frame.h \
    17  	src/google_breakpad/processor/stack_frame_cpu.h \
    18  	src/google_breakpad/processor/stack_frame_symbolizer.h \
    19  	src/google_breakpad/processor/stackwalker.h \
    20  	src/google_breakpad/processor/symbol_supplier.h \
    21  	src/google_breakpad/processor/system_info.h \
    22 +	src/common/module.cc \
    23  	src/processor/address_map-inl.h \
    24  	src/processor/address_map.h \
    25  	src/processor/basic_code_module.h \
    26  	src/processor/basic_code_modules.cc \
    27  	src/processor/basic_code_modules.h \
    28  	src/processor/basic_source_line_resolver_types.h \
    29  	src/processor/basic_source_line_resolver.cc \
    30  	src/processor/binarystream.h \
    31 @@ -555,30 +556,32 @@
    32  	src/testing/src/gmock-all.cc
    33  src_processor_basic_source_line_resolver_unittest_CPPFLAGS = \
    34  	-I$(top_srcdir)/src \
    35  	-I$(top_srcdir)/src/testing/include \
    36  	-I$(top_srcdir)/src/testing/gtest/include \
    37  	-I$(top_srcdir)/src/testing/gtest \
    38  	-I$(top_srcdir)/src/testing
    39  src_processor_basic_source_line_resolver_unittest_LDADD = \
    40 +	src/common/module.o \
    41  	src/processor/basic_source_line_resolver.o \
    42  	src/processor/cfi_frame_info.o \
    43  	src/processor/pathname_stripper.o \
    44  	src/processor/logging.o \
    45  	src/processor/source_line_resolver_base.o \
    46  	src/processor/tokenize.o \
    47  	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
    49  src_processor_cfi_frame_info_unittest_SOURCES = \
    50  	src/processor/cfi_frame_info_unittest.cc \
    51  	src/testing/gtest/src/gtest-all.cc \
    52  	src/testing/gtest/src/gtest_main.cc \
    53  	src/testing/src/gmock-all.cc
    54  src_processor_cfi_frame_info_unittest_LDADD = \
    55 +	src/common/module.o \
    56  	src/processor/cfi_frame_info.o \
    57  	src/processor/logging.o \
    58  	src/processor/pathname_stripper.o \
    59  	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
    60  src_processor_cfi_frame_info_unittest_CPPFLAGS = \
    61  	-I$(top_srcdir)/src \
    62  	-I$(top_srcdir)/src/testing/include \
    63  	-I$(top_srcdir)/src/testing/gtest/include \
    64 @@ -598,16 +601,17 @@
    65  	src/testing/src/gmock-all.cc
    66  src_processor_exploitability_unittest_CPPFLAGS = \
    67  	-I$(top_srcdir)/src \
    68  	-I$(top_srcdir)/src/testing/include \
    69  	-I$(top_srcdir)/src/testing/gtest/include \
    70  	-I$(top_srcdir)/src/testing/gtest \
    71  	-I$(top_srcdir)/src/testing
    72  src_processor_exploitability_unittest_LDADD = \
    73 +	src/common/module.o \
    74  	src/processor/minidump_processor.o \
    75  	src/processor/process_state.o \
    76  	src/processor/disassembler_x86.o \
    77  	src/processor/exploitability.o \
    78  	src/processor/exploitability_win.o \
    79  	src/processor/basic_code_modules.o \
    80  	src/processor/basic_source_line_resolver.o \
    81  	src/processor/call_stack.o \
    82 @@ -649,16 +653,17 @@
    83  	src/testing/src/gmock-all.cc
    84  src_processor_fast_source_line_resolver_unittest_CPPFLAGS = \
    85  	-I$(top_srcdir)/src \
    86  	-I$(top_srcdir)/src/testing/include \
    87  	-I$(top_srcdir)/src/testing/gtest/include \
    88  	-I$(top_srcdir)/src/testing/gtest \
    89  	-I$(top_srcdir)/src/testing
    90  src_processor_fast_source_line_resolver_unittest_LDADD = \
    91 +	src/common/module.o \
    92  	src/processor/fast_source_line_resolver.o \
    93  	src/processor/basic_source_line_resolver.o \
    94  	src/processor/cfi_frame_info.o \
    95  	src/processor/module_comparer.o \
    96  	src/processor/module_serializer.o \
    97  	src/processor/pathname_stripper.o \
    98  	src/processor/logging.o \
    99  	src/processor/source_line_resolver_base.o \
   100 @@ -686,16 +691,17 @@
   101  	src/testing/src/gmock-all.cc
   102  src_processor_minidump_processor_unittest_CPPFLAGS = \
   103  	-I$(top_srcdir)/src \
   104  	-I$(top_srcdir)/src/testing/include \
   105  	-I$(top_srcdir)/src/testing/gtest/include \
   106  	-I$(top_srcdir)/src/testing/gtest \
   107  	-I$(top_srcdir)/src/testing
   108  src_processor_minidump_processor_unittest_LDADD = \
   109 +	src/common/module.o \
   110  	src/processor/basic_code_modules.o \
   111  	src/processor/basic_source_line_resolver.o \
   112  	src/processor/call_stack.o \
   113  	src/processor/cfi_frame_info.o \
   114  	src/processor/disassembler_x86.o \
   115  	src/processor/exploitability.o \
   116  	src/processor/exploitability_win.o \
   117  	src/processor/logging.o \
   118 @@ -799,16 +805,17 @@
   119  	src/processor/pathname_stripper_unittest.cc
   120  src_processor_pathname_stripper_unittest_LDADD = \
   121  	src/processor/pathname_stripper.o \
   122  	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
   124  src_processor_postfix_evaluator_unittest_SOURCES = \
   125  	src/processor/postfix_evaluator_unittest.cc
   126  src_processor_postfix_evaluator_unittest_LDADD = \
   127 +	src/common/module.o \
   128  	src/processor/logging.o \
   129  	src/processor/pathname_stripper.o \
   130  	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
   132  src_processor_range_map_unittest_SOURCES = \
   133  	src/processor/range_map_unittest.cc
   134  src_processor_range_map_unittest_LDADD = \
   135  	src/processor/logging.o \
   136 @@ -928,16 +935,17 @@
   137  	src/processor/basic_code_modules.o \
   138  	src/processor/logging.o \
   139  	src/processor/minidump.o \
   140  	src/processor/pathname_stripper.o
   142  src_processor_minidump_stackwalk_SOURCES = \
   143  	src/processor/minidump_stackwalk.cc
   144  src_processor_minidump_stackwalk_LDADD = \
   145 +	src/common/module.o \
   146  	src/processor/basic_code_modules.o \
   147  	src/processor/basic_source_line_resolver.o \
   148  	src/processor/binarystream.o \
   149  	src/processor/call_stack.o \
   150  	src/processor/cfi_frame_info.o \
   151  	src/processor/disassembler_x86.o \
   152  	src/processor/exploitability.o \
   153  	src/processor/exploitability_win.o \
   154 diff --git a/Makefile.in b/Makefile.in
   155 --- a/Makefile.in
   156 +++ b/Makefile.in
   157 @@ -1,14 +1,14 @@
   158 -# Makefile.in generated by automake 1.11.1 from Makefile.am.
   159 +# Makefile.in generated by automake 1.11.3 from Makefile.am.
   160  # @configure_input@
   162  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
   163 -# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
   164 -# Inc.
   165 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
   166 +# Foundation, Inc.
   167  # This Makefile.in is free software; the Free Software Foundation
   168  # gives unlimited permission to copy and/or distribute it,
   169  # with or without modifications, as long as this notice is preserved.
   171  # This program is distributed in the hope that it will be useful,
   172  # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
   173  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
   174  # PARTICULAR PURPOSE.
   175 @@ -190,16 +190,22 @@
   176    sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
   177    $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
   178      if (++n[$$2] == $(am__install_max)) \
   179        { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
   180      END { for (dir in files) print dir, files[dir] }'
   181  am__base_list = \
   182    sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   183    sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
   184 +am__uninstall_files_from_dir = { \
   185 +  test -z "$$files" \
   186 +    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
   187 +    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
   188 +         $(am__cd) "$$dir" && rm -f $$files; }; \
   189 +  }
   190  am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
   191  	"$(DESTDIR)$(docdir)"
   192  LIBRARIES = $(lib_LIBRARIES) $(noinst_LIBRARIES)
   193  AR = ar
   194  ARFLAGS = cru
   195  src_client_linux_libbreakpad_client_a_AR = $(AR) $(ARFLAGS)
   196  src_client_linux_libbreakpad_client_a_LIBADD =
   197  am__src_client_linux_libbreakpad_client_a_SOURCES_DIST =  \
   198 @@ -261,18 +267,18 @@
   199  	src/google_breakpad/processor/source_line_resolver_base.h \
   200  	src/google_breakpad/processor/source_line_resolver_interface.h \
   201  	src/google_breakpad/processor/stack_frame.h \
   202  	src/google_breakpad/processor/stack_frame_cpu.h \
   203  	src/google_breakpad/processor/stack_frame_symbolizer.h \
   204  	src/google_breakpad/processor/stackwalker.h \
   205  	src/google_breakpad/processor/symbol_supplier.h \
   206  	src/google_breakpad/processor/system_info.h \
   207 -	src/processor/address_map-inl.h src/processor/address_map.h \
   208 -	src/processor/basic_code_module.h \
   209 +	src/common/module.cc src/processor/address_map-inl.h \
   210 +	src/processor/address_map.h src/processor/basic_code_module.h \
   211  	src/processor/basic_code_modules.cc \
   212  	src/processor/basic_code_modules.h \
   213  	src/processor/basic_source_line_resolver_types.h \
   214  	src/processor/basic_source_line_resolver.cc \
   215  	src/processor/binarystream.h src/processor/binarystream.cc \
   216  	src/processor/call_stack.cc src/processor/cfi_frame_info.cc \
   217  	src/processor/cfi_frame_info.h \
   218  	src/processor/contained_range_map-inl.h \
   219 @@ -322,17 +328,19 @@
   220  	src/processor/static_contained_range_map-inl.h \
   221  	src/processor/static_contained_range_map.h \
   222  	src/processor/static_map_iterator-inl.h \
   223  	src/processor/static_map_iterator.h \
   224  	src/processor/static_map-inl.h src/processor/static_map.h \
   225  	src/processor/static_range_map-inl.h \
   226  	src/processor/static_range_map.h src/processor/tokenize.cc \
   227  	src/processor/tokenize.h
   228 -@DISABLE_PROCESSOR_FALSE@am_src_libbreakpad_a_OBJECTS = src/processor/basic_code_modules.$(OBJEXT) \
   229 +@DISABLE_PROCESSOR_FALSE@am_src_libbreakpad_a_OBJECTS =  \
   230 +@DISABLE_PROCESSOR_FALSE@	src/common/module.$(OBJEXT) \
   231 +@DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_modules.$(OBJEXT) \
   232  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.$(OBJEXT) \
   233  @DISABLE_PROCESSOR_FALSE@	src/processor/binarystream.$(OBJEXT) \
   234  @DISABLE_PROCESSOR_FALSE@	src/processor/call_stack.$(OBJEXT) \
   235  @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.$(OBJEXT) \
   236  @DISABLE_PROCESSOR_FALSE@	src/processor/disassembler_x86.$(OBJEXT) \
   237  @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability.$(OBJEXT) \
   238  @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability_win.$(OBJEXT) \
   239  @DISABLE_PROCESSOR_FALSE@	src/processor/fast_source_line_resolver.$(OBJEXT) \
   240 @@ -620,17 +628,19 @@
   241  am__src_processor_basic_source_line_resolver_unittest_SOURCES_DIST =  \
   242  	src/processor/basic_source_line_resolver_unittest.cc \
   243  	src/testing/gtest/src/gtest-all.cc \
   244  	src/testing/src/gmock-all.cc
   245  @DISABLE_PROCESSOR_FALSE@am_src_processor_basic_source_line_resolver_unittest_OBJECTS = src/processor/src_processor_basic_source_line_resolver_unittest-basic_source_line_resolver_unittest.$(OBJEXT) \
   246  @DISABLE_PROCESSOR_FALSE@	src/testing/gtest/src/src_processor_basic_source_line_resolver_unittest-gtest-all.$(OBJEXT) \
   247  @DISABLE_PROCESSOR_FALSE@	src/testing/src/src_processor_basic_source_line_resolver_unittest-gmock-all.$(OBJEXT)
   248  src_processor_basic_source_line_resolver_unittest_OBJECTS = $(am_src_processor_basic_source_line_resolver_unittest_OBJECTS)
   249 -@DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_DEPENDENCIES = src/processor/basic_source_line_resolver.o \
   250 +@DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_DEPENDENCIES =  \
   251 +@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   252 +@DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   253  @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   254  @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o \
   255  @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   256  @DISABLE_PROCESSOR_FALSE@	src/processor/source_line_resolver_base.o \
   257  @DISABLE_PROCESSOR_FALSE@	src/processor/tokenize.o \
   258  @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1) \
   259  @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1)
   260  am__src_processor_binarystream_unittest_SOURCES_DIST =  \
   261 @@ -653,16 +663,17 @@
   262  	src/testing/src/gmock-all.cc
   263  @DISABLE_PROCESSOR_FALSE@am_src_processor_cfi_frame_info_unittest_OBJECTS = src/processor/src_processor_cfi_frame_info_unittest-cfi_frame_info_unittest.$(OBJEXT) \
   264  @DISABLE_PROCESSOR_FALSE@	src/testing/gtest/src/src_processor_cfi_frame_info_unittest-gtest-all.$(OBJEXT) \
   265  @DISABLE_PROCESSOR_FALSE@	src/testing/gtest/src/src_processor_cfi_frame_info_unittest-gtest_main.$(OBJEXT) \
   266  @DISABLE_PROCESSOR_FALSE@	src/testing/src/src_processor_cfi_frame_info_unittest-gmock-all.$(OBJEXT)
   267  src_processor_cfi_frame_info_unittest_OBJECTS =  \
   268  	$(am_src_processor_cfi_frame_info_unittest_OBJECTS)
   269  @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_DEPENDENCIES =  \
   270 +@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   271  @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   272  @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   273  @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o \
   274  @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1) \
   275  @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1)
   276  am__src_processor_contained_range_map_unittest_SOURCES_DIST =  \
   277  	src/processor/contained_range_map_unittest.cc
   278  @DISABLE_PROCESSOR_FALSE@am_src_processor_contained_range_map_unittest_OBJECTS = src/processor/contained_range_map_unittest.$(OBJEXT)
   279 @@ -694,16 +705,17 @@
   280  	src/testing/src/gmock-all.cc
   281  @DISABLE_PROCESSOR_FALSE@am_src_processor_exploitability_unittest_OBJECTS = src/processor/src_processor_exploitability_unittest-exploitability_unittest.$(OBJEXT) \
   282  @DISABLE_PROCESSOR_FALSE@	src/testing/gtest/src/src_processor_exploitability_unittest-gtest-all.$(OBJEXT) \
   283  @DISABLE_PROCESSOR_FALSE@	src/testing/gtest/src/src_processor_exploitability_unittest-gtest_main.$(OBJEXT) \
   284  @DISABLE_PROCESSOR_FALSE@	src/testing/src/src_processor_exploitability_unittest-gmock-all.$(OBJEXT)
   285  src_processor_exploitability_unittest_OBJECTS =  \
   286  	$(am_src_processor_exploitability_unittest_OBJECTS)
   287  @DISABLE_PROCESSOR_FALSE@src_processor_exploitability_unittest_DEPENDENCIES =  \
   288 +@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   289  @DISABLE_PROCESSOR_FALSE@	src/processor/minidump_processor.o \
   290  @DISABLE_PROCESSOR_FALSE@	src/processor/process_state.o \
   291  @DISABLE_PROCESSOR_FALSE@	src/processor/disassembler_x86.o \
   292  @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability.o \
   293  @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability_win.o \
   294  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_modules.o \
   295  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   296  @DISABLE_PROCESSOR_FALSE@	src/processor/call_stack.o \
   297 @@ -726,17 +738,19 @@
   298  am__src_processor_fast_source_line_resolver_unittest_SOURCES_DIST =  \
   299  	src/processor/fast_source_line_resolver_unittest.cc \
   300  	src/testing/gtest/src/gtest-all.cc \
   301  	src/testing/src/gmock-all.cc
   302  @DISABLE_PROCESSOR_FALSE@am_src_processor_fast_source_line_resolver_unittest_OBJECTS = src/processor/src_processor_fast_source_line_resolver_unittest-fast_source_line_resolver_unittest.$(OBJEXT) \
   303  @DISABLE_PROCESSOR_FALSE@	src/testing/gtest/src/src_processor_fast_source_line_resolver_unittest-gtest-all.$(OBJEXT) \
   304  @DISABLE_PROCESSOR_FALSE@	src/testing/src/src_processor_fast_source_line_resolver_unittest-gmock-all.$(OBJEXT)
   305  src_processor_fast_source_line_resolver_unittest_OBJECTS = $(am_src_processor_fast_source_line_resolver_unittest_OBJECTS)
   306 -@DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_DEPENDENCIES = src/processor/fast_source_line_resolver.o \
   307 +@DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_DEPENDENCIES =  \
   308 +@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   309 +@DISABLE_PROCESSOR_FALSE@	src/processor/fast_source_line_resolver.o \
   310  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   311  @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   312  @DISABLE_PROCESSOR_FALSE@	src/processor/module_comparer.o \
   313  @DISABLE_PROCESSOR_FALSE@	src/processor/module_serializer.o \
   314  @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o \
   315  @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   316  @DISABLE_PROCESSOR_FALSE@	src/processor/source_line_resolver_base.o \
   317  @DISABLE_PROCESSOR_FALSE@	src/processor/tokenize.o \
   318 @@ -771,16 +785,17 @@
   319  	src/testing/gtest/src/gtest-all.cc \
   320  	src/testing/src/gmock-all.cc
   321  @DISABLE_PROCESSOR_FALSE@am_src_processor_minidump_processor_unittest_OBJECTS = src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.$(OBJEXT) \
   322  @DISABLE_PROCESSOR_FALSE@	src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.$(OBJEXT) \
   323  @DISABLE_PROCESSOR_FALSE@	src/testing/src/src_processor_minidump_processor_unittest-gmock-all.$(OBJEXT)
   324  src_processor_minidump_processor_unittest_OBJECTS =  \
   325  	$(am_src_processor_minidump_processor_unittest_OBJECTS)
   326  @DISABLE_PROCESSOR_FALSE@src_processor_minidump_processor_unittest_DEPENDENCIES =  \
   327 +@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   328  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_modules.o \
   329  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   330  @DISABLE_PROCESSOR_FALSE@	src/processor/call_stack.o \
   331  @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   332  @DISABLE_PROCESSOR_FALSE@	src/processor/disassembler_x86.o \
   333  @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability.o \
   334  @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability_win.o \
   335  @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   336 @@ -801,16 +816,17 @@
   337  @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1) \
   338  @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1)
   339  am__src_processor_minidump_stackwalk_SOURCES_DIST =  \
   340  	src/processor/minidump_stackwalk.cc
   341  @DISABLE_PROCESSOR_FALSE@am_src_processor_minidump_stackwalk_OBJECTS = src/processor/minidump_stackwalk.$(OBJEXT)
   342  src_processor_minidump_stackwalk_OBJECTS =  \
   343  	$(am_src_processor_minidump_stackwalk_OBJECTS)
   344  @DISABLE_PROCESSOR_FALSE@src_processor_minidump_stackwalk_DEPENDENCIES =  \
   345 +@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   346  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_modules.o \
   347  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   348  @DISABLE_PROCESSOR_FALSE@	src/processor/binarystream.o \
   349  @DISABLE_PROCESSOR_FALSE@	src/processor/call_stack.o \
   350  @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   351  @DISABLE_PROCESSOR_FALSE@	src/processor/disassembler_x86.o \
   352  @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability.o \
   353  @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability_win.o \
   354 @@ -862,16 +878,17 @@
   355  @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1) \
   356  @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1)
   357  am__src_processor_postfix_evaluator_unittest_SOURCES_DIST =  \
   358  	src/processor/postfix_evaluator_unittest.cc
   359  @DISABLE_PROCESSOR_FALSE@am_src_processor_postfix_evaluator_unittest_OBJECTS = src/processor/postfix_evaluator_unittest.$(OBJEXT)
   360  src_processor_postfix_evaluator_unittest_OBJECTS =  \
   361  	$(am_src_processor_postfix_evaluator_unittest_OBJECTS)
   362  @DISABLE_PROCESSOR_FALSE@src_processor_postfix_evaluator_unittest_DEPENDENCIES =  \
   363 +@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   364  @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   365  @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o \
   366  @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1) \
   367  @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1)
   368  am__src_processor_range_map_unittest_SOURCES_DIST =  \
   369  	src/processor/range_map_unittest.cc
   370  @DISABLE_PROCESSOR_FALSE@am_src_processor_range_map_unittest_OBJECTS = src/processor/range_map_unittest.$(OBJEXT)
   371  src_processor_range_map_unittest_OBJECTS =  \
   372 @@ -1212,22 +1229,26 @@
   373  ETAGS = etags
   374  CTAGS = ctags
   375  am__tty_colors = \
   376  red=; grn=; lgn=; blu=; std=
   377  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
   378  distdir = $(PACKAGE)-$(VERSION)
   379  top_distdir = $(distdir)
   380  am__remove_distdir = \
   381 -  { test ! -d "$(distdir)" \
   382 -    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
   383 -         && rm -fr "$(distdir)"; }; }
   384 +  if test -d "$(distdir)"; then \
   385 +    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
   386 +      && rm -rf "$(distdir)" \
   387 +      || { sleep 5 && rm -rf "$(distdir)"; }; \
   388 +  else :; fi
   389  DIST_ARCHIVES = $(distdir).tar.gz
   390  GZIP_ENV = --best
   391  distuninstallcheck_listfiles = find . -type f -print
   392 +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   393 +  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
   394  distcleancheck_listfiles = find . -type f -print
   395  ACLOCAL = @ACLOCAL@
   396  AMTAR = @AMTAR@
   397  AUTOCONF = @AUTOCONF@
   398  AUTOHEADER = @AUTOHEADER@
   399  AUTOMAKE = @AUTOMAKE@
   400  AWK = @AWK@
   401  CC = @CC@
   402 @@ -1383,16 +1404,17 @@
   403  @DISABLE_PROCESSOR_FALSE@	src/google_breakpad/processor/source_line_resolver_base.h \
   404  @DISABLE_PROCESSOR_FALSE@	src/google_breakpad/processor/source_line_resolver_interface.h \
   405  @DISABLE_PROCESSOR_FALSE@	src/google_breakpad/processor/stack_frame.h \
   406  @DISABLE_PROCESSOR_FALSE@	src/google_breakpad/processor/stack_frame_cpu.h \
   407  @DISABLE_PROCESSOR_FALSE@	src/google_breakpad/processor/stack_frame_symbolizer.h \
   408  @DISABLE_PROCESSOR_FALSE@	src/google_breakpad/processor/stackwalker.h \
   409  @DISABLE_PROCESSOR_FALSE@	src/google_breakpad/processor/symbol_supplier.h \
   410  @DISABLE_PROCESSOR_FALSE@	src/google_breakpad/processor/system_info.h \
   411 +@DISABLE_PROCESSOR_FALSE@	src/common/module.cc \
   412  @DISABLE_PROCESSOR_FALSE@	src/processor/address_map-inl.h \
   413  @DISABLE_PROCESSOR_FALSE@	src/processor/address_map.h \
   414  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_module.h \
   415  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_modules.cc \
   416  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_modules.h \
   417  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver_types.h \
   418  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.cc \
   419  @DISABLE_PROCESSOR_FALSE@	src/processor/binarystream.h \
   420 @@ -1715,31 +1737,33 @@
   421  @DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_CPPFLAGS = \
   422  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src \
   423  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/include \
   424  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/gtest/include \
   425  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/gtest \
   426  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing
   428  @DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_LDADD = \
   429 +@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   430  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   431  @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   432  @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o \
   433  @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   434  @DISABLE_PROCESSOR_FALSE@	src/processor/source_line_resolver_base.o \
   435  @DISABLE_PROCESSOR_FALSE@	src/processor/tokenize.o \
   436  @DISABLE_PROCESSOR_FALSE@	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
   438  @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_SOURCES = \
   439  @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info_unittest.cc \
   440  @DISABLE_PROCESSOR_FALSE@	src/testing/gtest/src/gtest-all.cc \
   441  @DISABLE_PROCESSOR_FALSE@	src/testing/gtest/src/gtest_main.cc \
   442  @DISABLE_PROCESSOR_FALSE@	src/testing/src/gmock-all.cc
   444  @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_LDADD = \
   445 +@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   446  @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   447  @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   448  @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o \
   449  @DISABLE_PROCESSOR_FALSE@	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
   451  @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_CPPFLAGS = \
   452  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src \
   453  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/include \
   454 @@ -1763,16 +1787,17 @@
   455  @DISABLE_PROCESSOR_FALSE@src_processor_exploitability_unittest_CPPFLAGS = \
   456  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src \
   457  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/include \
   458  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/gtest/include \
   459  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/gtest \
   460  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing
   462  @DISABLE_PROCESSOR_FALSE@src_processor_exploitability_unittest_LDADD = \
   463 +@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   464  @DISABLE_PROCESSOR_FALSE@	src/processor/minidump_processor.o \
   465  @DISABLE_PROCESSOR_FALSE@	src/processor/process_state.o \
   466  @DISABLE_PROCESSOR_FALSE@	src/processor/disassembler_x86.o \
   467  @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability.o \
   468  @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability_win.o \
   469  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_modules.o \
   470  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   471  @DISABLE_PROCESSOR_FALSE@	src/processor/call_stack.o \
   472 @@ -1818,16 +1843,17 @@
   473  @DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_CPPFLAGS = \
   474  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src \
   475  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/include \
   476  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/gtest/include \
   477  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/gtest \
   478  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing
   480  @DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_LDADD = \
   481 +@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   482  @DISABLE_PROCESSOR_FALSE@	src/processor/fast_source_line_resolver.o \
   483  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   484  @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   485  @DISABLE_PROCESSOR_FALSE@	src/processor/module_comparer.o \
   486  @DISABLE_PROCESSOR_FALSE@	src/processor/module_serializer.o \
   487  @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o \
   488  @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   489  @DISABLE_PROCESSOR_FALSE@	src/processor/source_line_resolver_base.o \
   490 @@ -1859,16 +1885,17 @@
   491  @DISABLE_PROCESSOR_FALSE@src_processor_minidump_processor_unittest_CPPFLAGS = \
   492  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src \
   493  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/include \
   494  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/gtest/include \
   495  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/gtest \
   496  @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing
   498  @DISABLE_PROCESSOR_FALSE@src_processor_minidump_processor_unittest_LDADD = \
   499 +@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   500  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_modules.o \
   501  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   502  @DISABLE_PROCESSOR_FALSE@	src/processor/call_stack.o \
   503  @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   504  @DISABLE_PROCESSOR_FALSE@	src/processor/disassembler_x86.o \
   505  @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability.o \
   506  @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability_win.o \
   507  @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   508 @@ -1984,16 +2011,17 @@
   509  @DISABLE_PROCESSOR_FALSE@src_processor_pathname_stripper_unittest_LDADD = \
   510  @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o \
   511  @DISABLE_PROCESSOR_FALSE@	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
   513  @DISABLE_PROCESSOR_FALSE@src_processor_postfix_evaluator_unittest_SOURCES = \
   514  @DISABLE_PROCESSOR_FALSE@	src/processor/postfix_evaluator_unittest.cc
   516  @DISABLE_PROCESSOR_FALSE@src_processor_postfix_evaluator_unittest_LDADD = \
   517 +@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   518  @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   519  @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o \
   520  @DISABLE_PROCESSOR_FALSE@	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
   522  @DISABLE_PROCESSOR_FALSE@src_processor_range_map_unittest_SOURCES = \
   523  @DISABLE_PROCESSOR_FALSE@	src/processor/range_map_unittest.cc
   525  @DISABLE_PROCESSOR_FALSE@src_processor_range_map_unittest_LDADD = \
   526 @@ -2122,16 +2150,17 @@
   527  @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   528  @DISABLE_PROCESSOR_FALSE@	src/processor/minidump.o \
   529  @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o
   531  @DISABLE_PROCESSOR_FALSE@src_processor_minidump_stackwalk_SOURCES = \
   532  @DISABLE_PROCESSOR_FALSE@	src/processor/minidump_stackwalk.cc
   534  @DISABLE_PROCESSOR_FALSE@src_processor_minidump_stackwalk_LDADD = \
   535 +@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   536  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_modules.o \
   537  @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   538  @DISABLE_PROCESSOR_FALSE@	src/processor/binarystream.o \
   539  @DISABLE_PROCESSOR_FALSE@	src/processor/call_stack.o \
   540  @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   541  @DISABLE_PROCESSOR_FALSE@	src/processor/disassembler_x86.o \
   542  @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability.o \
   543  @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability_win.o \
   544 @@ -2289,17 +2318,17 @@
   545  	src/tools/windows/dump_syms/testdata/dump_syms_regtest.sym \
   546  	src/tools/windows/symupload/symupload.cc \
   547  	src/tools/windows/symupload/symupload.vcproj
   549  all: all-am
   551  .SUFFIXES:
   552  .SUFFIXES: .S .c .cc .o .obj
   553 -am--refresh:
   554 +am--refresh: Makefile
   555  	@:
   556  $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
   557  	@for dep in $?; do \
   558  	  case '$(am__configure_deps)' in \
   559  	    *$$dep*) \
   560  	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
   561  	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
   562  		&& exit 0; \
   563 @@ -2325,20 +2354,18 @@
   565  $(top_srcdir)/configure:  $(am__configure_deps)
   566  	$(am__cd) $(srcdir) && $(AUTOCONF)
   567  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
   568  	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
   569  $(am__aclocal_m4_deps):
   571  src/config.h: src/stamp-h1
   572 -	@if test ! -f $@; then \
   573 -	  rm -f src/stamp-h1; \
   574 -	  $(MAKE) $(AM_MAKEFLAGS) src/stamp-h1; \
   575 -	else :; fi
   576 +	@if test ! -f $@; then rm -f src/stamp-h1; else :; fi
   577 +	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) src/stamp-h1; else :; fi
   579  src/stamp-h1: $(top_srcdir)/src/config.h.in $(top_builddir)/config.status
   580  	@rm -f src/stamp-h1
   581  	cd $(top_builddir) && $(SHELL) ./config.status src/config.h
   582  $(top_srcdir)/src/config.h.in:  $(am__configure_deps) 
   583  	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
   584  	rm -f src/stamp-h1
   585  	touch $@
   586 @@ -2366,19 +2393,17 @@
   587  	    ( cd "$(DESTDIR)$(libdir)" && $(RANLIB) $$f ) || exit $$?; \
   588  	  else :; fi; \
   589  	done
   591  uninstall-libLIBRARIES:
   592  	@$(NORMAL_UNINSTALL)
   593  	@list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
   594  	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
   595 -	test -n "$$files" || exit 0; \
   596 -	echo " ( cd '$(DESTDIR)$(libdir)' && rm -f "$$files" )"; \
   597 -	cd "$(DESTDIR)$(libdir)" && rm -f $$files
   598 +	dir='$(DESTDIR)$(libdir)'; $(am__uninstall_files_from_dir)
   600  clean-libLIBRARIES:
   601  	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
   603  clean-noinstLIBRARIES:
   604  	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
   605  src/client/linux/crash_generation/$(am__dirstamp):
   606  	@$(MKDIR_P) src/client/linux/crash_generation
   607 @@ -2477,20 +2502,22 @@
   608  	@$(MKDIR_P) src/common/android/$(DEPDIR)
   609  	@: > src/common/android/$(DEPDIR)/$(am__dirstamp)
   610  src/common/android/breakpad_getcontext.$(OBJEXT):  \
   611  	src/common/android/$(am__dirstamp) \
   612  	src/common/android/$(DEPDIR)/$(am__dirstamp)
   613  src/client/linux/$(am__dirstamp):
   614  	@$(MKDIR_P) src/client/linux
   615  	@: > src/client/linux/$(am__dirstamp)
   616 -src/client/linux/libbreakpad_client.a: $(src_client_linux_libbreakpad_client_a_OBJECTS) $(src_client_linux_libbreakpad_client_a_DEPENDENCIES) src/client/linux/$(am__dirstamp)
   617 +src/client/linux/libbreakpad_client.a: $(src_client_linux_libbreakpad_client_a_OBJECTS) $(src_client_linux_libbreakpad_client_a_DEPENDENCIES) $(EXTRA_src_client_linux_libbreakpad_client_a_DEPENDENCIES) src/client/linux/$(am__dirstamp)
   618  	-rm -f src/client/linux/libbreakpad_client.a
   619  	$(src_client_linux_libbreakpad_client_a_AR) src/client/linux/libbreakpad_client.a $(src_client_linux_libbreakpad_client_a_OBJECTS) $(src_client_linux_libbreakpad_client_a_LIBADD)
   620  	$(RANLIB) src/client/linux/libbreakpad_client.a
   621 +src/common/module.$(OBJEXT): src/common/$(am__dirstamp) \
   622 +	src/common/$(DEPDIR)/$(am__dirstamp)
   623  src/processor/$(am__dirstamp):
   624  	@$(MKDIR_P) src/processor
   625  	@: > src/processor/$(am__dirstamp)
   626  src/processor/$(DEPDIR)/$(am__dirstamp):
   627  	@$(MKDIR_P) src/processor/$(DEPDIR)
   628  	@: > src/processor/$(DEPDIR)/$(am__dirstamp)
   629  src/processor/basic_code_modules.$(OBJEXT):  \
   630  	src/processor/$(am__dirstamp) \
   631 @@ -2559,17 +2586,17 @@
   632  src/processor/stackwalker_x86.$(OBJEXT):  \
   633  	src/processor/$(am__dirstamp) \
   634  	src/processor/$(DEPDIR)/$(am__dirstamp)
   635  src/processor/tokenize.$(OBJEXT): src/processor/$(am__dirstamp) \
   636  	src/processor/$(DEPDIR)/$(am__dirstamp)
   637  src/$(am__dirstamp):
   638  	@$(MKDIR_P) src
   639  	@: > src/$(am__dirstamp)
   640 -src/libbreakpad.a: $(src_libbreakpad_a_OBJECTS) $(src_libbreakpad_a_DEPENDENCIES) src/$(am__dirstamp)
   641 +src/libbreakpad.a: $(src_libbreakpad_a_OBJECTS) $(src_libbreakpad_a_DEPENDENCIES) $(EXTRA_src_libbreakpad_a_DEPENDENCIES) src/$(am__dirstamp)
   642  	-rm -f src/libbreakpad.a
   643  	$(src_libbreakpad_a_AR) src/libbreakpad.a $(src_libbreakpad_a_OBJECTS) $(src_libbreakpad_a_LIBADD)
   644  	$(RANLIB) src/libbreakpad.a
   645  src/third_party/libdisasm/$(am__dirstamp):
   646  	@$(MKDIR_P) src/third_party/libdisasm
   647  	@: > src/third_party/libdisasm/$(am__dirstamp)
   648  src/third_party/libdisasm/$(DEPDIR)/$(am__dirstamp):
   649  	@$(MKDIR_P) src/third_party/libdisasm/$(DEPDIR)
   650 @@ -2611,17 +2638,17 @@
   651  	src/third_party/libdisasm/$(am__dirstamp) \
   652  	src/third_party/libdisasm/$(DEPDIR)/$(am__dirstamp)
   653  src/third_party/libdisasm/x86_misc.$(OBJEXT):  \
   654  	src/third_party/libdisasm/$(am__dirstamp) \
   655  	src/third_party/libdisasm/$(DEPDIR)/$(am__dirstamp)
   656  src/third_party/libdisasm/x86_operand_list.$(OBJEXT):  \
   657  	src/third_party/libdisasm/$(am__dirstamp) \
   658  	src/third_party/libdisasm/$(DEPDIR)/$(am__dirstamp)
   659 -src/third_party/libdisasm/libdisasm.a: $(src_third_party_libdisasm_libdisasm_a_OBJECTS) $(src_third_party_libdisasm_libdisasm_a_DEPENDENCIES) src/third_party/libdisasm/$(am__dirstamp)
   660 +src/third_party/libdisasm/libdisasm.a: $(src_third_party_libdisasm_libdisasm_a_OBJECTS) $(src_third_party_libdisasm_libdisasm_a_DEPENDENCIES) $(EXTRA_src_third_party_libdisasm_libdisasm_a_DEPENDENCIES) src/third_party/libdisasm/$(am__dirstamp)
   661  	-rm -f src/third_party/libdisasm/libdisasm.a
   662  	$(src_third_party_libdisasm_libdisasm_a_AR) src/third_party/libdisasm/libdisasm.a $(src_third_party_libdisasm_libdisasm_a_OBJECTS) $(src_third_party_libdisasm_libdisasm_a_LIBADD)
   663  	$(RANLIB) src/third_party/libdisasm/libdisasm.a
   664  install-binPROGRAMS: $(bin_PROGRAMS)
   665  	@$(NORMAL_INSTALL)
   666  	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
   667  	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
   668  	for p in $$list; do echo "$$p $$p"; done | \
   669 @@ -2658,17 +2685,17 @@
   670  clean-binPROGRAMS:
   671  	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
   673  clean-checkPROGRAMS:
   674  	-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
   676  clean-noinstPROGRAMS:
   677  	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
   678 -src/client/linux/linux_client_unittest$(EXEEXT): $(src_client_linux_linux_client_unittest_OBJECTS) $(src_client_linux_linux_client_unittest_DEPENDENCIES) src/client/linux/$(am__dirstamp)
   679 +src/client/linux/linux_client_unittest$(EXEEXT): $(src_client_linux_linux_client_unittest_OBJECTS) $(src_client_linux_linux_client_unittest_DEPENDENCIES) $(EXTRA_src_client_linux_linux_client_unittest_DEPENDENCIES) src/client/linux/$(am__dirstamp)
   680  	@rm -f src/client/linux/linux_client_unittest$(EXEEXT)
   681  	$(src_client_linux_linux_client_unittest_LINK) $(src_client_linux_linux_client_unittest_OBJECTS) $(src_client_linux_linux_client_unittest_LDADD) $(LIBS)
   682  src/client/linux/handler/src_client_linux_linux_client_unittest_shlib-exception_handler_unittest.$(OBJEXT):  \
   683  	src/client/linux/handler/$(am__dirstamp) \
   684  	src/client/linux/handler/$(DEPDIR)/$(am__dirstamp)
   685  src/client/linux/minidump_writer/src_client_linux_linux_client_unittest_shlib-directory_reader_unittest.$(OBJEXT):  \
   686  	src/client/linux/minidump_writer/$(am__dirstamp) \
   687  	src/client/linux/minidump_writer/$(DEPDIR)/$(am__dirstamp)
   688 @@ -2751,23 +2778,23 @@
   689  	src/processor/$(am__dirstamp) \
   690  	src/processor/$(DEPDIR)/$(am__dirstamp)
   691  src/common/android/src_client_linux_linux_client_unittest_shlib-breakpad_getcontext.$(OBJEXT):  \
   692  	src/common/android/$(am__dirstamp) \
   693  	src/common/android/$(DEPDIR)/$(am__dirstamp)
   694  src/common/android/src_client_linux_linux_client_unittest_shlib-breakpad_getcontext_unittest.$(OBJEXT):  \
   695  	src/common/android/$(am__dirstamp) \
   696  	src/common/android/$(DEPDIR)/$(am__dirstamp)
   697 -src/client/linux/linux_client_unittest_shlib$(EXEEXT): $(src_client_linux_linux_client_unittest_shlib_OBJECTS) $(src_client_linux_linux_client_unittest_shlib_DEPENDENCIES) src/client/linux/$(am__dirstamp)
   698 +src/client/linux/linux_client_unittest_shlib$(EXEEXT): $(src_client_linux_linux_client_unittest_shlib_OBJECTS) $(src_client_linux_linux_client_unittest_shlib_DEPENDENCIES) $(EXTRA_src_client_linux_linux_client_unittest_shlib_DEPENDENCIES) src/client/linux/$(am__dirstamp)
   699  	@rm -f src/client/linux/linux_client_unittest_shlib$(EXEEXT)
   700  	$(src_client_linux_linux_client_unittest_shlib_LINK) $(src_client_linux_linux_client_unittest_shlib_OBJECTS) $(src_client_linux_linux_client_unittest_shlib_LDADD) $(LIBS)
   701  src/client/linux/minidump_writer/src_client_linux_linux_dumper_unittest_helper-linux_dumper_unittest_helper.$(OBJEXT):  \
   702  	src/client/linux/minidump_writer/$(am__dirstamp) \
   703  	src/client/linux/minidump_writer/$(DEPDIR)/$(am__dirstamp)
   704 -src/client/linux/linux_dumper_unittest_helper$(EXEEXT): $(src_client_linux_linux_dumper_unittest_helper_OBJECTS) $(src_client_linux_linux_dumper_unittest_helper_DEPENDENCIES) src/client/linux/$(am__dirstamp)
   705 +src/client/linux/linux_dumper_unittest_helper$(EXEEXT): $(src_client_linux_linux_dumper_unittest_helper_OBJECTS) $(src_client_linux_linux_dumper_unittest_helper_DEPENDENCIES) $(EXTRA_src_client_linux_linux_dumper_unittest_helper_DEPENDENCIES) src/client/linux/$(am__dirstamp)
   706  	@rm -f src/client/linux/linux_dumper_unittest_helper$(EXEEXT)
   707  	$(src_client_linux_linux_dumper_unittest_helper_LINK) $(src_client_linux_linux_dumper_unittest_helper_OBJECTS) $(src_client_linux_linux_dumper_unittest_helper_LDADD) $(LIBS)
   708  src/common/src_common_dumper_unittest-byte_cursor_unittest.$(OBJEXT):  \
   709  	src/common/$(am__dirstamp) \
   710  	src/common/$(DEPDIR)/$(am__dirstamp)
   711  src/common/src_common_dumper_unittest-dwarf_cfi_to_module.$(OBJEXT):  \
   712  	src/common/$(am__dirstamp) \
   713  	src/common/$(DEPDIR)/$(am__dirstamp)
   714 @@ -2901,17 +2928,17 @@
   715  	src/testing/gtest/src/$(am__dirstamp) \
   716  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   717  src/testing/gtest/src/src_common_dumper_unittest-gtest_main.$(OBJEXT):  \
   718  	src/testing/gtest/src/$(am__dirstamp) \
   719  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   720  src/testing/src/src_common_dumper_unittest-gmock-all.$(OBJEXT):  \
   721  	src/testing/src/$(am__dirstamp) \
   722  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   723 -src/common/dumper_unittest$(EXEEXT): $(src_common_dumper_unittest_OBJECTS) $(src_common_dumper_unittest_DEPENDENCIES) src/common/$(am__dirstamp)
   724 +src/common/dumper_unittest$(EXEEXT): $(src_common_dumper_unittest_OBJECTS) $(src_common_dumper_unittest_DEPENDENCIES) $(EXTRA_src_common_dumper_unittest_DEPENDENCIES) src/common/$(am__dirstamp)
   725  	@rm -f src/common/dumper_unittest$(EXEEXT)
   726  	$(CXXLINK) $(src_common_dumper_unittest_OBJECTS) $(src_common_dumper_unittest_LDADD) $(LIBS)
   727  src/common/src_common_test_assembler_unittest-test_assembler.$(OBJEXT):  \
   728  	src/common/$(am__dirstamp) \
   729  	src/common/$(DEPDIR)/$(am__dirstamp)
   730  src/common/src_common_test_assembler_unittest-test_assembler_unittest.$(OBJEXT):  \
   731  	src/common/$(am__dirstamp) \
   732  	src/common/$(DEPDIR)/$(am__dirstamp)
   733 @@ -2919,145 +2946,145 @@
   734  	src/testing/gtest/src/$(am__dirstamp) \
   735  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   736  src/testing/gtest/src/src_common_test_assembler_unittest-gtest_main.$(OBJEXT):  \
   737  	src/testing/gtest/src/$(am__dirstamp) \
   738  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   739  src/testing/src/src_common_test_assembler_unittest-gmock-all.$(OBJEXT):  \
   740  	src/testing/src/$(am__dirstamp) \
   741  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   742 -src/common/test_assembler_unittest$(EXEEXT): $(src_common_test_assembler_unittest_OBJECTS) $(src_common_test_assembler_unittest_DEPENDENCIES) src/common/$(am__dirstamp)
   743 +src/common/test_assembler_unittest$(EXEEXT): $(src_common_test_assembler_unittest_OBJECTS) $(src_common_test_assembler_unittest_DEPENDENCIES) $(EXTRA_src_common_test_assembler_unittest_DEPENDENCIES) src/common/$(am__dirstamp)
   744  	@rm -f src/common/test_assembler_unittest$(EXEEXT)
   745  	$(CXXLINK) $(src_common_test_assembler_unittest_OBJECTS) $(src_common_test_assembler_unittest_LDADD) $(LIBS)
   746  src/processor/address_map_unittest.$(OBJEXT):  \
   747  	src/processor/$(am__dirstamp) \
   748  	src/processor/$(DEPDIR)/$(am__dirstamp)
   749 -src/processor/address_map_unittest$(EXEEXT): $(src_processor_address_map_unittest_OBJECTS) $(src_processor_address_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   750 +src/processor/address_map_unittest$(EXEEXT): $(src_processor_address_map_unittest_OBJECTS) $(src_processor_address_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_address_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   751  	@rm -f src/processor/address_map_unittest$(EXEEXT)
   752  	$(CXXLINK) $(src_processor_address_map_unittest_OBJECTS) $(src_processor_address_map_unittest_LDADD) $(LIBS)
   753  src/processor/src_processor_basic_source_line_resolver_unittest-basic_source_line_resolver_unittest.$(OBJEXT):  \
   754  	src/processor/$(am__dirstamp) \
   755  	src/processor/$(DEPDIR)/$(am__dirstamp)
   756  src/testing/gtest/src/src_processor_basic_source_line_resolver_unittest-gtest-all.$(OBJEXT):  \
   757  	src/testing/gtest/src/$(am__dirstamp) \
   758  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   759  src/testing/src/src_processor_basic_source_line_resolver_unittest-gmock-all.$(OBJEXT):  \
   760  	src/testing/src/$(am__dirstamp) \
   761  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   762 -src/processor/basic_source_line_resolver_unittest$(EXEEXT): $(src_processor_basic_source_line_resolver_unittest_OBJECTS) $(src_processor_basic_source_line_resolver_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   763 +src/processor/basic_source_line_resolver_unittest$(EXEEXT): $(src_processor_basic_source_line_resolver_unittest_OBJECTS) $(src_processor_basic_source_line_resolver_unittest_DEPENDENCIES) $(EXTRA_src_processor_basic_source_line_resolver_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   764  	@rm -f src/processor/basic_source_line_resolver_unittest$(EXEEXT)
   765  	$(CXXLINK) $(src_processor_basic_source_line_resolver_unittest_OBJECTS) $(src_processor_basic_source_line_resolver_unittest_LDADD) $(LIBS)
   766  src/processor/src_processor_binarystream_unittest-binarystream_unittest.$(OBJEXT):  \
   767  	src/processor/$(am__dirstamp) \
   768  	src/processor/$(DEPDIR)/$(am__dirstamp)
   769  src/testing/gtest/src/src_processor_binarystream_unittest-gtest-all.$(OBJEXT):  \
   770  	src/testing/gtest/src/$(am__dirstamp) \
   771  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   772  src/testing/src/src_processor_binarystream_unittest-gmock-all.$(OBJEXT):  \
   773  	src/testing/src/$(am__dirstamp) \
   774  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   775 -src/processor/binarystream_unittest$(EXEEXT): $(src_processor_binarystream_unittest_OBJECTS) $(src_processor_binarystream_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   776 +src/processor/binarystream_unittest$(EXEEXT): $(src_processor_binarystream_unittest_OBJECTS) $(src_processor_binarystream_unittest_DEPENDENCIES) $(EXTRA_src_processor_binarystream_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   777  	@rm -f src/processor/binarystream_unittest$(EXEEXT)
   778  	$(CXXLINK) $(src_processor_binarystream_unittest_OBJECTS) $(src_processor_binarystream_unittest_LDADD) $(LIBS)
   779  src/processor/src_processor_cfi_frame_info_unittest-cfi_frame_info_unittest.$(OBJEXT):  \
   780  	src/processor/$(am__dirstamp) \
   781  	src/processor/$(DEPDIR)/$(am__dirstamp)
   782  src/testing/gtest/src/src_processor_cfi_frame_info_unittest-gtest-all.$(OBJEXT):  \
   783  	src/testing/gtest/src/$(am__dirstamp) \
   784  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   785  src/testing/gtest/src/src_processor_cfi_frame_info_unittest-gtest_main.$(OBJEXT):  \
   786  	src/testing/gtest/src/$(am__dirstamp) \
   787  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   788  src/testing/src/src_processor_cfi_frame_info_unittest-gmock-all.$(OBJEXT):  \
   789  	src/testing/src/$(am__dirstamp) \
   790  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   791 -src/processor/cfi_frame_info_unittest$(EXEEXT): $(src_processor_cfi_frame_info_unittest_OBJECTS) $(src_processor_cfi_frame_info_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   792 +src/processor/cfi_frame_info_unittest$(EXEEXT): $(src_processor_cfi_frame_info_unittest_OBJECTS) $(src_processor_cfi_frame_info_unittest_DEPENDENCIES) $(EXTRA_src_processor_cfi_frame_info_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   793  	@rm -f src/processor/cfi_frame_info_unittest$(EXEEXT)
   794  	$(CXXLINK) $(src_processor_cfi_frame_info_unittest_OBJECTS) $(src_processor_cfi_frame_info_unittest_LDADD) $(LIBS)
   795  src/processor/contained_range_map_unittest.$(OBJEXT):  \
   796  	src/processor/$(am__dirstamp) \
   797  	src/processor/$(DEPDIR)/$(am__dirstamp)
   798 -src/processor/contained_range_map_unittest$(EXEEXT): $(src_processor_contained_range_map_unittest_OBJECTS) $(src_processor_contained_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   799 +src/processor/contained_range_map_unittest$(EXEEXT): $(src_processor_contained_range_map_unittest_OBJECTS) $(src_processor_contained_range_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_contained_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   800  	@rm -f src/processor/contained_range_map_unittest$(EXEEXT)
   801  	$(CXXLINK) $(src_processor_contained_range_map_unittest_OBJECTS) $(src_processor_contained_range_map_unittest_LDADD) $(LIBS)
   802  src/processor/src_processor_disassembler_x86_unittest-disassembler_x86_unittest.$(OBJEXT):  \
   803  	src/processor/$(am__dirstamp) \
   804  	src/processor/$(DEPDIR)/$(am__dirstamp)
   805  src/testing/gtest/src/src_processor_disassembler_x86_unittest-gtest-all.$(OBJEXT):  \
   806  	src/testing/gtest/src/$(am__dirstamp) \
   807  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   808  src/testing/gtest/src/src_processor_disassembler_x86_unittest-gtest_main.$(OBJEXT):  \
   809  	src/testing/gtest/src/$(am__dirstamp) \
   810  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   811  src/testing/src/src_processor_disassembler_x86_unittest-gmock-all.$(OBJEXT):  \
   812  	src/testing/src/$(am__dirstamp) \
   813  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   814 -src/processor/disassembler_x86_unittest$(EXEEXT): $(src_processor_disassembler_x86_unittest_OBJECTS) $(src_processor_disassembler_x86_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   815 +src/processor/disassembler_x86_unittest$(EXEEXT): $(src_processor_disassembler_x86_unittest_OBJECTS) $(src_processor_disassembler_x86_unittest_DEPENDENCIES) $(EXTRA_src_processor_disassembler_x86_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   816  	@rm -f src/processor/disassembler_x86_unittest$(EXEEXT)
   817  	$(CXXLINK) $(src_processor_disassembler_x86_unittest_OBJECTS) $(src_processor_disassembler_x86_unittest_LDADD) $(LIBS)
   818  src/processor/src_processor_exploitability_unittest-exploitability_unittest.$(OBJEXT):  \
   819  	src/processor/$(am__dirstamp) \
   820  	src/processor/$(DEPDIR)/$(am__dirstamp)
   821  src/testing/gtest/src/src_processor_exploitability_unittest-gtest-all.$(OBJEXT):  \
   822  	src/testing/gtest/src/$(am__dirstamp) \
   823  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   824  src/testing/gtest/src/src_processor_exploitability_unittest-gtest_main.$(OBJEXT):  \
   825  	src/testing/gtest/src/$(am__dirstamp) \
   826  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   827  src/testing/src/src_processor_exploitability_unittest-gmock-all.$(OBJEXT):  \
   828  	src/testing/src/$(am__dirstamp) \
   829  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   830 -src/processor/exploitability_unittest$(EXEEXT): $(src_processor_exploitability_unittest_OBJECTS) $(src_processor_exploitability_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   831 +src/processor/exploitability_unittest$(EXEEXT): $(src_processor_exploitability_unittest_OBJECTS) $(src_processor_exploitability_unittest_DEPENDENCIES) $(EXTRA_src_processor_exploitability_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   832  	@rm -f src/processor/exploitability_unittest$(EXEEXT)
   833  	$(CXXLINK) $(src_processor_exploitability_unittest_OBJECTS) $(src_processor_exploitability_unittest_LDADD) $(LIBS)
   834  src/processor/src_processor_fast_source_line_resolver_unittest-fast_source_line_resolver_unittest.$(OBJEXT):  \
   835  	src/processor/$(am__dirstamp) \
   836  	src/processor/$(DEPDIR)/$(am__dirstamp)
   837  src/testing/gtest/src/src_processor_fast_source_line_resolver_unittest-gtest-all.$(OBJEXT):  \
   838  	src/testing/gtest/src/$(am__dirstamp) \
   839  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   840  src/testing/src/src_processor_fast_source_line_resolver_unittest-gmock-all.$(OBJEXT):  \
   841  	src/testing/src/$(am__dirstamp) \
   842  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   843 -src/processor/fast_source_line_resolver_unittest$(EXEEXT): $(src_processor_fast_source_line_resolver_unittest_OBJECTS) $(src_processor_fast_source_line_resolver_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   844 +src/processor/fast_source_line_resolver_unittest$(EXEEXT): $(src_processor_fast_source_line_resolver_unittest_OBJECTS) $(src_processor_fast_source_line_resolver_unittest_DEPENDENCIES) $(EXTRA_src_processor_fast_source_line_resolver_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   845  	@rm -f src/processor/fast_source_line_resolver_unittest$(EXEEXT)
   846  	$(CXXLINK) $(src_processor_fast_source_line_resolver_unittest_OBJECTS) $(src_processor_fast_source_line_resolver_unittest_LDADD) $(LIBS)
   847  src/processor/src_processor_map_serializers_unittest-map_serializers_unittest.$(OBJEXT):  \
   848  	src/processor/$(am__dirstamp) \
   849  	src/processor/$(DEPDIR)/$(am__dirstamp)
   850  src/testing/gtest/src/src_processor_map_serializers_unittest-gtest-all.$(OBJEXT):  \
   851  	src/testing/gtest/src/$(am__dirstamp) \
   852  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   853  src/testing/src/src_processor_map_serializers_unittest-gmock-all.$(OBJEXT):  \
   854  	src/testing/src/$(am__dirstamp) \
   855  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   856 -src/processor/map_serializers_unittest$(EXEEXT): $(src_processor_map_serializers_unittest_OBJECTS) $(src_processor_map_serializers_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   857 +src/processor/map_serializers_unittest$(EXEEXT): $(src_processor_map_serializers_unittest_OBJECTS) $(src_processor_map_serializers_unittest_DEPENDENCIES) $(EXTRA_src_processor_map_serializers_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   858  	@rm -f src/processor/map_serializers_unittest$(EXEEXT)
   859  	$(CXXLINK) $(src_processor_map_serializers_unittest_OBJECTS) $(src_processor_map_serializers_unittest_LDADD) $(LIBS)
   860  src/processor/minidump_dump.$(OBJEXT): src/processor/$(am__dirstamp) \
   861  	src/processor/$(DEPDIR)/$(am__dirstamp)
   862 -src/processor/minidump_dump$(EXEEXT): $(src_processor_minidump_dump_OBJECTS) $(src_processor_minidump_dump_DEPENDENCIES) src/processor/$(am__dirstamp)
   863 +src/processor/minidump_dump$(EXEEXT): $(src_processor_minidump_dump_OBJECTS) $(src_processor_minidump_dump_DEPENDENCIES) $(EXTRA_src_processor_minidump_dump_DEPENDENCIES) src/processor/$(am__dirstamp)
   864  	@rm -f src/processor/minidump_dump$(EXEEXT)
   865  	$(CXXLINK) $(src_processor_minidump_dump_OBJECTS) $(src_processor_minidump_dump_LDADD) $(LIBS)
   866  src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.$(OBJEXT):  \
   867  	src/processor/$(am__dirstamp) \
   868  	src/processor/$(DEPDIR)/$(am__dirstamp)
   869  src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.$(OBJEXT):  \
   870  	src/testing/gtest/src/$(am__dirstamp) \
   871  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   872  src/testing/src/src_processor_minidump_processor_unittest-gmock-all.$(OBJEXT):  \
   873  	src/testing/src/$(am__dirstamp) \
   874  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   875 -src/processor/minidump_processor_unittest$(EXEEXT): $(src_processor_minidump_processor_unittest_OBJECTS) $(src_processor_minidump_processor_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   876 +src/processor/minidump_processor_unittest$(EXEEXT): $(src_processor_minidump_processor_unittest_OBJECTS) $(src_processor_minidump_processor_unittest_DEPENDENCIES) $(EXTRA_src_processor_minidump_processor_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   877  	@rm -f src/processor/minidump_processor_unittest$(EXEEXT)
   878  	$(CXXLINK) $(src_processor_minidump_processor_unittest_OBJECTS) $(src_processor_minidump_processor_unittest_LDADD) $(LIBS)
   879  src/processor/minidump_stackwalk.$(OBJEXT):  \
   880  	src/processor/$(am__dirstamp) \
   881  	src/processor/$(DEPDIR)/$(am__dirstamp)
   882 -src/processor/minidump_stackwalk$(EXEEXT): $(src_processor_minidump_stackwalk_OBJECTS) $(src_processor_minidump_stackwalk_DEPENDENCIES) src/processor/$(am__dirstamp)
   883 +src/processor/minidump_stackwalk$(EXEEXT): $(src_processor_minidump_stackwalk_OBJECTS) $(src_processor_minidump_stackwalk_DEPENDENCIES) $(EXTRA_src_processor_minidump_stackwalk_DEPENDENCIES) src/processor/$(am__dirstamp)
   884  	@rm -f src/processor/minidump_stackwalk$(EXEEXT)
   885  	$(CXXLINK) $(src_processor_minidump_stackwalk_OBJECTS) $(src_processor_minidump_stackwalk_LDADD) $(LIBS)
   886  src/common/src_processor_minidump_unittest-test_assembler.$(OBJEXT):  \
   887  	src/common/$(am__dirstamp) \
   888  	src/common/$(DEPDIR)/$(am__dirstamp)
   889  src/processor/src_processor_minidump_unittest-minidump_unittest.$(OBJEXT):  \
   890  	src/processor/$(am__dirstamp) \
   891  	src/processor/$(DEPDIR)/$(am__dirstamp)
   892 @@ -3068,35 +3095,35 @@
   893  	src/testing/gtest/src/$(am__dirstamp) \
   894  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   895  src/testing/gtest/src/src_processor_minidump_unittest-gtest_main.$(OBJEXT):  \
   896  	src/testing/gtest/src/$(am__dirstamp) \
   897  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   898  src/testing/src/src_processor_minidump_unittest-gmock-all.$(OBJEXT):  \
   899  	src/testing/src/$(am__dirstamp) \
   900  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   901 -src/processor/minidump_unittest$(EXEEXT): $(src_processor_minidump_unittest_OBJECTS) $(src_processor_minidump_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   902 +src/processor/minidump_unittest$(EXEEXT): $(src_processor_minidump_unittest_OBJECTS) $(src_processor_minidump_unittest_DEPENDENCIES) $(EXTRA_src_processor_minidump_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   903  	@rm -f src/processor/minidump_unittest$(EXEEXT)
   904  	$(CXXLINK) $(src_processor_minidump_unittest_OBJECTS) $(src_processor_minidump_unittest_LDADD) $(LIBS)
   905  src/processor/pathname_stripper_unittest.$(OBJEXT):  \
   906  	src/processor/$(am__dirstamp) \
   907  	src/processor/$(DEPDIR)/$(am__dirstamp)
   908 -src/processor/pathname_stripper_unittest$(EXEEXT): $(src_processor_pathname_stripper_unittest_OBJECTS) $(src_processor_pathname_stripper_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   909 +src/processor/pathname_stripper_unittest$(EXEEXT): $(src_processor_pathname_stripper_unittest_OBJECTS) $(src_processor_pathname_stripper_unittest_DEPENDENCIES) $(EXTRA_src_processor_pathname_stripper_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   910  	@rm -f src/processor/pathname_stripper_unittest$(EXEEXT)
   911  	$(CXXLINK) $(src_processor_pathname_stripper_unittest_OBJECTS) $(src_processor_pathname_stripper_unittest_LDADD) $(LIBS)
   912  src/processor/postfix_evaluator_unittest.$(OBJEXT):  \
   913  	src/processor/$(am__dirstamp) \
   914  	src/processor/$(DEPDIR)/$(am__dirstamp)
   915 -src/processor/postfix_evaluator_unittest$(EXEEXT): $(src_processor_postfix_evaluator_unittest_OBJECTS) $(src_processor_postfix_evaluator_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   916 +src/processor/postfix_evaluator_unittest$(EXEEXT): $(src_processor_postfix_evaluator_unittest_OBJECTS) $(src_processor_postfix_evaluator_unittest_DEPENDENCIES) $(EXTRA_src_processor_postfix_evaluator_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   917  	@rm -f src/processor/postfix_evaluator_unittest$(EXEEXT)
   918  	$(CXXLINK) $(src_processor_postfix_evaluator_unittest_OBJECTS) $(src_processor_postfix_evaluator_unittest_LDADD) $(LIBS)
   919  src/processor/range_map_unittest.$(OBJEXT):  \
   920  	src/processor/$(am__dirstamp) \
   921  	src/processor/$(DEPDIR)/$(am__dirstamp)
   922 -src/processor/range_map_unittest$(EXEEXT): $(src_processor_range_map_unittest_OBJECTS) $(src_processor_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   923 +src/processor/range_map_unittest$(EXEEXT): $(src_processor_range_map_unittest_OBJECTS) $(src_processor_range_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   924  	@rm -f src/processor/range_map_unittest$(EXEEXT)
   925  	$(CXXLINK) $(src_processor_range_map_unittest_OBJECTS) $(src_processor_range_map_unittest_LDADD) $(LIBS)
   926  src/common/src_processor_stackwalker_amd64_unittest-test_assembler.$(OBJEXT):  \
   927  	src/common/$(am__dirstamp) \
   928  	src/common/$(DEPDIR)/$(am__dirstamp)
   929  src/processor/src_processor_stackwalker_amd64_unittest-stackwalker_amd64_unittest.$(OBJEXT):  \
   930  	src/processor/$(am__dirstamp) \
   931  	src/processor/$(DEPDIR)/$(am__dirstamp)
   932 @@ -3104,17 +3131,17 @@
   933  	src/testing/gtest/src/$(am__dirstamp) \
   934  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   935  src/testing/gtest/src/src_processor_stackwalker_amd64_unittest-gtest_main.$(OBJEXT):  \
   936  	src/testing/gtest/src/$(am__dirstamp) \
   937  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   938  src/testing/src/src_processor_stackwalker_amd64_unittest-gmock-all.$(OBJEXT):  \
   939  	src/testing/src/$(am__dirstamp) \
   940  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   941 -src/processor/stackwalker_amd64_unittest$(EXEEXT): $(src_processor_stackwalker_amd64_unittest_OBJECTS) $(src_processor_stackwalker_amd64_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   942 +src/processor/stackwalker_amd64_unittest$(EXEEXT): $(src_processor_stackwalker_amd64_unittest_OBJECTS) $(src_processor_stackwalker_amd64_unittest_DEPENDENCIES) $(EXTRA_src_processor_stackwalker_amd64_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   943  	@rm -f src/processor/stackwalker_amd64_unittest$(EXEEXT)
   944  	$(CXXLINK) $(src_processor_stackwalker_amd64_unittest_OBJECTS) $(src_processor_stackwalker_amd64_unittest_LDADD) $(LIBS)
   945  src/common/src_processor_stackwalker_arm_unittest-test_assembler.$(OBJEXT):  \
   946  	src/common/$(am__dirstamp) \
   947  	src/common/$(DEPDIR)/$(am__dirstamp)
   948  src/processor/src_processor_stackwalker_arm_unittest-stackwalker_arm_unittest.$(OBJEXT):  \
   949  	src/processor/$(am__dirstamp) \
   950  	src/processor/$(DEPDIR)/$(am__dirstamp)
   951 @@ -3122,23 +3149,23 @@
   952  	src/testing/gtest/src/$(am__dirstamp) \
   953  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   954  src/testing/gtest/src/src_processor_stackwalker_arm_unittest-gtest_main.$(OBJEXT):  \
   955  	src/testing/gtest/src/$(am__dirstamp) \
   956  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   957  src/testing/src/src_processor_stackwalker_arm_unittest-gmock-all.$(OBJEXT):  \
   958  	src/testing/src/$(am__dirstamp) \
   959  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   960 -src/processor/stackwalker_arm_unittest$(EXEEXT): $(src_processor_stackwalker_arm_unittest_OBJECTS) $(src_processor_stackwalker_arm_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   961 +src/processor/stackwalker_arm_unittest$(EXEEXT): $(src_processor_stackwalker_arm_unittest_OBJECTS) $(src_processor_stackwalker_arm_unittest_DEPENDENCIES) $(EXTRA_src_processor_stackwalker_arm_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   962  	@rm -f src/processor/stackwalker_arm_unittest$(EXEEXT)
   963  	$(CXXLINK) $(src_processor_stackwalker_arm_unittest_OBJECTS) $(src_processor_stackwalker_arm_unittest_LDADD) $(LIBS)
   964  src/processor/stackwalker_selftest.$(OBJEXT):  \
   965  	src/processor/$(am__dirstamp) \
   966  	src/processor/$(DEPDIR)/$(am__dirstamp)
   967 -src/processor/stackwalker_selftest$(EXEEXT): $(src_processor_stackwalker_selftest_OBJECTS) $(src_processor_stackwalker_selftest_DEPENDENCIES) src/processor/$(am__dirstamp)
   968 +src/processor/stackwalker_selftest$(EXEEXT): $(src_processor_stackwalker_selftest_OBJECTS) $(src_processor_stackwalker_selftest_DEPENDENCIES) $(EXTRA_src_processor_stackwalker_selftest_DEPENDENCIES) src/processor/$(am__dirstamp)
   969  	@rm -f src/processor/stackwalker_selftest$(EXEEXT)
   970  	$(CXXLINK) $(src_processor_stackwalker_selftest_OBJECTS) $(src_processor_stackwalker_selftest_LDADD) $(LIBS)
   971  src/common/src_processor_stackwalker_x86_unittest-test_assembler.$(OBJEXT):  \
   972  	src/common/$(am__dirstamp) \
   973  	src/common/$(DEPDIR)/$(am__dirstamp)
   974  src/processor/src_processor_stackwalker_x86_unittest-stackwalker_x86_unittest.$(OBJEXT):  \
   975  	src/processor/$(am__dirstamp) \
   976  	src/processor/$(DEPDIR)/$(am__dirstamp)
   977 @@ -3146,65 +3173,65 @@
   978  	src/testing/gtest/src/$(am__dirstamp) \
   979  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   980  src/testing/gtest/src/src_processor_stackwalker_x86_unittest-gtest_main.$(OBJEXT):  \
   981  	src/testing/gtest/src/$(am__dirstamp) \
   982  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   983  src/testing/src/src_processor_stackwalker_x86_unittest-gmock-all.$(OBJEXT):  \
   984  	src/testing/src/$(am__dirstamp) \
   985  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   986 -src/processor/stackwalker_x86_unittest$(EXEEXT): $(src_processor_stackwalker_x86_unittest_OBJECTS) $(src_processor_stackwalker_x86_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   987 +src/processor/stackwalker_x86_unittest$(EXEEXT): $(src_processor_stackwalker_x86_unittest_OBJECTS) $(src_processor_stackwalker_x86_unittest_DEPENDENCIES) $(EXTRA_src_processor_stackwalker_x86_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   988  	@rm -f src/processor/stackwalker_x86_unittest$(EXEEXT)
   989  	$(CXXLINK) $(src_processor_stackwalker_x86_unittest_OBJECTS) $(src_processor_stackwalker_x86_unittest_LDADD) $(LIBS)
   990  src/processor/src_processor_static_address_map_unittest-static_address_map_unittest.$(OBJEXT):  \
   991  	src/processor/$(am__dirstamp) \
   992  	src/processor/$(DEPDIR)/$(am__dirstamp)
   993  src/testing/gtest/src/src_processor_static_address_map_unittest-gtest-all.$(OBJEXT):  \
   994  	src/testing/gtest/src/$(am__dirstamp) \
   995  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   996  src/testing/src/src_processor_static_address_map_unittest-gmock-all.$(OBJEXT):  \
   997  	src/testing/src/$(am__dirstamp) \
   998  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   999 -src/processor/static_address_map_unittest$(EXEEXT): $(src_processor_static_address_map_unittest_OBJECTS) $(src_processor_static_address_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
  1000 +src/processor/static_address_map_unittest$(EXEEXT): $(src_processor_static_address_map_unittest_OBJECTS) $(src_processor_static_address_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_static_address_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
  1001  	@rm -f src/processor/static_address_map_unittest$(EXEEXT)
  1002  	$(CXXLINK) $(src_processor_static_address_map_unittest_OBJECTS) $(src_processor_static_address_map_unittest_LDADD) $(LIBS)
  1003  src/processor/src_processor_static_contained_range_map_unittest-static_contained_range_map_unittest.$(OBJEXT):  \
  1004  	src/processor/$(am__dirstamp) \
  1005  	src/processor/$(DEPDIR)/$(am__dirstamp)
  1006  src/testing/gtest/src/src_processor_static_contained_range_map_unittest-gtest-all.$(OBJEXT):  \
  1007  	src/testing/gtest/src/$(am__dirstamp) \
  1008  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
  1009  src/testing/src/src_processor_static_contained_range_map_unittest-gmock-all.$(OBJEXT):  \
  1010  	src/testing/src/$(am__dirstamp) \
  1011  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
  1012 -src/processor/static_contained_range_map_unittest$(EXEEXT): $(src_processor_static_contained_range_map_unittest_OBJECTS) $(src_processor_static_contained_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
  1013 +src/processor/static_contained_range_map_unittest$(EXEEXT): $(src_processor_static_contained_range_map_unittest_OBJECTS) $(src_processor_static_contained_range_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_static_contained_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
  1014  	@rm -f src/processor/static_contained_range_map_unittest$(EXEEXT)
  1015  	$(CXXLINK) $(src_processor_static_contained_range_map_unittest_OBJECTS) $(src_processor_static_contained_range_map_unittest_LDADD) $(LIBS)
  1016  src/processor/src_processor_static_map_unittest-static_map_unittest.$(OBJEXT):  \
  1017  	src/processor/$(am__dirstamp) \
  1018  	src/processor/$(DEPDIR)/$(am__dirstamp)
  1019  src/testing/gtest/src/src_processor_static_map_unittest-gtest-all.$(OBJEXT):  \
  1020  	src/testing/gtest/src/$(am__dirstamp) \
  1021  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
  1022  src/testing/src/src_processor_static_map_unittest-gmock-all.$(OBJEXT):  \
  1023  	src/testing/src/$(am__dirstamp) \
  1024  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
  1025 -src/processor/static_map_unittest$(EXEEXT): $(src_processor_static_map_unittest_OBJECTS) $(src_processor_static_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
  1026 +src/processor/static_map_unittest$(EXEEXT): $(src_processor_static_map_unittest_OBJECTS) $(src_processor_static_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_static_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
  1027  	@rm -f src/processor/static_map_unittest$(EXEEXT)
  1028  	$(CXXLINK) $(src_processor_static_map_unittest_OBJECTS) $(src_processor_static_map_unittest_LDADD) $(LIBS)
  1029  src/processor/src_processor_static_range_map_unittest-static_range_map_unittest.$(OBJEXT):  \
  1030  	src/processor/$(am__dirstamp) \
  1031  	src/processor/$(DEPDIR)/$(am__dirstamp)
  1032  src/testing/gtest/src/src_processor_static_range_map_unittest-gtest-all.$(OBJEXT):  \
  1033  	src/testing/gtest/src/$(am__dirstamp) \
  1034  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
  1035  src/testing/src/src_processor_static_range_map_unittest-gmock-all.$(OBJEXT):  \
  1036  	src/testing/src/$(am__dirstamp) \
  1037  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
  1038 -src/processor/static_range_map_unittest$(EXEEXT): $(src_processor_static_range_map_unittest_OBJECTS) $(src_processor_static_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
  1039 +src/processor/static_range_map_unittest$(EXEEXT): $(src_processor_static_range_map_unittest_OBJECTS) $(src_processor_static_range_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_static_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
  1040  	@rm -f src/processor/static_range_map_unittest$(EXEEXT)
  1041  	$(CXXLINK) $(src_processor_static_range_map_unittest_OBJECTS) $(src_processor_static_range_map_unittest_LDADD) $(LIBS)
  1042  src/common/src_processor_synth_minidump_unittest-test_assembler.$(OBJEXT):  \
  1043  	src/common/$(am__dirstamp) \
  1044  	src/common/$(DEPDIR)/$(am__dirstamp)
  1045  src/processor/src_processor_synth_minidump_unittest-synth_minidump_unittest.$(OBJEXT):  \
  1046  	src/processor/$(am__dirstamp) \
  1047  	src/processor/$(DEPDIR)/$(am__dirstamp)
  1048 @@ -3215,17 +3242,17 @@
  1049  	src/testing/gtest/src/$(am__dirstamp) \
  1050  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
  1051  src/testing/src/src_processor_synth_minidump_unittest-gmock-all.$(OBJEXT):  \
  1052  	src/testing/src/$(am__dirstamp) \
  1053  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
  1054  src/processor/src_processor_synth_minidump_unittest-synth_minidump.$(OBJEXT):  \
  1055  	src/processor/$(am__dirstamp) \
  1056  	src/processor/$(DEPDIR)/$(am__dirstamp)
  1057 -src/processor/synth_minidump_unittest$(EXEEXT): $(src_processor_synth_minidump_unittest_OBJECTS) $(src_processor_synth_minidump_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
  1058 +src/processor/synth_minidump_unittest$(EXEEXT): $(src_processor_synth_minidump_unittest_OBJECTS) $(src_processor_synth_minidump_unittest_DEPENDENCIES) $(EXTRA_src_processor_synth_minidump_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
  1059  	@rm -f src/processor/synth_minidump_unittest$(EXEEXT)
  1060  	$(CXXLINK) $(src_processor_synth_minidump_unittest_OBJECTS) $(src_processor_synth_minidump_unittest_LDADD) $(LIBS)
  1061  src/tools/linux/core2md/$(am__dirstamp):
  1062  	@$(MKDIR_P) src/tools/linux/core2md
  1063  	@: > src/tools/linux/core2md/$(am__dirstamp)
  1064  src/tools/linux/core2md/$(DEPDIR)/$(am__dirstamp):
  1065  	@$(MKDIR_P) src/tools/linux/core2md/$(DEPDIR)
  1066  	@: > src/tools/linux/core2md/$(DEPDIR)/$(am__dirstamp)
  1067 @@ -3233,29 +3260,27 @@
  1068  	src/tools/linux/core2md/$(am__dirstamp) \
  1069  	src/tools/linux/core2md/$(DEPDIR)/$(am__dirstamp)
  1070  src/client/linux/minidump_writer/linux_core_dumper.$(OBJEXT):  \
  1071  	src/client/linux/minidump_writer/$(am__dirstamp) \
  1072  	src/client/linux/minidump_writer/$(DEPDIR)/$(am__dirstamp)
  1073  src/common/linux/elf_core_dump.$(OBJEXT):  \
  1074  	src/common/linux/$(am__dirstamp) \
  1075  	src/common/linux/$(DEPDIR)/$(am__dirstamp)
  1076 -src/tools/linux/core2md/core2md$(EXEEXT): $(src_tools_linux_core2md_core2md_OBJECTS) $(src_tools_linux_core2md_core2md_DEPENDENCIES) src/tools/linux/core2md/$(am__dirstamp)
  1077 +src/tools/linux/core2md/core2md$(EXEEXT): $(src_tools_linux_core2md_core2md_OBJECTS) $(src_tools_linux_core2md_core2md_DEPENDENCIES) $(EXTRA_src_tools_linux_core2md_core2md_DEPENDENCIES) src/tools/linux/core2md/$(am__dirstamp)
  1078  	@rm -f src/tools/linux/core2md/core2md$(EXEEXT)
  1079  	$(CXXLINK) $(src_tools_linux_core2md_core2md_OBJECTS) $(src_tools_linux_core2md_core2md_LDADD) $(LIBS)
  1080  src/common/dwarf_cfi_to_module.$(OBJEXT): src/common/$(am__dirstamp) \
  1081  	src/common/$(DEPDIR)/$(am__dirstamp)
  1082  src/common/dwarf_cu_to_module.$(OBJEXT): src/common/$(am__dirstamp) \
  1083  	src/common/$(DEPDIR)/$(am__dirstamp)
  1084  src/common/dwarf_line_to_module.$(OBJEXT): src/common/$(am__dirstamp) \
  1085  	src/common/$(DEPDIR)/$(am__dirstamp)
  1086  src/common/language.$(OBJEXT): src/common/$(am__dirstamp) \
  1087  	src/common/$(DEPDIR)/$(am__dirstamp)
  1088 -src/common/module.$(OBJEXT): src/common/$(am__dirstamp) \
  1089 -	src/common/$(DEPDIR)/$(am__dirstamp)
  1090  src/common/stabs_reader.$(OBJEXT): src/common/$(am__dirstamp) \
  1091  	src/common/$(DEPDIR)/$(am__dirstamp)
  1092  src/common/stabs_to_module.$(OBJEXT): src/common/$(am__dirstamp) \
  1093  	src/common/$(DEPDIR)/$(am__dirstamp)
  1094  src/common/dwarf/bytereader.$(OBJEXT):  \
  1095  	src/common/dwarf/$(am__dirstamp) \
  1096  	src/common/dwarf/$(DEPDIR)/$(am__dirstamp)
  1097  src/common/dwarf/dwarf2diehandler.$(OBJEXT):  \
  1098 @@ -3274,65 +3299,65 @@
  1099  	@$(MKDIR_P) src/tools/linux/dump_syms
  1100  	@: > src/tools/linux/dump_syms/$(am__dirstamp)
  1101  src/tools/linux/dump_syms/$(DEPDIR)/$(am__dirstamp):
  1102  	@$(MKDIR_P) src/tools/linux/dump_syms/$(DEPDIR)
  1103  	@: > src/tools/linux/dump_syms/$(DEPDIR)/$(am__dirstamp)
  1104  src/tools/linux/dump_syms/dump_syms.$(OBJEXT):  \
  1105  	src/tools/linux/dump_syms/$(am__dirstamp) \
  1106  	src/tools/linux/dump_syms/$(DEPDIR)/$(am__dirstamp)
  1107 -src/tools/linux/dump_syms/dump_syms$(EXEEXT): $(src_tools_linux_dump_syms_dump_syms_OBJECTS) $(src_tools_linux_dump_syms_dump_syms_DEPENDENCIES) src/tools/linux/dump_syms/$(am__dirstamp)
  1108 +src/tools/linux/dump_syms/dump_syms$(EXEEXT): $(src_tools_linux_dump_syms_dump_syms_OBJECTS) $(src_tools_linux_dump_syms_dump_syms_DEPENDENCIES) $(EXTRA_src_tools_linux_dump_syms_dump_syms_DEPENDENCIES) src/tools/linux/dump_syms/$(am__dirstamp)
  1109  	@rm -f src/tools/linux/dump_syms/dump_syms$(EXEEXT)
  1110  	$(CXXLINK) $(src_tools_linux_dump_syms_dump_syms_OBJECTS) $(src_tools_linux_dump_syms_dump_syms_LDADD) $(LIBS)
  1111  src/tools/linux/md2core/$(am__dirstamp):
  1112  	@$(MKDIR_P) src/tools/linux/md2core
  1113  	@: > src/tools/linux/md2core/$(am__dirstamp)
  1114  src/tools/linux/md2core/$(DEPDIR)/$(am__dirstamp):
  1115  	@$(MKDIR_P) src/tools/linux/md2core/$(DEPDIR)
  1116  	@: > src/tools/linux/md2core/$(DEPDIR)/$(am__dirstamp)
  1117  src/tools/linux/md2core/minidump-2-core.$(OBJEXT):  \
  1118  	src/tools/linux/md2core/$(am__dirstamp) \
  1119  	src/tools/linux/md2core/$(DEPDIR)/$(am__dirstamp)
  1120 -src/tools/linux/md2core/minidump-2-core$(EXEEXT): $(src_tools_linux_md2core_minidump_2_core_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_DEPENDENCIES) src/tools/linux/md2core/$(am__dirstamp)
  1121 +src/tools/linux/md2core/minidump-2-core$(EXEEXT): $(src_tools_linux_md2core_minidump_2_core_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_DEPENDENCIES) $(EXTRA_src_tools_linux_md2core_minidump_2_core_DEPENDENCIES) src/tools/linux/md2core/$(am__dirstamp)
  1122  	@rm -f src/tools/linux/md2core/minidump-2-core$(EXEEXT)
  1123  	$(CXXLINK) $(src_tools_linux_md2core_minidump_2_core_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_LDADD) $(LIBS)
  1124  src/testing/gtest/src/src_tools_linux_md2core_minidump_2_core_unittest-gtest-all.$(OBJEXT):  \
  1125  	src/testing/gtest/src/$(am__dirstamp) \
  1126  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
  1127  src/testing/gtest/src/src_tools_linux_md2core_minidump_2_core_unittest-gtest_main.$(OBJEXT):  \
  1128  	src/testing/gtest/src/$(am__dirstamp) \
  1129  	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
  1130  src/testing/src/src_tools_linux_md2core_minidump_2_core_unittest-gmock-all.$(OBJEXT):  \
  1131  	src/testing/src/$(am__dirstamp) \
  1132  	src/testing/src/$(DEPDIR)/$(am__dirstamp)
  1133  src/tools/linux/md2core/src_tools_linux_md2core_minidump_2_core_unittest-minidump_memory_range_unittest.$(OBJEXT):  \
  1134  	src/tools/linux/md2core/$(am__dirstamp) \
  1135  	src/tools/linux/md2core/$(DEPDIR)/$(am__dirstamp)
  1136 -src/tools/linux/md2core/minidump_2_core_unittest$(EXEEXT): $(src_tools_linux_md2core_minidump_2_core_unittest_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_unittest_DEPENDENCIES) src/tools/linux/md2core/$(am__dirstamp)
  1137 +src/tools/linux/md2core/minidump_2_core_unittest$(EXEEXT): $(src_tools_linux_md2core_minidump_2_core_unittest_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_unittest_DEPENDENCIES) $(EXTRA_src_tools_linux_md2core_minidump_2_core_unittest_DEPENDENCIES) src/tools/linux/md2core/$(am__dirstamp)
  1138  	@rm -f src/tools/linux/md2core/minidump_2_core_unittest$(EXEEXT)
  1139  	$(CXXLINK) $(src_tools_linux_md2core_minidump_2_core_unittest_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_unittest_LDADD) $(LIBS)
  1140  src/common/linux/http_upload.$(OBJEXT):  \
  1141  	src/common/linux/$(am__dirstamp) \
  1142  	src/common/linux/$(DEPDIR)/$(am__dirstamp)
  1143  src/tools/linux/symupload/$(am__dirstamp):
  1144  	@$(MKDIR_P) src/tools/linux/symupload
  1145  	@: > src/tools/linux/symupload/$(am__dirstamp)
  1146  src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp):
  1147  	@$(MKDIR_P) src/tools/linux/symupload/$(DEPDIR)
  1148  	@: > src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp)
  1149  src/tools/linux/symupload/minidump_upload.$(OBJEXT):  \
  1150  	src/tools/linux/symupload/$(am__dirstamp) \
  1151  	src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp)
  1152 -src/tools/linux/symupload/minidump_upload$(EXEEXT): $(src_tools_linux_symupload_minidump_upload_OBJECTS) $(src_tools_linux_symupload_minidump_upload_DEPENDENCIES) src/tools/linux/symupload/$(am__dirstamp)
  1153 +src/tools/linux/symupload/minidump_upload$(EXEEXT): $(src_tools_linux_symupload_minidump_upload_OBJECTS) $(src_tools_linux_symupload_minidump_upload_DEPENDENCIES) $(EXTRA_src_tools_linux_symupload_minidump_upload_DEPENDENCIES) src/tools/linux/symupload/$(am__dirstamp)
  1154  	@rm -f src/tools/linux/symupload/minidump_upload$(EXEEXT)
  1155  	$(CXXLINK) $(src_tools_linux_symupload_minidump_upload_OBJECTS) $(src_tools_linux_symupload_minidump_upload_LDADD) $(LIBS)
  1156  src/tools/linux/symupload/sym_upload.$(OBJEXT):  \
  1157  	src/tools/linux/symupload/$(am__dirstamp) \
  1158  	src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp)
  1159 -src/tools/linux/symupload/sym_upload$(EXEEXT): $(src_tools_linux_symupload_sym_upload_OBJECTS) $(src_tools_linux_symupload_sym_upload_DEPENDENCIES) src/tools/linux/symupload/$(am__dirstamp)
  1160 +src/tools/linux/symupload/sym_upload$(EXEEXT): $(src_tools_linux_symupload_sym_upload_OBJECTS) $(src_tools_linux_symupload_sym_upload_DEPENDENCIES) $(EXTRA_src_tools_linux_symupload_sym_upload_DEPENDENCIES) src/tools/linux/symupload/$(am__dirstamp)
  1161  	@rm -f src/tools/linux/symupload/sym_upload$(EXEEXT)
  1162  	$(CXXLINK) $(src_tools_linux_symupload_sym_upload_OBJECTS) $(src_tools_linux_symupload_sym_upload_LDADD) $(LIBS)
  1164  mostlyclean-compile:
  1165  	-rm -f *.$(OBJEXT)
  1166  	-rm -f src/client/linux/crash_generation/crash_generation_client.$(OBJEXT)
  1167  	-rm -f src/client/linux/crash_generation/crash_generation_server.$(OBJEXT)
  1168  	-rm -f src/client/linux/handler/exception_handler.$(OBJEXT)
  1169 @@ -5859,19 +5884,17 @@
  1170  	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
  1171  	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
  1172  	done
  1174  uninstall-dist_docDATA:
  1175  	@$(NORMAL_UNINSTALL)
  1176  	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
  1177  	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
  1178 -	test -n "$$files" || exit 0; \
  1179 -	echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
  1180 -	cd "$(DESTDIR)$(docdir)" && rm -f $$files
  1181 +	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
  1183  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  1184  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  1185  	unique=`for i in $$list; do \
  1186  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  1187  	  done | \
  1188  	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
  1189  	      END { if (nonempty) { for (i in files) print i; }; }'`; \
  1190 @@ -5996,24 +6019,25 @@
  1191  	  report=""; \
  1192  	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
  1193  	    report="Please report to $(PACKAGE_BUGREPORT)"; \
  1194  	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
  1195  	      dashes="$$report"; \
  1196  	  fi; \
  1197  	  dashes=`echo "$$dashes" | sed s/./=/g`; \
  1198  	  if test "$$failed" -eq 0; then \
  1199 -	    echo "$$grn$$dashes"; \
  1200 +	    col="$$grn"; \
  1201  	  else \
  1202 -	    echo "$$red$$dashes"; \
  1203 +	    col="$$red"; \
  1204  	  fi; \
  1205 -	  echo "$$banner"; \
  1206 -	  test -z "$$skipped" || echo "$$skipped"; \
  1207 -	  test -z "$$report" || echo "$$report"; \
  1208 -	  echo "$$dashes$$std"; \
  1209 +	  echo "$${col}$$dashes$${std}"; \
  1210 +	  echo "$${col}$$banner$${std}"; \
  1211 +	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
  1212 +	  test -z "$$report" || echo "$${col}$$report$${std}"; \
  1213 +	  echo "$${col}$$dashes$${std}"; \
  1214  	  test "$$failed" -eq 0; \
  1215  	else :; fi
  1217  distdir: $(DISTFILES)
  1218  	$(am__remove_distdir)
  1219  	test -d "$(distdir)" || mkdir "$(distdir)"
  1220  	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
  1221  	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
  1222 @@ -6051,25 +6075,29 @@
  1223  	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
  1224  	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
  1225  	|| chmod -R a+r "$(distdir)"
  1226  dist-gzip: distdir
  1227  	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
  1228  	$(am__remove_distdir)
  1230  dist-bzip2: distdir
  1231 -	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
  1232 +	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
  1233 +	$(am__remove_distdir)
  1235 +dist-lzip: distdir
  1236 +	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
  1237  	$(am__remove_distdir)
  1239  dist-lzma: distdir
  1240  	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
  1241  	$(am__remove_distdir)
  1243  dist-xz: distdir
  1244 -	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
  1245 +	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
  1246  	$(am__remove_distdir)
  1248  dist-tarZ: distdir
  1249  	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
  1250  	$(am__remove_distdir)
  1252  dist-shar: distdir
  1253  	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
  1254 @@ -6090,16 +6118,18 @@
  1255  distcheck: dist
  1256  	case '$(DIST_ARCHIVES)' in \
  1257  	*.tar.gz*) \
  1258  	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
  1259  	*.tar.bz2*) \
  1260  	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
  1261  	*.tar.lzma*) \
  1262  	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
  1263 +	*.tar.lz*) \
  1264 +	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
  1265  	*.tar.xz*) \
  1266  	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
  1267  	*.tar.Z*) \
  1268  	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
  1269  	*.shar.gz*) \
  1270  	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
  1271  	*.zip*) \
  1272  	  unzip $(distdir).zip ;;\
  1273 @@ -6109,16 +6139,17 @@
  1274  	mkdir $(distdir)/_inst
  1275  	chmod a-w $(distdir)
  1276  	test -d $(distdir)/_build || exit 0; \
  1277  	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
  1278  	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
  1279  	  && am__cwd=`pwd` \
  1280  	  && $(am__cd) $(distdir)/_build \
  1281  	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
  1282 +	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
  1283  	    $(DISTCHECK_CONFIGURE_FLAGS) \
  1284  	  && $(MAKE) $(AM_MAKEFLAGS) \
  1285  	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
  1286  	  && $(MAKE) $(AM_MAKEFLAGS) check \
  1287  	  && $(MAKE) $(AM_MAKEFLAGS) install \
  1288  	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
  1289  	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
  1290  	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
  1291 @@ -6137,18 +6168,26 @@
  1292  	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
  1293  	  && cd "$$am__cwd" \
  1294  	  || exit 1
  1295  	$(am__remove_distdir)
  1296  	@(echo "$(distdir) archives ready for distribution: "; \
  1297  	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
  1298  	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
  1299  distuninstallcheck:
  1300 -	@$(am__cd) '$(distuninstallcheck_dir)' \
  1301 -	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
  1302 +	@test -n '$(distuninstallcheck_dir)' || { \
  1303 +	  echo 'ERROR: trying to run $@ with an empty' \
  1304 +	       '$$(distuninstallcheck_dir)' >&2; \
  1305 +	  exit 1; \
  1306 +	}; \
  1307 +	$(am__cd) '$(distuninstallcheck_dir)' || { \
  1308 +	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
  1309 +	  exit 1; \
  1310 +	}; \
  1311 +	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
  1312  	   || { echo "ERROR: files left after uninstall:" ; \
  1313  	        if test -n "$(DESTDIR)"; then \
  1314  	          echo "  (check DESTDIR support)"; \
  1315  	        fi ; \
  1316  	        $(distuninstallcheck_listfiles) ; \
  1317  	        exit 1; } >&2
  1318  distcleancheck: distclean
  1319  	@if test '$(srcdir)' = . ; then \
  1320 @@ -6173,20 +6212,25 @@
  1321  install-data: install-data-am
  1322  uninstall: uninstall-am
  1324  install-am: all-am
  1325  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
  1327  installcheck: installcheck-am
  1328  install-strip:
  1329 -	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
  1330 -	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
  1331 -	  `test -z '$(STRIP)' || \
  1332 -	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
  1333 +	if test -z '$(STRIP)'; then \
  1334 +	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
  1335 +	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
  1336 +	      install; \
  1337 +	else \
  1338 +	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
  1339 +	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
  1340 +	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
  1341 +	fi
  1342  mostlyclean-generic:
  1344  clean-generic:
  1346  distclean-generic:
  1347  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  1348  	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  1349  	-rm -f src/$(am__dirstamp)
  1350 @@ -6308,18 +6352,18 @@
  1351  uninstall-am: uninstall-binPROGRAMS uninstall-dist_docDATA \
  1352  	uninstall-libLIBRARIES
  1354  .MAKE: check-am install-am install-strip
  1356  .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \
  1357  	clean clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
  1358  	clean-libLIBRARIES clean-noinstLIBRARIES clean-noinstPROGRAMS \
  1359 -	ctags dist dist-all dist-bzip2 dist-gzip dist-lzma dist-shar \
  1360 -	dist-tarZ dist-xz dist-zip distcheck distclean \
  1361 +	ctags dist dist-all dist-bzip2 dist-gzip dist-lzip dist-lzma \
  1362 +	dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
  1363  	distclean-compile distclean-generic distclean-hdr \
  1364  	distclean-tags distcleancheck distdir distuninstallcheck dvi \
  1365  	dvi-am html html-am info info-am install install-am \
  1366  	install-binPROGRAMS install-data install-data-am \
  1367  	install-dist_docDATA install-dvi install-dvi-am install-exec \
  1368  	install-exec-am install-html install-html-am install-info \
  1369  	install-info-am install-libLIBRARIES install-man install-pdf \
  1370  	install-pdf-am install-ps install-ps-am install-strip \
  1371 diff --git a/aclocal.m4 b/aclocal.m4
  1372 --- a/aclocal.m4
  1373 +++ b/aclocal.m4
  1374 @@ -1,61 +1,65 @@
  1375 -# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
  1376 +# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
  1378  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
  1379 -# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
  1380 +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
  1381 +# Inc.
  1382  # This file is free software; the Free Software Foundation
  1383  # gives unlimited permission to copy and/or distribute it,
  1384  # with or without modifications, as long as this notice is preserved.
  1386  # This program is distributed in the hope that it will be useful,
  1387  # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
  1388  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  1389  # PARTICULAR PURPOSE.
  1391  m4_ifndef([AC_AUTOCONF_VERSION],
  1392    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
  1393 -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
  1394 -[m4_warning([this file was generated for autoconf 2.65.
  1395 +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
  1396 +[m4_warning([this file was generated for autoconf 2.68.
  1397  You have another version of autoconf.  It may work, but is not guaranteed to.
  1398  If you have problems, you may need to regenerate the build system entirely.
  1399  To do so, use the procedure documented by the package, typically `autoreconf'.])])
  1401 -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
  1402 +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
  1403 +# Foundation, Inc.
  1405  # This file is free software; the Free Software Foundation
  1406  # gives unlimited permission to copy and/or distribute it,
  1407  # with or without modifications, as long as this notice is preserved.
  1409 +# serial 1
  1411  # AM_AUTOMAKE_VERSION(VERSION)
  1412  # ----------------------------
  1413  # Automake X.Y traces this macro to ensure aclocal.m4 has been
  1414  # generated from the m4 files accompanying Automake X.Y.
  1415  # (This private macro should not be called outside this file.)
  1416  AC_DEFUN([AM_AUTOMAKE_VERSION],
  1417  [am__api_version='1.11'
  1418  dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
  1419  dnl require some minimum version.  Point them to the right macro.
  1420 -m4_if([$1], [1.11.1], [],
  1421 +m4_if([$1], [1.11.3], [],
  1422        [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
  1423  ])
  1425  # _AM_AUTOCONF_VERSION(VERSION)
  1426  # -----------------------------
  1427  # aclocal traces this macro to find the Autoconf version.
  1428  # This is a private macro too.  Using m4_define simplifies
  1429  # the logic in aclocal, which can simply ignore this definition.
  1430  m4_define([_AM_AUTOCONF_VERSION], [])
  1432  # AM_SET_CURRENT_AUTOMAKE_VERSION
  1433  # -------------------------------
  1434  # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
  1435  # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
  1436  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
  1437 -[AM_AUTOMAKE_VERSION([1.11.1])dnl
  1438 +[AM_AUTOMAKE_VERSION([1.11.3])dnl
  1439  m4_ifndef([AC_AUTOCONF_VERSION],
  1440    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
  1441  _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
  1443  # Figure out how to run the assembler.                      -*- Autoconf -*-
  1445  # Copyright (C) 2001, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
  1447 @@ -74,22 +78,24 @@
  1448  test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
  1449  AC_ARG_VAR([CCAS],      [assembler compiler command (defaults to CC)])
  1450  AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
  1451  _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
  1452  ])
  1454  # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
  1456 -# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
  1457 +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
  1459  # This file is free software; the Free Software Foundation
  1460  # gives unlimited permission to copy and/or distribute it,
  1461  # with or without modifications, as long as this notice is preserved.
  1463 +# serial 1
  1465  # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
  1466  # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
  1467  # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
  1469  # Of course, Automake must honor this variable whenever it calls a
  1470  # tool from the auxiliary directory.  The problem is that $srcdir (and
  1471  # therefore $ac_aux_dir as well) can be either absolute or relative,
  1472  # depending on how configure is run.  This is pretty annoying, since
  1473 @@ -161,24 +167,24 @@
  1474    $1_FALSE=
  1475  fi
  1476  AC_CONFIG_COMMANDS_PRE(
  1477  [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
  1478    AC_MSG_ERROR([[conditional "$1" was never defined.
  1479  Usually this means the macro was only invoked conditionally.]])
  1480  fi])])
  1482 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
  1483 -# Free Software Foundation, Inc.
  1484 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
  1485 +# 2010, 2011 Free Software Foundation, Inc.
  1487  # This file is free software; the Free Software Foundation
  1488  # gives unlimited permission to copy and/or distribute it,
  1489  # with or without modifications, as long as this notice is preserved.
  1491 -# serial 10
  1492 +# serial 12
  1494  # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
  1495  # written in clear, in which case automake, when reading aclocal.m4,
  1496  # will think it sees a *use*, and therefore will trigger all it's
  1497  # C support machinery.  Also note that it means that autoscan, seeing
  1498  # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
  1501 @@ -208,16 +214,17 @@
  1502  AC_CACHE_CHECK([dependency style of $depcc],
  1503                 [am_cv_$1_dependencies_compiler_type],
  1504  [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
  1505    # We make a subdir and do the tests there.  Otherwise we can end up
  1506    # making bogus files that we don't know about and never remove.  For
  1507    # instance it was reported that on HP-UX the gcc test will end up
  1508    # making a dummy file named `D' -- because `-MD' means `put the output
  1509    # in D'.
  1510 +  rm -rf conftest.dir
  1511    mkdir conftest.dir
  1512    # Copy depcomp to subdir because otherwise we won't find it if we're
  1513    # using a relative directory.
  1514    cp "$am_depcomp" conftest.dir
  1515    cd conftest.dir
  1516    # We will build objects and dependencies in a subdirectory because
  1517    # it helps to detect inapplicable dependency modes.  For instance
  1518    # both Tru64's cc and ICC support -MD to output dependencies as a
  1519 @@ -272,17 +279,17 @@
  1520        # after this tag, mechanisms are not by side-effect, so they'll
  1521        # only be used when explicitly requested
  1522        if test "x$enable_dependency_tracking" = xyes; then
  1523  	continue
  1524        else
  1525  	break
  1526        fi
  1527        ;;
  1528 -    msvisualcpp | msvcmsys)
  1529 +    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
  1530        # This compiler won't grok `-c -o', but also, the minuso test has
  1531        # not run yet.  These depmodes are late enough in the game, and
  1532        # so weak that their functioning should not be impacted.
  1533        am__obj=conftest.${OBJEXT-o}
  1534        am__minus_obj=
  1535        ;;
  1536      none) break ;;
  1537      esac
  1538 @@ -337,20 +344,23 @@
  1539  # ------------
  1540  AC_DEFUN([AM_DEP_TRACK],
  1541  [AC_ARG_ENABLE(dependency-tracking,
  1542  [  --disable-dependency-tracking  speeds up one-time build
  1543    --enable-dependency-tracking   do not reject slow dependency extractors])
  1544  if test "x$enable_dependency_tracking" != xno; then
  1545    am_depcomp="$ac_aux_dir/depcomp"
  1546    AMDEPBACKSLASH='\'
  1547 +  am__nodep='_no'
  1548  fi
  1549  AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
  1550  AC_SUBST([AMDEPBACKSLASH])dnl
  1551  _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
  1552 +AC_SUBST([am__nodep])dnl
  1553 +_AM_SUBST_NOTMAKE([am__nodep])dnl
  1554  ])
  1556  # Generate code to set up dependency tracking.              -*- Autoconf -*-
  1558  # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
  1559  # Free Software Foundation, Inc.
  1561  # This file is free software; the Free Software Foundation
  1562 @@ -574,22 +584,25 @@
  1563      $_am_arg | $_am_arg:* )
  1564        break ;;
  1565      * )
  1566        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
  1567    esac
  1568  done
  1569  echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
  1571 -# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
  1572 +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
  1573 +# Inc.
  1575  # This file is free software; the Free Software Foundation
  1576  # gives unlimited permission to copy and/or distribute it,
  1577  # with or without modifications, as long as this notice is preserved.
  1579 +# serial 1
  1581  # AM_PROG_INSTALL_SH
  1582  # ------------------
  1583  # Define $install_sh.
  1584  AC_DEFUN([AM_PROG_INSTALL_SH],
  1585  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
  1586  if test x"${install_sh}" != xset; then
  1587    case $am_aux_dir in
  1588    *\ * | *\	*)
  1589 @@ -746,22 +759,25 @@
  1590  if eval "$MISSING --run true"; then
  1591    am_missing_run="$MISSING --run "
  1592  else
  1593    am_missing_run=
  1594    AC_MSG_WARN([`missing' script is too old or missing])
  1595  fi
  1596  ])
  1598 -# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
  1599 +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
  1600 +# Inc.
  1602  # This file is free software; the Free Software Foundation
  1603  # gives unlimited permission to copy and/or distribute it,
  1604  # with or without modifications, as long as this notice is preserved.
  1606 +# serial 1
  1608  # AM_PROG_MKDIR_P
  1609  # ---------------
  1610  # Check for `mkdir -p'.
  1611  AC_DEFUN([AM_PROG_MKDIR_P],
  1612  [AC_PREREQ([2.60])dnl
  1613  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
  1614  dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
  1615  dnl while keeping a definition of mkdir_p for backward compatibility.
  1616 @@ -774,53 +790,56 @@
  1617  case $mkdir_p in
  1618    [[\\/$]]* | ?:[[\\/]]*) ;;
  1619    */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
  1620  esac
  1621  ])
  1623  # Helper functions for option handling.                     -*- Autoconf -*-
  1625 -# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
  1626 +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
  1627 +# Foundation, Inc.
  1629  # This file is free software; the Free Software Foundation
  1630  # gives unlimited permission to copy and/or distribute it,
  1631  # with or without modifications, as long as this notice is preserved.
  1633 -# serial 4
  1634 +# serial 5
  1636  # _AM_MANGLE_OPTION(NAME)
  1637  # -----------------------
  1638  AC_DEFUN([_AM_MANGLE_OPTION],
  1639  [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
  1641  # _AM_SET_OPTION(NAME)
  1642 -# ------------------------------
  1643 +# --------------------
  1644  # Set option NAME.  Presently that only means defining a flag for this option.
  1645  AC_DEFUN([_AM_SET_OPTION],
  1646  [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
  1648  # _AM_SET_OPTIONS(OPTIONS)
  1649 -# ----------------------------------
  1650 +# ------------------------
  1651  # OPTIONS is a space-separated list of Automake options.
  1652  AC_DEFUN([_AM_SET_OPTIONS],
  1653  [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
  1655  # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
  1656  # -------------------------------------------
  1657  # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
  1658  AC_DEFUN([_AM_IF_OPTION],
  1659  [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
  1661 -# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
  1662 +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
  1664  # This file is free software; the Free Software Foundation
  1665  # gives unlimited permission to copy and/or distribute it,
  1666  # with or without modifications, as long as this notice is preserved.
  1668 +# serial 1
  1670  # AM_RUN_LOG(COMMAND)
  1671  # -------------------
  1672  # Run COMMAND, save the exit status in ac_status, and log it.
  1673  # (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
  1674  AC_DEFUN([AM_RUN_LOG],
  1675  [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
  1676     ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
  1677     ac_status=$?
  1678 @@ -887,22 +906,24 @@
  1679     # Ok.
  1681  else
  1682     AC_MSG_ERROR([newly created file is older than distributed files!
  1683  Check your system clock])
  1684  fi
  1685  AC_MSG_RESULT(yes)])
  1687 -# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
  1688 +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
  1690  # This file is free software; the Free Software Foundation
  1691  # gives unlimited permission to copy and/or distribute it,
  1692  # with or without modifications, as long as this notice is preserved.
  1694 +# serial 1
  1696  # AM_PROG_INSTALL_STRIP
  1697  # ---------------------
  1698  # One issue with vendor `install' (even GNU) is that you can't
  1699  # specify the program used to strip binaries.  This is especially
  1700  # annoying in cross-compiling environments, where the build's strip
  1701  # is unlikely to handle the host's binaries.
  1702  # Fortunately install-sh will honor a STRIPPROG variable, so we
  1703  # always use install-sh in `make install-strip', and initialize
  1704 @@ -915,38 +936,38 @@
  1705  # will honor the `STRIP' environment variable to overrule this program.
  1706  dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
  1707  if test "$cross_compiling" != no; then
  1708    AC_CHECK_TOOL([STRIP], [strip], :)
  1709  fi
  1710  INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
  1711  AC_SUBST([INSTALL_STRIP_PROGRAM])])
  1713 -# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
  1714 +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
  1716  # This file is free software; the Free Software Foundation
  1717  # gives unlimited permission to copy and/or distribute it,
  1718  # with or without modifications, as long as this notice is preserved.
  1720 -# serial 2
  1721 +# serial 3
  1723  # _AM_SUBST_NOTMAKE(VARIABLE)
  1724  # ---------------------------
  1725  # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
  1726  # This macro is traced by Automake.
  1727  AC_DEFUN([_AM_SUBST_NOTMAKE])
  1729  # AM_SUBST_NOTMAKE(VARIABLE)
  1730 -# ---------------------------
  1731 +# --------------------------
  1732  # Public sister of _AM_SUBST_NOTMAKE.
  1733  AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
  1735  # Check how to create a tarball.                            -*- Autoconf -*-
  1737 -# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
  1738 +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
  1740  # This file is free software; the Free Software Foundation
  1741  # gives unlimited permission to copy and/or distribute it,
  1742  # with or without modifications, as long as this notice is preserved.
  1744  # serial 2
  1746  # _AM_PROG_TAR(FORMAT)
  1747 @@ -958,20 +979,21 @@
  1748  # writing to stdout a FORMAT-tarball containing the directory
  1749  # $tardir.
  1750  #     tardir=directory && $(am__tar) > result.tar
  1752  # Substitute a variable $(am__untar) that extract such
  1753  # a tarball read from stdin.
  1754  #     $(am__untar) < result.tar
  1755  AC_DEFUN([_AM_PROG_TAR],
  1756 -[# Always define AMTAR for backward compatibility.
  1757 -AM_MISSING_PROG([AMTAR], [tar])
  1758 +[# Always define AMTAR for backward compatibility.  Yes, it's still used
  1759 +# in the wild :-(  We should find a proper way to deprecate it ...
  1760 +AC_SUBST([AMTAR], ['$${TAR-tar}'])
  1761  m4_if([$1], [v7],
  1762 -     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
  1763 +     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
  1764       [m4_case([$1], [ustar],, [pax],,
  1765                [m4_fatal([Unknown tar format])])
  1766  AC_MSG_CHECKING([how to create a $1 tar archive])
  1767  # Loop over all known methods to create a tar archive until one works.
  1768  _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
  1769  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
  1770  # Do not fold the above two line into one, because Tru64 sh and
  1771  # Solaris sh will not grok spaces in the rhs of `-'.
  1772 diff --git a/configure b/configure
  1773 --- a/configure
  1774 +++ b/configure
  1775 @@ -1,18 +1,18 @@
  1776  #! /bin/sh
  1777  # Guess values for system-dependent variables and create Makefiles.
  1778 -# Generated by GNU Autoconf 2.65 for breakpad 0.1.
  1779 +# Generated by GNU Autoconf 2.68 for breakpad 0.1.
  1781  # Report bugs to <google-breakpad-dev@googlegroups.com>.
  1784  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
  1785 -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
  1786 -# Inc.
  1787 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
  1788 +# Foundation, Inc.
  1791  # This configure script is free software; the Free Software Foundation
  1792  # gives unlimited permission to copy, distribute and modify it.
  1793  ## -------------------- ##
  1794  ## M4sh Initialization. ##
  1795  ## -------------------- ##
  1797 @@ -86,16 +86,17 @@
  1798  # IFS
  1799  # We need space, tab and new line, in precisely that order.  Quoting is
  1800  # there to prevent editors from complaining about space-tab.
  1801  # (If _AS_PATH_WALK were called with IFS unset, it would disable word
  1802  # splitting by setting IFS to empty value.)
  1803  IFS=" ""	$as_nl"
  1805  # Find who we are.  Look in the path if we contain no directory separator.
  1806 +as_myself=
  1807  case $0 in #((
  1808    *[\\/]* ) as_myself=$0 ;;
  1809    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1810  for as_dir in $PATH
  1811  do
  1812    IFS=$as_save_IFS
  1813    test -z "$as_dir" && as_dir=.
  1814      test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
  1815 @@ -211,21 +212,28 @@
  1816  fi; }
  1817  IFS=$as_save_IFS
  1820        if test "x$CONFIG_SHELL" != x; then :
  1821    # We cannot yet assume a decent shell, so we have to provide a
  1822  	# neutralization value for shells without unset; and this also
  1823  	# works around shells that cannot unset nonexistent variables.
  1824 +	# Preserve -v and -x to the replacement shell.
  1825  	BASH_ENV=/dev/null
  1826  	ENV=/dev/null
  1827  	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
  1828  	export CONFIG_SHELL
  1829 -	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
  1830 +	case $- in # ((((
  1831 +	  *v*x* | *x*v* ) as_opts=-vx ;;
  1832 +	  *v* ) as_opts=-v ;;
  1833 +	  *x* ) as_opts=-x ;;
  1834 +	  * ) as_opts= ;;
  1835 +	esac
  1836 +	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
  1837  fi
  1839      if test x$as_have_required = xno; then :
  1840    $as_echo "$0: This script requires a shell more modern than all"
  1841    $as_echo "$0: the shells that I found on your system."
  1842    if test x${ZSH_VERSION+set} = xset ; then
  1843      $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
  1844      $as_echo "$0: be upgraded to zsh 4.3.4 or later."
  1845 @@ -314,17 +322,17 @@
  1846  	  /^X\(\/\).*/{
  1847  	    s//\1/
  1850  	  s/.*/./; q'`
  1851        test -d "$as_dir" && break
  1852      done
  1853      test -z "$as_dirs" || eval "mkdir $as_dirs"
  1854 -  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
  1855 +  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
  1858  } # as_fn_mkdir_p
  1859  # as_fn_append VAR VALUE
  1860  # ----------------------
  1861  # Append the text in VALUE to the end of the definition contained in VAR. Take
  1862  # advantage of any shell optimizations that allow amortized linear growth over
  1863  # repeated appends, instead of the typical quadratic growth present in naive
  1864 @@ -354,29 +362,29 @@
  1865  else
  1866    as_fn_arith ()
  1868      as_val=`expr "$@" || test $? -eq 1`
  1870  fi # as_fn_arith
  1873 -# as_fn_error ERROR [LINENO LOG_FD]
  1874 -# ---------------------------------
  1875 +# as_fn_error STATUS ERROR [LINENO LOG_FD]
  1876 +# ----------------------------------------
  1877  # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
  1878  # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
  1879 -# script with status $?, using 1 if that was 0.
  1880 +# script with STATUS, using 1 if that was 0.
  1881  as_fn_error ()
  1883 -  as_status=$?; test $as_status -eq 0 && as_status=1
  1884 -  if test "$3"; then
  1885 -    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  1886 -    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
  1887 +  as_status=$1; test $as_status -eq 0 && as_status=1
  1888 +  if test "$4"; then
  1889 +    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  1890 +    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
  1891    fi
  1892 -  $as_echo "$as_me: error: $1" >&2
  1893 +  $as_echo "$as_me: error: $2" >&2
  1894    as_fn_exit $as_status
  1895  } # as_fn_error
  1897  if expr a : '\(a\)' >/dev/null 2>&1 &&
  1898     test "X`expr 00001 : '.*\(...\)'`" = X001; then
  1899    as_expr=expr
  1900  else
  1901    as_expr=false
  1902 @@ -528,17 +536,17 @@
  1903  # Sed expression to map a string onto a valid variable name.
  1904  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  1907  test -n "$DJDIR" || exec 7<&0 </dev/null
  1908  exec 6>&1
  1910  # Name of the host.
  1911 -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
  1912 +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
  1913  # so uname gets run too.
  1914  ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
  1917  # Initializations.
  1919  ac_default_prefix=/usr/local
  1920  ac_clean_files=
  1921 @@ -627,16 +635,17 @@
  1922  am__fastdepCCAS_FALSE
  1923  am__fastdepCCAS_TRUE
  1924  CCASDEPMODE
  1925  CCASFLAGS
  1926  CCAS
  1927  am__fastdepCC_FALSE
  1928  am__fastdepCC_TRUE
  1929  CCDEPMODE
  1930 +am__nodep
  1931  AMDEPBACKSLASH
  1932  AMDEP_FALSE
  1933  AMDEP_TRUE
  1934  am__quote
  1935  am__include
  1936  DEPDIR
  1937  OBJEXT
  1938  EXEEXT
  1939 @@ -794,18 +803,19 @@
  1940    # If the previous option needs an argument, assign it.
  1941    if test -n "$ac_prev"; then
  1942      eval $ac_prev=\$ac_option
  1943      ac_prev=
  1944      continue
  1945    fi
  1947    case $ac_option in
  1948 -  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
  1949 -  *)	ac_optarg=yes ;;
  1950 +  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
  1951 +  *=)   ac_optarg= ;;
  1952 +  *)    ac_optarg=yes ;;
  1953    esac
  1955    # Accept the important Cygnus configure options, so we can diagnose typos.
  1957    case $ac_dashdash$ac_option in
  1958    --)
  1959      ac_dashdash=yes ;;
  1961 @@ -840,17 +850,17 @@
  1962    -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
  1963    | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
  1964      datarootdir=$ac_optarg ;;
  1966    -disable-* | --disable-*)
  1967      ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
  1968      # Reject names that are not valid shell variable names.
  1969      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
  1970 -      as_fn_error "invalid feature name: $ac_useropt"
  1971 +      as_fn_error $? "invalid feature name: $ac_useropt"
  1972      ac_useropt_orig=$ac_useropt
  1973      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
  1974      case $ac_user_opts in
  1975        *"
  1976  "enable_$ac_useropt"
  1977  "*) ;;
  1978        *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
  1979  	 ac_unrecognized_sep=', ';;
  1980 @@ -866,17 +876,17 @@
  1981      ac_prev=dvidir ;;
  1982    -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
  1983      dvidir=$ac_optarg ;;
  1985    -enable-* | --enable-*)
  1986      ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
  1987      # Reject names that are not valid shell variable names.
  1988      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
  1989 -      as_fn_error "invalid feature name: $ac_useropt"
  1990 +      as_fn_error $? "invalid feature name: $ac_useropt"
  1991      ac_useropt_orig=$ac_useropt
  1992      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
  1993      case $ac_user_opts in
  1994        *"
  1995  "enable_$ac_useropt"
  1996  "*) ;;
  1997        *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
  1998  	 ac_unrecognized_sep=', ';;
  1999 @@ -1070,33 +1080,33 @@
  2001    -version | --version | --versio | --versi | --vers | -V)
  2002      ac_init_version=: ;;
  2004    -with-* | --with-*)
  2005      ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
  2006      # Reject names that are not valid shell variable names.
  2007      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
  2008 -      as_fn_error "invalid package name: $ac_useropt"
  2009 +      as_fn_error $? "invalid package name: $ac_useropt"
  2010      ac_useropt_orig=$ac_useropt
  2011      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
  2012      case $ac_user_opts in
  2013        *"
  2014  "with_$ac_useropt"
  2015  "*) ;;
  2016        *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
  2017  	 ac_unrecognized_sep=', ';;
  2018      esac
  2019      eval with_$ac_useropt=\$ac_optarg ;;
  2021    -without-* | --without-*)
  2022      ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
  2023      # Reject names that are not valid shell variable names.
  2024      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
  2025 -      as_fn_error "invalid package name: $ac_useropt"
  2026 +      as_fn_error $? "invalid package name: $ac_useropt"
  2027      ac_useropt_orig=$ac_useropt
  2028      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
  2029      case $ac_user_opts in
  2030        *"
  2031  "with_$ac_useropt"
  2032  "*) ;;
  2033        *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
  2034  	 ac_unrecognized_sep=', ';;
  2035 @@ -1116,50 +1126,50 @@
  2037    -x-libraries | --x-libraries | --x-librarie | --x-librari \
  2038    | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
  2039      ac_prev=x_libraries ;;
  2040    -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
  2041    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
  2042      x_libraries=$ac_optarg ;;
  2044 -  -*) as_fn_error "unrecognized option: \`$ac_option'
  2045 -Try \`$0 --help' for more information."
  2046 +  -*) as_fn_error $? "unrecognized option: \`$ac_option'
  2047 +Try \`$0 --help' for more information"
  2048      ;;
  2050    *=*)
  2051      ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
  2052      # Reject names that are not valid shell variable names.
  2053      case $ac_envvar in #(
  2054        '' | [0-9]* | *[!_$as_cr_alnum]* )
  2055 -      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
  2056 +      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
  2057      esac
  2058      eval $ac_envvar=\$ac_optarg
  2059      export $ac_envvar ;;
  2061    *)
  2062      # FIXME: should be removed in autoconf 3.0.
  2063      $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
  2064      expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
  2065        $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
  2066 -    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
  2067 +    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
  2068      ;;
  2070    esac
  2071  done
  2073  if test -n "$ac_prev"; then
  2074    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
  2075 -  as_fn_error "missing argument to $ac_option"
  2076 +  as_fn_error $? "missing argument to $ac_option"
  2077  fi
  2079  if test -n "$ac_unrecognized_opts"; then
  2080    case $enable_option_checking in
  2081      no) ;;
  2082 -    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
  2083 +    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
  2084      *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
  2085    esac
  2086  fi
  2088  # Check all directory arguments for consistency.
  2089  for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
  2090  		datadir sysconfdir sharedstatedir localstatedir includedir \
  2091  		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
  2092 @@ -1172,49 +1182,49 @@
  2093        ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
  2094        eval $ac_var=\$ac_val;;
  2095    esac
  2096    # Be sure to have absolute directory names.
  2097    case $ac_val in
  2098      [\\/$]* | ?:[\\/]* )  continue;;
  2099      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
  2100    esac
  2101 -  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
  2102 +  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
  2103  done
  2105  # There might be people who depend on the old broken behavior: `$host'
  2106  # used to hold the argument of --host etc.
  2107  # FIXME: To remove some day.
  2108  build=$build_alias
  2109  host=$host_alias
  2110  target=$target_alias
  2112  # FIXME: To remove some day.
  2113  if test "x$host_alias" != x; then
  2114    if test "x$build_alias" = x; then
  2115      cross_compiling=maybe
  2116 -    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
  2117 -    If a cross compiler is detected then cross compile mode will be used." >&2
  2118 +    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
  2119 +    If a cross compiler is detected then cross compile mode will be used" >&2
  2120    elif test "x$build_alias" != "x$host_alias"; then
  2121      cross_compiling=yes
  2122    fi
  2123  fi
  2125  ac_tool_prefix=
  2126  test -n "$host_alias" && ac_tool_prefix=$host_alias-
  2128  test "$silent" = yes && exec 6>/dev/null
  2131  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  2132  ac_ls_di=`ls -di .` &&
  2133  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
  2134 -  as_fn_error "working directory cannot be determined"
  2135 +  as_fn_error $? "working directory cannot be determined"
  2136  test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
  2137 -  as_fn_error "pwd does not report name of working directory"
  2138 +  as_fn_error $? "pwd does not report name of working directory"
  2141  # Find the source files, if location was not specified.
  2142  if test -z "$srcdir"; then
  2143    ac_srcdir_defaulted=yes
  2144    # Try the directory containing this script, then the parent directory.
  2145    ac_confdir=`$as_dirname -- "$as_myself" ||
  2146  $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  2147 @@ -1243,21 +1253,21 @@
  2148    if test ! -r "$srcdir/$ac_unique_file"; then
  2149      srcdir=..
  2150    fi
  2151  else
  2152    ac_srcdir_defaulted=no
  2153  fi
  2154  if test ! -r "$srcdir/$ac_unique_file"; then
  2155    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
  2156 -  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
  2157 +  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
  2158  fi
  2159  ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
  2160  ac_abs_confdir=`(
  2161 -	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
  2162 +	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
  2163  	pwd)`
  2164  # When building in place, set srcdir=.
  2165  if test "$ac_abs_confdir" = "$ac_pwd"; then
  2166    srcdir=.
  2167  fi
  2168  # Remove unnecessary trailing slashes from srcdir.
  2169  # Double slashes in file names in object file debugging info
  2170  # mess up M-x gdb in Emacs.
  2171 @@ -1287,17 +1297,17 @@
  2173  Defaults for the options are specified in brackets.
  2175  Configuration:
  2176    -h, --help              display this help and exit
  2177        --help=short        display options specific to this package
  2178        --help=recursive    display the short help of all the included packages
  2179    -V, --version           display version information and exit
  2180 -  -q, --quiet, --silent   do not print \`checking...' messages
  2181 +  -q, --quiet, --silent   do not print \`checking ...' messages
  2182        --cache-file=FILE   cache test results in FILE [disabled]
  2183    -C, --config-cache      alias for \`--cache-file=config.cache'
  2184    -n, --no-create         do not create output files
  2185        --srcdir=DIR        find the sources in DIR [configure dir or \`..']
  2187  Installation directories:
  2188    --prefix=PREFIX         install architecture-independent files in PREFIX
  2189                            [$ac_default_prefix]
  2190 @@ -1440,19 +1450,19 @@
  2191      cd "$ac_pwd" || { ac_status=$?; break; }
  2192    done
  2193  fi
  2195  test -n "$ac_init_help" && exit $ac_status
  2196  if $ac_init_version; then
  2197    cat <<\_ACEOF
  2198  breakpad configure 0.1
  2199 -generated by GNU Autoconf 2.65
  2201 -Copyright (C) 2009 Free Software Foundation, Inc.
  2202 +generated by GNU Autoconf 2.68
  2204 +Copyright (C) 2010 Free Software Foundation, Inc.
  2205  This configure script is free software; the Free Software Foundation
  2206  gives unlimited permission to copy, distribute and modify it.
  2207  _ACEOF
  2208    exit
  2209  fi
  2211  ## ------------------------ ##
  2212  ## Autoconf initialization. ##
  2213 @@ -1486,17 +1496,17 @@
  2214         } && test -s conftest.$ac_objext; then :
  2215    ac_retval=0
  2216  else
  2217    $as_echo "$as_me: failed program was:" >&5
  2218  sed 's/^/| /' conftest.$ac_ext >&5
  2220  	ac_retval=1
  2221  fi
  2222 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  2223 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  2224    as_fn_set_status $ac_retval
  2226  } # ac_fn_c_try_compile
  2228  # ac_fn_c_try_cpp LINENO
  2229  # ----------------------
  2230  # Try to preprocess conftest.$ac_ext, and return whether this succeeded.
  2231  ac_fn_c_try_cpp ()
  2232 @@ -1512,28 +1522,28 @@
  2233    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
  2234    ac_status=$?
  2235    if test -s conftest.err; then
  2236      grep -v '^ *+' conftest.err >conftest.er1
  2237      cat conftest.er1 >&5
  2238      mv -f conftest.er1 conftest.err
  2239    fi
  2240    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  2241 -  test $ac_status = 0; } >/dev/null && {
  2242 +  test $ac_status = 0; } > conftest.i && {
  2243  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  2244  	 test ! -s conftest.err
  2245         }; then :
  2246    ac_retval=0
  2247  else
  2248    $as_echo "$as_me: failed program was:" >&5
  2249  sed 's/^/| /' conftest.$ac_ext >&5
  2251      ac_retval=1
  2252  fi
  2253 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  2254 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  2255    as_fn_set_status $ac_retval
  2257  } # ac_fn_c_try_cpp
  2259  # ac_fn_cxx_try_compile LINENO
  2260  # ----------------------------
  2261  # Try to compile conftest.$ac_ext, and return whether this succeeded.
  2262  ac_fn_cxx_try_compile ()
  2263 @@ -1561,17 +1571,17 @@
  2264         } && test -s conftest.$ac_objext; then :
  2265    ac_retval=0
  2266  else
  2267    $as_echo "$as_me: failed program was:" >&5
  2268  sed 's/^/| /' conftest.$ac_ext >&5
  2270  	ac_retval=1
  2271  fi
  2272 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  2273 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  2274    as_fn_set_status $ac_retval
  2276  } # ac_fn_cxx_try_compile
  2278  # ac_fn_c_try_run LINENO
  2279  # ----------------------
  2280  # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
  2281  # that executables *can* be run.
  2282 @@ -1603,17 +1613,17 @@
  2283  else
  2284    $as_echo "$as_me: program exited with status $ac_status" >&5
  2285         $as_echo "$as_me: failed program was:" >&5
  2286  sed 's/^/| /' conftest.$ac_ext >&5
  2288         ac_retval=$ac_status
  2289  fi
  2290    rm -rf conftest.dSYM conftest_ipa8_conftest.oo
  2291 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  2292 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  2293    as_fn_set_status $ac_retval
  2295  } # ac_fn_c_try_run
  2297  # ac_fn_c_try_link LINENO
  2298  # -----------------------
  2299  # Try to link conftest.$ac_ext, and return whether this succeeded.
  2300  ac_fn_c_try_link ()
  2301 @@ -1649,33 +1659,33 @@
  2303  	ac_retval=1
  2304  fi
  2305    # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
  2306    # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
  2307    # interfere with the next link command; also delete a directory that is
  2308    # left behind by Apple's compiler.  We do this before executing the actions.
  2309    rm -rf conftest.dSYM conftest_ipa8_conftest.oo
  2310 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  2311 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  2312    as_fn_set_status $ac_retval
  2314  } # ac_fn_c_try_link
  2316  # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
  2317  # -------------------------------------------------------
  2318  # Tests whether HEADER exists, giving a warning if it cannot be compiled using
  2319  # the include files in INCLUDES and setting the cache variable VAR
  2320  # accordingly.
  2321  ac_fn_c_check_header_mongrel ()
  2323    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  2324 -  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  2325 +  if eval \${$3+:} false; then :
  2326    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  2327  $as_echo_n "checking for $2... " >&6; }
  2328 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  2329 +if eval \${$3+:} false; then :
  2330    $as_echo_n "(cached) " >&6
  2331  fi
  2332  eval ac_res=\$$3
  2333  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  2334  $as_echo "$ac_res" >&6; }
  2335  else
  2336    # Is the header compilable?
  2337  { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
  2338 @@ -1701,17 +1711,17 @@
  2339  /* end confdefs.h.  */
  2340  #include <$2>
  2341  _ACEOF
  2342  if ac_fn_c_try_cpp "$LINENO"; then :
  2343    ac_header_preproc=yes
  2344  else
  2345    ac_header_preproc=no
  2346  fi
  2347 -rm -f conftest.err conftest.$ac_ext
  2348 +rm -f conftest.err conftest.i conftest.$ac_ext
  2349  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
  2350  $as_echo "$ac_header_preproc" >&6; }
  2352  # So?  What about this header?
  2353  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
  2354    yes:no: )
  2355      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
  2356  $as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
  2357 @@ -1724,49 +1734,47 @@
  2358      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
  2359  $as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
  2360      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
  2361  $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
  2362      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
  2363  $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
  2364      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
  2365  $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
  2366 -( cat <<\_ASBOX
  2367 -## --------------------------------------------------- ##
  2368 +( $as_echo "## --------------------------------------------------- ##
  2369  ## Report this to google-breakpad-dev@googlegroups.com ##
  2370 -## --------------------------------------------------- ##
  2371 -_ASBOX
  2372 +## --------------------------------------------------- ##"
  2373       ) | sed "s/^/$as_me: WARNING:     /" >&2
  2374      ;;
  2375  esac
  2376    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  2377  $as_echo_n "checking for $2... " >&6; }
  2378 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  2379 +if eval \${$3+:} false; then :
  2380    $as_echo_n "(cached) " >&6
  2381  else
  2382    eval "$3=\$ac_header_compiler"
  2383  fi
  2384  eval ac_res=\$$3
  2385  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  2386  $as_echo "$ac_res" >&6; }
  2387  fi
  2388 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  2389 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  2391  } # ac_fn_c_check_header_mongrel
  2393  # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
  2394  # -------------------------------------------------------
  2395  # Tests whether HEADER exists and can be compiled using the include files in
  2396  # INCLUDES, setting the cache variable VAR accordingly.
  2397  ac_fn_c_check_header_compile ()
  2399    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  2400    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  2401  $as_echo_n "checking for $2... " >&6; }
  2402 -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  2403 +if eval \${$3+:} false; then :
  2404    $as_echo_n "(cached) " >&6
  2405  else
  2406    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  2407  /* end confdefs.h.  */
  2408  $4
  2409  #include <$2>
  2410  _ACEOF
  2411  if ac_fn_c_try_compile "$LINENO"; then :
  2412 @@ -1774,25 +1782,25 @@
  2413  else
  2414    eval "$3=no"
  2415  fi
  2416  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  2417  fi
  2418  eval ac_res=\$$3
  2419  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  2420  $as_echo "$ac_res" >&6; }
  2421 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  2422 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  2424  } # ac_fn_c_check_header_compile
  2425  cat >config.log <<_ACEOF
  2426  This file contains any messages produced by compilers while
  2427  running configure, to aid debugging if configure makes a mistake.
  2429  It was created by breakpad $as_me 0.1, which was
  2430 -generated by GNU Autoconf 2.65.  Invocation command line was
  2431 +generated by GNU Autoconf 2.68.  Invocation command line was
  2433    $ $0 $@
  2435  _ACEOF
  2436  exec 5>>config.log
  2438  cat <<_ASUNAME
  2439  ## --------- ##
  2440 @@ -1892,21 +1900,19 @@
  2441  # would cause problems or look ugly.
  2442  # WARNING: Use '\'' to represent an apostrophe within the trap.
  2443  # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
  2444  trap 'exit_status=$?
  2445    # Save into config.log some information that might help in debugging.
  2447      echo
  2449 -    cat <<\_ASBOX
  2450 -## ---------------- ##
  2451 +    $as_echo "## ---------------- ##
  2452  ## Cache variables. ##
  2453 -## ---------------- ##
  2454 -_ASBOX
  2455 +## ---------------- ##"
  2456      echo
  2457      # The following way of writing the cache mishandles newlines in values,
  2459    for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
  2460      eval ac_val=\$$ac_var
  2461      case $ac_val in #(
  2462      *${as_nl}*)
  2463        case $ac_var in #(
  2464 @@ -1930,56 +1936,50 @@
  2465      *)
  2466        sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
  2467        ;;
  2468      esac |
  2469      sort
  2471      echo
  2473 -    cat <<\_ASBOX
  2474 -## ----------------- ##
  2475 +    $as_echo "## ----------------- ##
  2476  ## Output variables. ##
  2477 -## ----------------- ##
  2478 -_ASBOX
  2479 +## ----------------- ##"
  2480      echo
  2481      for ac_var in $ac_subst_vars
  2482      do
  2483        eval ac_val=\$$ac_var
  2484        case $ac_val in
  2485        *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
  2486        esac
  2487        $as_echo "$ac_var='\''$ac_val'\''"
  2488      done | sort
  2489      echo
  2491      if test -n "$ac_subst_files"; then
  2492 -      cat <<\_ASBOX
  2493 -## ------------------- ##
  2494 +      $as_echo "## ------------------- ##
  2495  ## File substitutions. ##
  2496 -## ------------------- ##
  2497 -_ASBOX
  2498 +## ------------------- ##"
  2499        echo
  2500        for ac_var in $ac_subst_files
  2501        do
  2502  	eval ac_val=\$$ac_var
  2503  	case $ac_val in
  2504  	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
  2505  	esac
  2506  	$as_echo "$ac_var='\''$ac_val'\''"
  2507        done | sort
  2508        echo
  2509      fi
  2511      if test -s confdefs.h; then
  2512 -      cat <<\_ASBOX
  2513 -## ----------- ##
  2514 +      $as_echo "## ----------- ##
  2515  ## confdefs.h. ##
  2516 -## ----------- ##
  2517 -_ASBOX
  2518 +## ----------- ##"
  2519        echo
  2520        cat confdefs.h
  2521        echo
  2522      fi
  2523      test "$ac_signal" != 0 &&
  2524        $as_echo "$as_me: caught signal $ac_signal"
  2525      $as_echo "$as_me: exit $exit_status"
  2526    } >&5
  2527 @@ -2024,32 +2024,41 @@
  2528  _ACEOF
  2531  # Let the site file select an alternate cache file if it wants to.
  2532  # Prefer an explicitly selected file to automatically selected ones.
  2533  ac_site_file1=NONE
  2534  ac_site_file2=NONE
  2535  if test -n "$CONFIG_SITE"; then
  2536 -  ac_site_file1=$CONFIG_SITE
  2537 +  # We do not want a PATH search for config.site.
  2538 +  case $CONFIG_SITE in #((
  2539 +    -*)  ac_site_file1=./$CONFIG_SITE;;
  2540 +    */*) ac_site_file1=$CONFIG_SITE;;
  2541 +    *)   ac_site_file1=./$CONFIG_SITE;;
  2542 +  esac
  2543  elif test "x$prefix" != xNONE; then
  2544    ac_site_file1=$prefix/share/config.site
  2545    ac_site_file2=$prefix/etc/config.site
  2546  else
  2547    ac_site_file1=$ac_default_prefix/share/config.site
  2548    ac_site_file2=$ac_default_prefix/etc/config.site
  2549  fi
  2550  for ac_site_file in "$ac_site_file1" "$ac_site_file2"
  2551  do
  2552    test "x$ac_site_file" = xNONE && continue
  2553    if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
  2554      { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
  2555  $as_echo "$as_me: loading site script $ac_site_file" >&6;}
  2556      sed 's/^/| /' "$ac_site_file" >&5
  2557 -    . "$ac_site_file"
  2558 +    . "$ac_site_file" \
  2559 +      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  2560 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  2561 +as_fn_error $? "failed to load site script $ac_site_file
  2562 +See \`config.log' for more details" "$LINENO" 5; }
  2563    fi
  2564  done
  2566  if test -r "$cache_file"; then
  2567    # Some versions of bash will fail to source /dev/null (special files
  2568    # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
  2569    if test /dev/null != "$cache_file" && test -f "$cache_file"; then
  2570      { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
  2571 @@ -2115,77 +2124,83 @@
  2572      esac
  2573    fi
  2574  done
  2575  if $ac_cache_corrupted; then
  2576    { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  2577  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  2578    { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
  2579  $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
  2580 -  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
  2581 +  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
  2582  fi
  2583  ## -------------------- ##
  2584  ## Main body of script. ##
  2585  ## -------------------- ##
  2587  ac_ext=c
  2588  ac_cpp='$CPP $CPPFLAGS'
  2589  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  2590  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  2591  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  2595  ac_aux_dir=
  2596  for ac_dir in autotools "$srcdir"/autotools; do
  2597 -  for ac_t in install-sh install.sh shtool; do
  2598 -    if test -f "$ac_dir/$ac_t"; then
  2599 -      ac_aux_dir=$ac_dir
  2600 -      ac_install_sh="$ac_aux_dir/$ac_t -c"
  2601 -      break 2
  2602 -    fi
  2603 -  done
  2604 +  if test -f "$ac_dir/install-sh"; then
  2605 +    ac_aux_dir=$ac_dir
  2606 +    ac_install_sh="$ac_aux_dir/install-sh -c"
  2607 +    break
  2608 +  elif test -f "$ac_dir/install.sh"; then
  2609 +    ac_aux_dir=$ac_dir
  2610 +    ac_install_sh="$ac_aux_dir/install.sh -c"
  2611 +    break
  2612 +  elif test -f "$ac_dir/shtool"; then
  2613 +    ac_aux_dir=$ac_dir
  2614 +    ac_install_sh="$ac_aux_dir/shtool install -c"
  2615 +    break
  2616 +  fi
  2617  done
  2618  if test -z "$ac_aux_dir"; then
  2619 -  as_fn_error "cannot find install-sh, install.sh, or shtool in autotools \"$srcdir\"/autotools" "$LINENO" 5
  2620 +  as_fn_error $? "cannot find install-sh, install.sh, or shtool in autotools \"$srcdir\"/autotools" "$LINENO" 5
  2621  fi
  2623  # These three variables are undocumented and unsupported,
  2624  # and are intended to be withdrawn in a future Autoconf release.
  2625  # They can cause serious problems if a builder's source tree is in a directory
  2626  # whose full name contains unusual characters.
  2627  ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
  2628  ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
  2629  ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
  2633  # Make sure we can run config.sub.
  2634  $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
  2635 -  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
  2636 +  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
  2638  { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
  2639  $as_echo_n "checking build system type... " >&6; }
  2640 -if test "${ac_cv_build+set}" = set; then :
  2641 +if ${ac_cv_build+:} false; then :
  2642    $as_echo_n "(cached) " >&6
  2643  else
  2644    ac_build_alias=$build_alias
  2645  test "x$ac_build_alias" = x &&
  2646    ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
  2647  test "x$ac_build_alias" = x &&
  2648 -  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
  2649 +  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
  2650  ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
  2651 -  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
  2652 +  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
  2654  fi
  2655  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
  2656  $as_echo "$ac_cv_build" >&6; }
  2657  case $ac_cv_build in
  2658  *-*-*) ;;
  2659 -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
  2660 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
  2661  esac
  2662  build=$ac_cv_build
  2663  ac_save_IFS=$IFS; IFS='-'
  2664  set x $ac_cv_build
  2665  shift
  2666  build_cpu=$1
  2667  build_vendor=$2
  2668  shift; shift
  2669 @@ -2193,32 +2208,32 @@
  2670  # except with old shells:
  2671  build_os=$*
  2672  IFS=$ac_save_IFS
  2673  case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
  2676  { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
  2677  $as_echo_n "checking host system type... " >&6; }
  2678 -if test "${ac_cv_host+set}" = set; then :
  2679 +if ${ac_cv_host+:} false; then :
  2680    $as_echo_n "(cached) " >&6
  2681  else
  2682    if test "x$host_alias" = x; then
  2683    ac_cv_host=$ac_cv_build
  2684  else
  2685    ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
  2686 -    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
  2687 +    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
  2688  fi
  2690  fi
  2691  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
  2692  $as_echo "$ac_cv_host" >&6; }
  2693  case $ac_cv_host in
  2694  *-*-*) ;;
  2695 -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
  2696 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
  2697  esac
  2698  host=$ac_cv_host
  2699  ac_save_IFS=$IFS; IFS='-'
  2700  set x $ac_cv_host
  2701  shift
  2702  host_cpu=$1
  2703  host_vendor=$2
  2704  shift; shift
  2705 @@ -2244,17 +2259,17 @@
  2706  # AFS /usr/afsws/bin/install, which mishandles nonexistent args
  2707  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  2708  # OS/2's system install, which has a completely different semantic
  2709  # ./install, which can be erroneously created by make from ./install.sh.
  2710  # Reject install programs that cannot install multiple files.
  2711  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
  2712  $as_echo_n "checking for a BSD-compatible install... " >&6; }
  2713  if test -z "$INSTALL"; then
  2714 -if test "${ac_cv_path_install+set}" = set; then :
  2715 +if ${ac_cv_path_install+:} false; then :
  2716    $as_echo_n "(cached) " >&6
  2717  else
  2718    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  2719  for as_dir in $PATH
  2720  do
  2721    IFS=$as_save_IFS
  2722    test -z "$as_dir" && as_dir=.
  2723      # Account for people who put trailing slashes in PATH elements.
  2724 @@ -2331,21 +2346,21 @@
  2725  sleep 1
  2726  echo timestamp > conftest.file
  2727  # Reject unsafe characters in $srcdir or the absolute working directory
  2728  # name.  Accept space and tab only in the latter.
  2729  am_lf='
  2731  case `pwd` in
  2732    *[\\\"\#\$\&\'\`$am_lf]*)
  2733 -    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
  2734 +    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
  2735  esac
  2736  case $srcdir in
  2737    *[\\\"\#\$\&\'\`$am_lf\ \	]*)
  2738 -    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
  2739 +    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
  2740  esac
  2742  # Do `set' in a subshell so we don't clobber the current shell's
  2743  # arguments.  Must try -L first in case configure is actually a
  2744  # symlink; some systems play weird games with the mod time of symlinks
  2745  # (eg FreeBSD returns the mod time of the symlink's containing
  2746  # directory).
  2747  if (
  2748 @@ -2357,27 +2372,27 @@
  2749     rm -f conftest.file
  2750     if test "$*" != "X $srcdir/configure conftest.file" \
  2751        && test "$*" != "X conftest.file $srcdir/configure"; then
  2753        # If neither matched, then we have a broken ls.  This can happen
  2754        # if, for instance, CONFIG_SHELL is bash and it inherits a
  2755        # broken ls alias from the environment.  This has actually
  2756        # happened.  Such a system could not be considered "sane".
  2757 -      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
  2758 +      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
  2759  alias in your environment" "$LINENO" 5
  2760     fi
  2762     test "$2" = conftest.file
  2764  then
  2765     # Ok.
  2767  else
  2768 -   as_fn_error "newly created file is older than distributed files!
  2769 +   as_fn_error $? "newly created file is older than distributed files!
  2770  Check your system clock" "$LINENO" 5
  2771  fi
  2772  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  2773  $as_echo "yes" >&6; }
  2774  test "$program_prefix" != NONE &&
  2775    program_transform_name="s&^&$program_prefix&;$program_transform_name"
  2776  # Use a double $ so make ignores it.
  2777  test "$program_suffix" != NONE &&
  2778 @@ -2421,17 +2436,17 @@
  2779  # tool to use in cross-compilation environments, therefore Automake
  2780  # will honor the `STRIP' environment variable to overrule this program.
  2781  if test "$cross_compiling" != no; then
  2782    if test -n "$ac_tool_prefix"; then
  2783    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  2784  set dummy ${ac_tool_prefix}strip; ac_word=$2
  2785  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2786  $as_echo_n "checking for $ac_word... " >&6; }
  2787 -if test "${ac_cv_prog_STRIP+set}" = set; then :
  2788 +if ${ac_cv_prog_STRIP+:} false; then :
  2789    $as_echo_n "(cached) " >&6
  2790  else
  2791    if test -n "$STRIP"; then
  2792    ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
  2793  else
  2794  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  2795  for as_dir in $PATH
  2796  do
  2797 @@ -2461,17 +2476,17 @@
  2799  fi
  2800  if test -z "$ac_cv_prog_STRIP"; then
  2801    ac_ct_STRIP=$STRIP
  2802    # Extract the first word of "strip", so it can be a program name with args.
  2803  set dummy strip; ac_word=$2
  2804  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2805  $as_echo_n "checking for $ac_word... " >&6; }
  2806 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
  2807 +if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
  2808    $as_echo_n "(cached) " >&6
  2809  else
  2810    if test -n "$ac_ct_STRIP"; then
  2811    ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
  2812  else
  2813  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  2814  for as_dir in $PATH
  2815  do
  2816 @@ -2514,17 +2529,17 @@
  2817  fi
  2819  fi
  2820  INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
  2822  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
  2823  $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
  2824  if test -z "$MKDIR_P"; then
  2825 -  if test "${ac_cv_path_mkdir+set}" = set; then :
  2826 +  if ${ac_cv_path_mkdir+:} false; then :
  2827    $as_echo_n "(cached) " >&6
  2828  else
  2829    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  2830  for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
  2831  do
  2832    IFS=$as_save_IFS
  2833    test -z "$as_dir" && as_dir=.
  2834      for ac_prog in mkdir gmkdir; do
  2835 @@ -2565,17 +2580,17 @@
  2836  esac
  2838  for ac_prog in gawk mawk nawk awk
  2839  do
  2840    # Extract the first word of "$ac_prog", so it can be a program name with args.
  2841  set dummy $ac_prog; ac_word=$2
  2842  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2843  $as_echo_n "checking for $ac_word... " >&6; }
  2844 -if test "${ac_cv_prog_AWK+set}" = set; then :
  2845 +if ${ac_cv_prog_AWK+:} false; then :
  2846    $as_echo_n "(cached) " >&6
  2847  else
  2848    if test -n "$AWK"; then
  2849    ac_cv_prog_AWK="$AWK" # Let the user override the test.
  2850  else
  2851  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  2852  for as_dir in $PATH
  2853  do
  2854 @@ -2605,25 +2620,25 @@
  2856    test -n "$AWK" && break
  2857  done
  2859  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
  2860  $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
  2861  set x ${MAKE-make}
  2862  ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
  2863 -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
  2864 +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
  2865    $as_echo_n "(cached) " >&6
  2866  else
  2867    cat >conftest.make <<\_ACEOF
  2868  SHELL = /bin/sh
  2869  all:
  2870  	@echo '@@@%%%=$(MAKE)=@@@%%%'
  2871  _ACEOF
  2872 -# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  2873 +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
  2874  case `${MAKE-make} -f conftest.make 2>/dev/null` in
  2875    *@@@%%%=?*=@@@%%%*)
  2876      eval ac_cv_prog_make_${ac_make}_set=yes;;
  2877    *)
  2878      eval ac_cv_prog_make_${ac_make}_set=no;;
  2879  esac
  2880  rm -f conftest.make
  2881  fi
  2882 @@ -2647,17 +2662,17 @@
  2883  rmdir .tst 2>/dev/null
  2885  if test "`cd $srcdir && pwd`" != "`pwd`"; then
  2886    # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
  2887    # is not polluted with repeated "-I."
  2888    am__isrc=' -I$(srcdir)'
  2889    # test to see if srcdir already configured
  2890    if test -f $srcdir/config.status; then
  2891 -    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
  2892 +    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
  2893    fi
  2894  fi
  2896  # test whether we have cygpath
  2897  if test -z "$CYGPATH_W"; then
  2898    if (cygpath --version) >/dev/null 2>/dev/null; then
  2899      CYGPATH_W='cygpath -w'
  2900    else
  2901 @@ -2693,19 +2708,19 @@
  2903  AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
  2906  MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
  2908  # We need awk for the "check" target.  The system "awk" is bad on
  2909  # some platforms.
  2910 -# Always define AMTAR for backward compatibility.
  2912 -AMTAR=${AMTAR-"${am_missing_run}tar"}
  2913 +# Always define AMTAR for backward compatibility.  Yes, it's still used
  2914 +# in the wild :-(  We should find a proper way to deprecate it ...
  2915 +AMTAR='$${TAR-tar}'
  2918  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
  2919  $as_echo_n "checking how to create a ustar tar archive... " >&6; }
  2920  # Loop over all known methods to create a tar archive until one works.
  2921  _am_tools='gnutar plaintar pax cpio none'
  2922  _am_tools=${am_cv_prog_tar_ustar-$_am_tools}
  2923  # Do not fold the above two line into one, because Tru64 sh and
  2924 @@ -2771,17 +2786,17 @@
  2925     ac_status=$?
  2926     echo "$as_me:$LINENO: \$? = $ac_status" >&5
  2927     (exit $ac_status); }
  2928      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
  2929    fi
  2930  done
  2931  rm -rf conftest.dir
  2933 -if test "${am_cv_prog_tar_ustar+set}" = set; then :
  2934 +if ${am_cv_prog_tar_ustar+:} false; then :
  2935    $as_echo_n "(cached) " >&6
  2936  else
  2937    am_cv_prog_tar_ustar=$_am_tool
  2938  fi
  2940  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
  2941  $as_echo "$am_cv_prog_tar_ustar" >&6; }
  2943 @@ -2839,16 +2854,17 @@
  2944  # Check whether --enable-dependency-tracking was given.
  2945  if test "${enable_dependency_tracking+set}" = set; then :
  2946    enableval=$enable_dependency_tracking;
  2947  fi
  2949  if test "x$enable_dependency_tracking" != xno; then
  2950    am_depcomp="$ac_aux_dir/depcomp"
  2951    AMDEPBACKSLASH='\'
  2952 +  am__nodep='_no'
  2953  fi
  2954   if test "x$enable_dependency_tracking" != xno; then
  2955    AMDEP_TRUE=
  2956    AMDEP_FALSE='#'
  2957  else
  2958    AMDEP_TRUE='#'
  2959    AMDEP_FALSE=
  2960  fi
  2961 @@ -2859,17 +2875,17 @@
  2962  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  2963  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  2964  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  2965  if test -n "$ac_tool_prefix"; then
  2966    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  2967  set dummy ${ac_tool_prefix}gcc; ac_word=$2
  2968  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2969  $as_echo_n "checking for $ac_word... " >&6; }
  2970 -if test "${ac_cv_prog_CC+set}" = set; then :
  2971 +if ${ac_cv_prog_CC+:} false; then :
  2972    $as_echo_n "(cached) " >&6
  2973  else
  2974    if test -n "$CC"; then
  2975    ac_cv_prog_CC="$CC" # Let the user override the test.
  2976  else
  2977  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  2978  for as_dir in $PATH
  2979  do
  2980 @@ -2899,17 +2915,17 @@
  2982  fi
  2983  if test -z "$ac_cv_prog_CC"; then
  2984    ac_ct_CC=$CC
  2985    # Extract the first word of "gcc", so it can be a program name with args.
  2986  set dummy gcc; ac_word=$2
  2987  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2988  $as_echo_n "checking for $ac_word... " >&6; }
  2989 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
  2990 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
  2991    $as_echo_n "(cached) " >&6
  2992  else
  2993    if test -n "$ac_ct_CC"; then
  2994    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
  2995  else
  2996  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  2997  for as_dir in $PATH
  2998  do
  2999 @@ -2952,17 +2968,17 @@
  3000  fi
  3002  if test -z "$CC"; then
  3003            if test -n "$ac_tool_prefix"; then
  3004      # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  3005  set dummy ${ac_tool_prefix}cc; ac_word=$2
  3006  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  3007  $as_echo_n "checking for $ac_word... " >&6; }
  3008 -if test "${ac_cv_prog_CC+set}" = set; then :
  3009 +if ${ac_cv_prog_CC+:} false; then :
  3010    $as_echo_n "(cached) " >&6
  3011  else
  3012    if test -n "$CC"; then
  3013    ac_cv_prog_CC="$CC" # Let the user override the test.
  3014  else
  3015  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  3016  for as_dir in $PATH
  3017  do
  3018 @@ -2992,17 +3008,17 @@
  3020    fi
  3021  fi
  3022  if test -z "$CC"; then
  3023    # Extract the first word of "cc", so it can be a program name with args.
  3024  set dummy cc; ac_word=$2
  3025  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  3026  $as_echo_n "checking for $ac_word... " >&6; }
  3027 -if test "${ac_cv_prog_CC+set}" = set; then :
  3028 +if ${ac_cv_prog_CC+:} false; then :
  3029    $as_echo_n "(cached) " >&6
  3030  else
  3031    if test -n "$CC"; then
  3032    ac_cv_prog_CC="$CC" # Let the user override the test.
  3033  else
  3034    ac_prog_rejected=no
  3035  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  3036  for as_dir in $PATH
  3037 @@ -3051,17 +3067,17 @@
  3038  if test -z "$CC"; then
  3039    if test -n "$ac_tool_prefix"; then
  3040    for ac_prog in cl.exe
  3041    do
  3042      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  3043  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  3044  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  3045  $as_echo_n "checking for $ac_word... " >&6; }
  3046 -if test "${ac_cv_prog_CC+set}" = set; then :
  3047 +if ${ac_cv_prog_CC+:} false; then :
  3048    $as_echo_n "(cached) " >&6
  3049  else
  3050    if test -n "$CC"; then
  3051    ac_cv_prog_CC="$CC" # Let the user override the test.
  3052  else
  3053  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  3054  for as_dir in $PATH
  3055  do
  3056 @@ -3095,17 +3111,17 @@
  3057  if test -z "$CC"; then
  3058    ac_ct_CC=$CC
  3059    for ac_prog in cl.exe
  3060  do
  3061    # Extract the first word of "$ac_prog", so it can be a program name with args.
  3062  set dummy $ac_prog; ac_word=$2
  3063  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  3064  $as_echo_n "checking for $ac_word... " >&6; }
  3065 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
  3066 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
  3067    $as_echo_n "(cached) " >&6
  3068  else
  3069    if test -n "$ac_ct_CC"; then
  3070    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
  3071  else
  3072  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  3073  for as_dir in $PATH
  3074  do
  3075 @@ -3149,18 +3165,18 @@
  3076    fi
  3077  fi
  3079  fi
  3082  test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  3083  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  3084 -as_fn_error "no acceptable C compiler found in \$PATH
  3085 -See \`config.log' for more details." "$LINENO" 5; }
  3086 +as_fn_error $? "no acceptable C compiler found in \$PATH
  3087 +See \`config.log' for more details" "$LINENO" 5; }
  3089  # Provide some information about the compiler.
  3090  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
  3091  set X $ac_compile
  3092  ac_compiler=$2
  3093  for ac_option in --version -v -V -qversion; do
  3094    { { ac_try="$ac_compiler $ac_option >&5"
  3095  case "(($ac_try" in
  3096 @@ -3264,19 +3280,18 @@
  3097  if test -z "$ac_file"; then :
  3098    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  3099  $as_echo "no" >&6; }
  3100  $as_echo "$as_me: failed program was:" >&5
  3101  sed 's/^/| /' conftest.$ac_ext >&5
  3103  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  3104  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  3105 -{ as_fn_set_status 77
  3106 -as_fn_error "C compiler cannot create executables
  3107 -See \`config.log' for more details." "$LINENO" 5; }; }
  3108 +as_fn_error 77 "C compiler cannot create executables
  3109 +See \`config.log' for more details" "$LINENO" 5; }
  3110  else
  3111    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  3112  $as_echo "yes" >&6; }
  3113  fi
  3114  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
  3115  $as_echo_n "checking for C compiler default output file name... " >&6; }
  3116  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
  3117  $as_echo "$ac_file" >&6; }
  3118 @@ -3308,18 +3323,18 @@
  3119      *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  3120  	  break;;
  3121      * ) break;;
  3122    esac
  3123  done
  3124  else
  3125    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  3126  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  3127 -as_fn_error "cannot compute suffix of executables: cannot compile and link
  3128 -See \`config.log' for more details." "$LINENO" 5; }
  3129 +as_fn_error $? "cannot compute suffix of executables: cannot compile and link
  3130 +See \`config.log' for more details" "$LINENO" 5; }
  3131  fi
  3132  rm -f conftest conftest$ac_cv_exeext
  3133  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
  3134  $as_echo "$ac_cv_exeext" >&6; }
  3136  rm -f conftest.$ac_ext
  3137  EXEEXT=$ac_cv_exeext
  3138  ac_exeext=$EXEEXT
  3139 @@ -3366,30 +3381,30 @@
  3140    test $ac_status = 0; }; }; then
  3141      cross_compiling=no
  3142    else
  3143      if test "$cross_compiling" = maybe; then
  3144  	cross_compiling=yes
  3145      else
  3146  	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  3147  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  3148 -as_fn_error "cannot run C compiled programs.
  3149 +as_fn_error $? "cannot run C compiled programs.
  3150  If you meant to cross compile, use \`--host'.
  3151 -See \`config.log' for more details." "$LINENO" 5; }
  3152 +See \`config.log' for more details" "$LINENO" 5; }
  3153      fi
  3154    fi
  3155  fi
  3156  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
  3157  $as_echo "$cross_compiling" >&6; }
  3159  rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
  3160  ac_clean_files=$ac_clean_files_save
  3161  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
  3162  $as_echo_n "checking for suffix of object files... " >&6; }
  3163 -if test "${ac_cv_objext+set}" = set; then :
  3164 +if ${ac_cv_objext+:} false; then :
  3165    $as_echo_n "(cached) " >&6
  3166  else
  3167    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  3168  /* end confdefs.h.  */
  3170  int
  3171  main ()
  3173 @@ -3419,28 +3434,28 @@
  3174    esac
  3175  done
  3176  else
  3177    $as_echo "$as_me: failed program was:" >&5
  3178  sed 's/^/| /' conftest.$ac_ext >&5
  3180  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  3181  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  3182 -as_fn_error "cannot compute suffix of object files: cannot compile
  3183 -See \`config.log' for more details." "$LINENO" 5; }
  3184 +as_fn_error $? "cannot compute suffix of object files: cannot compile
  3185 +See \`config.log' for more details" "$LINENO" 5; }
  3186  fi
  3187  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  3188  fi
  3189  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
  3190  $as_echo "$ac_cv_objext" >&6; }
  3191  OBJEXT=$ac_cv_objext
  3192  ac_objext=$OBJEXT
  3193  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
  3194  $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
  3195 -if test "${ac_cv_c_compiler_gnu+set}" = set; then :
  3196 +if ${ac_cv_c_compiler_gnu+:} false; then :
  3197    $as_echo_n "(cached) " >&6
  3198  else
  3199    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  3200  /* end confdefs.h.  */
  3202  int
  3203  main ()
  3205 @@ -3467,17 +3482,17 @@
  3206    GCC=yes
  3207  else
  3208    GCC=
  3209  fi
  3210  ac_test_CFLAGS=${CFLAGS+set}
  3211  ac_save_CFLAGS=$CFLAGS
  3212  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
  3213  $as_echo_n "checking whether $CC accepts -g... " >&6; }
  3214 -if test "${ac_cv_prog_cc_g+set}" = set; then :
  3215 +if ${ac_cv_prog_cc_g+:} false; then :
  3216    $as_echo_n "(cached) " >&6
  3217  else
  3218    ac_save_c_werror_flag=$ac_c_werror_flag
  3219     ac_c_werror_flag=yes
  3220     ac_cv_prog_cc_g=no
  3221     CFLAGS="-g"
  3222     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  3223  /* end confdefs.h.  */
  3224 @@ -3545,17 +3560,17 @@
  3225    if test "$GCC" = yes; then
  3226      CFLAGS="-O2"
  3227    else
  3228      CFLAGS=
  3229    fi
  3230  fi
  3231  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
  3232  $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
  3233 -if test "${ac_cv_prog_cc_c89+set}" = set; then :
  3234 +if ${ac_cv_prog_cc_c89+:} false; then :
  3235    $as_echo_n "(cached) " >&6
  3236  else
  3237    ac_cv_prog_cc_c89=no
  3238  ac_save_CC=$CC
  3239  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  3240  /* end confdefs.h.  */
  3241  #include <stdarg.h>
  3242  #include <stdio.h>
  3243 @@ -3644,25 +3659,26 @@
  3244  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  3245  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  3246  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  3248  depcc="$CC"   am_compiler_list=
  3250  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
  3251  $as_echo_n "checking dependency style of $depcc... " >&6; }
  3252 -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
  3253 +if ${am_cv_CC_dependencies_compiler_type+:} false; then :
  3254    $as_echo_n "(cached) " >&6
  3255  else
  3256    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
  3257    # We make a subdir and do the tests there.  Otherwise we can end up
  3258    # making bogus files that we don't know about and never remove.  For
  3259    # instance it was reported that on HP-UX the gcc test will end up
  3260    # making a dummy file named `D' -- because `-MD' means `put the output
  3261    # in D'.
  3262 +  rm -rf conftest.dir
  3263    mkdir conftest.dir
  3264    # Copy depcomp to subdir because otherwise we won't find it if we're
  3265    # using a relative directory.
  3266    cp "$am_depcomp" conftest.dir
  3267    cd conftest.dir
  3268    # We will build objects and dependencies in a subdirectory because
  3269    # it helps to detect inapplicable dependency modes.  For instance
  3270    # both Tru64's cc and ICC support -MD to output dependencies as a
  3271 @@ -3712,17 +3728,17 @@
  3272        # after this tag, mechanisms are not by side-effect, so they'll
  3273        # only be used when explicitly requested
  3274        if test "x$enable_dependency_tracking" = xyes; then
  3275  	continue
  3276        else
  3277  	break
  3278        fi
  3279        ;;
  3280 -    msvisualcpp | msvcmsys)
  3281 +    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
  3282        # This compiler won't grok `-c -o', but also, the minuso test has
  3283        # not run yet.  These depmodes are late enough in the game, and
  3284        # so weak that their functioning should not be impacted.
  3285        am__obj=conftest.${OBJEXT-o}
  3286        am__minus_obj=
  3287        ;;
  3288      none) break ;;
  3289      esac
  3290 @@ -3778,25 +3794,26 @@
  3291  test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
  3295  depcc="$CCAS"   am_compiler_list=
  3297  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
  3298  $as_echo_n "checking dependency style of $depcc... " >&6; }
  3299 -if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then :
  3300 +if ${am_cv_CCAS_dependencies_compiler_type+:} false; then :
  3301    $as_echo_n "(cached) " >&6
  3302  else
  3303    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
  3304    # We make a subdir and do the tests there.  Otherwise we can end up
  3305    # making bogus files that we don't know about and never remove.  For
  3306    # instance it was reported that on HP-UX the gcc test will end up
  3307    # making a dummy file named `D' -- because `-MD' means `put the output
  3308    # in D'.
  3309 +  rm -rf conftest.dir
  3310    mkdir conftest.dir
  3311    # Copy depcomp to subdir because otherwise we won't find it if we're
  3312    # using a relative directory.
  3313    cp "$am_depcomp" conftest.dir
  3314    cd conftest.dir
  3315    # We will build objects and dependencies in a subdirectory because
  3316    # it helps to detect inapplicable dependency modes.  For instance
  3317    # both Tru64's cc and ICC support -MD to output dependencies as a
  3318 @@ -3844,17 +3861,17 @@
  3319        # after this tag, mechanisms are not by side-effect, so they'll
  3320        # only be used when explicitly requested
  3321        if test "x$enable_dependency_tracking" = xyes; then
  3322  	continue
  3323        else
  3324  	break
  3325        fi
  3326        ;;
  3327 -    msvisualcpp | msvcmsys)
  3328 +    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
  3329        # This compiler won't grok `-c -o', but also, the minuso test has
  3330        # not run yet.  These depmodes are late enough in the game, and
  3331        # so weak that their functioning should not be impacted.
  3332        am__obj=conftest.${OBJEXT-o}
  3333        am__minus_obj=
  3334        ;;
  3335      none) break ;;
  3336      esac
  3337 @@ -3909,17 +3926,17 @@
  3338  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  3339  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  3340  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  3341  if test -n "$ac_tool_prefix"; then
  3342    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  3343  set dummy ${ac_tool_prefix}gcc; ac_word=$2
  3344  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  3345  $as_echo_n "checking for $ac_word... " >&6; }
  3346 -if test "${ac_cv_prog_CC+set}" = set; then :
  3347 +if ${ac_cv_prog_CC+:} false; then :
  3348    $as_echo_n "(cached) " >&6
  3349  else
  3350    if test -n "$CC"; then
  3351    ac_cv_prog_CC="$CC" # Let the user override the test.
  3352  else
  3353  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  3354  for as_dir in $PATH
  3355  do
  3356 @@ -3949,17 +3966,17 @@
  3358  fi
  3359  if test -z "$ac_cv_prog_CC"; then
  3360    ac_ct_CC=$CC
  3361    # Extract the first word of "gcc", so it can be a program name with args.
  3362  set dummy gcc; ac_word=$2
  3363  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  3364  $as_echo_n "checking for $ac_word... " >&6; }
  3365 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
  3366 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
  3367    $as_echo_n "(cached) " >&6
  3368  else
  3369    if test -n "$ac_ct_CC"; then
  3370    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
  3371  else
  3372  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  3373  for as_dir in $PATH
  3374  do
  3375 @@ -4002,17 +4019,17 @@
  3376  fi
  3378  if test -z "$CC"; then
  3379            if test -n "$ac_tool_prefix"; then
  3380      # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  3381  set dummy ${ac_tool_prefix}cc; ac_word=$2
  3382  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  3383  $as_echo_n "checking for $ac_word... " >&6; }
  3384 -if test "${ac_cv_prog_CC+set}" = set; then :
  3385 +if ${ac_cv_prog_CC+:} false; then :
  3386    $as_echo_n "(cached) " >&6
  3387  else
  3388    if test -n "$CC"; then
  3389    ac_cv_prog_CC="$CC" # Let the user override the test.
  3390  else
  3391  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  3392  for as_dir in $PATH
  3393  do
  3394 @@ -4042,17 +4059,17 @@
  3396    fi
  3397  fi
  3398  if test -z "$CC"; then
  3399    # Extract the first word of "cc", so it can be a program name with args.
  3400  set dummy cc; ac_word=$2
  3401  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  3402  $as_echo_n "checking for $ac_word... " >&6; }
  3403 -if test "${ac_cv_prog_CC+set}" = set; then :
  3404 +if ${ac_cv_prog_CC+:} false; then :
  3405    $as_echo_n "(cached) " >&6
  3406  else
  3407    if test -n "$CC"; then
  3408    ac_cv_prog_CC="$CC" # Let the user override the test.
  3409  else
  3410    ac_prog_rejected=no
  3411  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  3412  for as_dir in $PATH
  3413 @@ -4101,17 +4118,17 @@
  3414  if test -z "$CC"; then
  3415    if test -n "$ac_tool_prefix"; then
  3416    for ac_prog in cl.exe
  3417    do
  3418      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  3419  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  3420  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  3421  $as_echo_n "checking for $ac_word... " >&6; }
  3422 -if test "${ac_cv_prog_CC+set}" = set; then :
  3423 +if ${ac_cv_prog_CC+:} false; then :
  3424    $as_echo_n "(cached) " >&6
  3425  else
  3426    if test -n "$CC"; then
  3427    ac_cv_prog_CC="$CC" # Let the user override the test.
  3428  else
  3429  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  3430  for as_dir in $PATH
  3431  do
  3432 @@ -4145,17 +4162,17 @@
  3433  if test -z "$CC"; then
  3434    ac_ct_CC=$CC
  3435    for ac_prog in cl.exe
  3436  do
  3437    # Extract the first word of "$ac_prog", so it can be a program name with args.
  3438  set dummy $ac_prog; ac_word=$2
  3439  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  3440  $as_echo_n "checking for $ac_word... " >&6; }
  3441 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
  3442 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
  3443    $as_echo_n "(cached) " >&6
  3444  else
  3445    if test -n "$ac_ct_CC"; then
  3446    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
  3447  else
  3448  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  3449  for as_dir in $PATH
  3450  do
  3451 @@ -4199,18 +4216,18 @@
  3452    fi
  3453  fi
  3455  fi
  3458  test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  3459  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  3460 -as_fn_error "no acceptable C compiler found in \$PATH
  3461 -See \`config.log' for more details." "$LINENO" 5; }
  3462 +as_fn_error $? "no acceptable C compiler found in \$PATH
  3463 +See \`config.log' for more details" "$LINENO" 5; }
  3465  # Provide some information about the compiler.
  3466  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
  3467  set X $ac_compile
  3468  ac_compiler=$2
  3469  for ac_option in --version -v -V -qversion; do
  3470    { { ac_try="$ac_compiler $ac_option >&5"
  3471  case "(($ac_try" in
  3472 @@ -4229,17 +4246,17 @@
  3473    fi
  3474    rm -f conftest.er1 conftest.err
  3475    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  3476    test $ac_status = 0; }
  3477  done
  3479  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
  3480  $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
  3481 -if test "${ac_cv_c_compiler_gnu+set}" = set; then :
  3482 +if ${ac_cv_c_compiler_gnu+:} false; then :
  3483    $as_echo_n "(cached) " >&6
  3484  else
  3485    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  3486  /* end confdefs.h.  */
  3488  int
  3489  main ()
  3491 @@ -4266,17 +4283,17 @@
  3492    GCC=yes
  3493  else
  3494    GCC=
  3495  fi
  3496  ac_test_CFLAGS=${CFLAGS+set}
  3497  ac_save_CFLAGS=$CFLAGS
  3498  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
  3499  $as_echo_n "checking whether $CC accepts -g... " >&6; }
  3500 -if test "${ac_cv_prog_cc_g+set}" = set; then :
  3501 +if ${ac_cv_prog_cc_g+:} false; then :
  3502    $as_echo_n "(cached) " >&6
  3503  else
  3504    ac_save_c_werror_flag=$ac_c_werror_flag
  3505     ac_c_werror_flag=yes
  3506     ac_cv_prog_cc_g=no
  3507     CFLAGS="-g"
  3508     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  3509  /* end confdefs.h.  */
  3510 @@ -4344,17 +4361,17 @@
  3511    if test "$GCC" = yes; then
  3512      CFLAGS="-O2"
  3513    else
  3514      CFLAGS=
  3515    fi
  3516  fi
  3517  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
  3518  $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
  3519 -if test "${ac_cv_prog_cc_c89+set}" = set; then :
  3520 +if ${ac_cv_prog_cc_c89+:} false; then :
  3521    $as_echo_n "(cached) " >&6
  3522  else
  3523    ac_cv_prog_cc_c89=no
  3524  ac_save_CC=$CC
  3525  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  3526  /* end confdefs.h.  */
  3527  #include <stdarg.h>
  3528  #include <stdio.h>
  3529 @@ -4443,25 +4460,26 @@
  3530  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  3531  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  3532  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  3534  depcc="$CC"   am_compiler_list=
  3536  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
  3537  $as_echo_n "checking dependency style of $depcc... " >&6; }
  3538 -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
  3539 +if ${am_cv_CC_dependencies_compiler_type+:} false; then :
  3540    $as_echo_n "(cached) " >&6
  3541  else
  3542    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
  3543    # We make a subdir and do the tests there.  Otherwise we can end up
  3544    # making bogus files that we don't know about and never remove.  For
  3545    # instance it was reported that on HP-UX the gcc test will end up
  3546    # making a dummy file named `D' -- because `-MD' means `put the output
  3547    # in D'.
  3548 +  rm -rf conftest.dir
  3549    mkdir conftest.dir
  3550    # Copy depcomp to subdir because otherwise we won't find it if we're
  3551    # using a relative directory.
  3552    cp "$am_depcomp" conftest.dir
  3553    cd conftest.dir
  3554    # We will build objects and dependencies in a subdirectory because
  3555    # it helps to detect inapplicable dependency modes.  For instance
  3556    # both Tru64's cc and ICC support -MD to output dependencies as a
  3557 @@ -4511,17 +4529,17 @@
  3558        # after this tag, mechanisms are not by side-effect, so they'll
  3559        # only be used when explicitly requested
  3560        if test "x$enable_dependency_tracking" = xyes; then
  3561  	continue
  3562        else
  3563  	break
  3564        fi
  3565        ;;
  3566 -    msvisualcpp | msvcmsys)
  3567 +    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
  3568        # This compiler won't grok `-c -o', but also, the minuso test has
  3569        # not run yet.  These depmodes are late enough in the game, and
  3570        # so weak that their functioning should not be impacted.
  3571        am__obj=conftest.${OBJEXT-o}
  3572        am__minus_obj=
  3573        ;;
  3574      none) break ;;
  3575      esac
  3576 @@ -4575,17 +4593,17 @@
  3577    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
  3578  $as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
  3579  else
  3580    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
  3581  $as_echo_n "checking whether cc understands -c and -o together... " >&6; }
  3582  fi
  3583  set dummy $CC; ac_cc=`$as_echo "$2" |
  3584  		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
  3585 -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
  3586 +if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
  3587    $as_echo_n "(cached) " >&6
  3588  else
  3589    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  3590  /* end confdefs.h.  */
  3592  int
  3593  main ()
  3595 @@ -4704,17 +4722,17 @@
  3596  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  3597  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
  3598  $as_echo_n "checking how to run the C preprocessor... " >&6; }
  3599  # On Suns, sometimes $CPP names a directory.
  3600  if test -n "$CPP" && test -d "$CPP"; then
  3601    CPP=
  3602  fi
  3603  if test -z "$CPP"; then
  3604 -  if test "${ac_cv_prog_CPP+set}" = set; then :
  3605 +  if ${ac_cv_prog_CPP+:} false; then :
  3606    $as_echo_n "(cached) " >&6
  3607  else
  3608        # Double quotes because CPP needs to be expanded
  3609      for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
  3610      do
  3611        ac_preproc_ok=false
  3612  for ac_c_preproc_warn_flag in '' yes
  3613  do
  3614 @@ -4734,37 +4752,37 @@
  3615  		     Syntax error
  3616  _ACEOF
  3617  if ac_fn_c_try_cpp "$LINENO"; then :
  3619  else
  3620    # Broken: fails on valid input.
  3621  continue
  3622  fi
  3623 -rm -f conftest.err conftest.$ac_ext
  3624 +rm -f conftest.err conftest.i conftest.$ac_ext
  3626    # OK, works on sane cases.  Now check whether nonexistent headers
  3627    # can be detected and how.
  3628    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  3629  /* end confdefs.h.  */
  3630  #include <ac_nonexistent.h>
  3631  _ACEOF
  3632  if ac_fn_c_try_cpp "$LINENO"; then :
  3633    # Broken: success on invalid input.
  3634  continue
  3635  else
  3636    # Passes both tests.
  3637  ac_preproc_ok=:
  3638  break
  3639  fi
  3640 -rm -f conftest.err conftest.$ac_ext
  3641 +rm -f conftest.err conftest.i conftest.$ac_ext
  3643  done
  3644  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  3645 -rm -f conftest.err conftest.$ac_ext
  3646 +rm -f conftest.i conftest.err conftest.$ac_ext
  3647  if $ac_preproc_ok; then :
  3648    break
  3649  fi
  3651      done
  3652      ac_cv_prog_CPP=$CPP
  3654  fi
  3655 @@ -4793,44 +4811,44 @@
  3656  		     Syntax error
  3657  _ACEOF
  3658  if ac_fn_c_try_cpp "$LINENO"; then :
  3660  else
  3661    # Broken: fails on valid input.
  3662  continue
  3663  fi
  3664 -rm -f conftest.err conftest.$ac_ext
  3665 +rm -f conftest.err conftest.i conftest.$ac_ext
  3667    # OK, works on sane cases.  Now check whether nonexistent headers
  3668    # can be detected and how.
  3669    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  3670  /* end confdefs.h.  */
  3671  #include <ac_nonexistent.h>
  3672  _ACEOF
  3673  if ac_fn_c_try_cpp "$LINENO"; then :
  3674    # Broken: success on invalid input.
  3675  continue
  3676  else
  3677    # Passes both tests.
  3678  ac_preproc_ok=:
  3679  break
  3680  fi
  3681 -rm -f conftest.err conftest.$ac_ext
  3682 +rm -f conftest.err conftest.i conftest.$ac_ext
  3684  done
  3685  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  3686 -rm -f conftest.err conftest.$ac_ext
  3687 +rm -f conftest.i conftest.err conftest.$ac_ext
  3688  if $ac_preproc_ok; then :
  3690  else
  3691    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  3692  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  3693 -as_fn_error "C preprocessor \"$CPP\" fails sanity check
  3694 -See \`config.log' for more details." "$LINENO" 5; }
  3695 +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
  3696 +See \`config.log' for more details" "$LINENO" 5; }
  3697  fi
  3699  ac_ext=c
  3700  ac_cpp='$CPP $CPPFLAGS'
  3701  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  3702  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  3703  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  3705 @@ -4845,17 +4863,17 @@
  3706    else
  3707      if test -n "$ac_tool_prefix"; then
  3708    for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
  3709    do
  3710      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  3711  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  3712  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  3713  $as_echo_n "checking for $ac_word... " >&6; }
  3714 -if test "${ac_cv_prog_CXX+set}" = set; then :
  3715 +if ${ac_cv_prog_CXX+:} false; then :
  3716    $as_echo_n "(cached) " >&6
  3717  else
  3718    if test -n "$CXX"; then
  3719    ac_cv_prog_CXX="$CXX" # Let the user override the test.
  3720  else
  3721  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  3722  for as_dir in $PATH
  3723  do
  3724 @@ -4889,17 +4907,17 @@
  3725  if test -z "$CXX"; then
  3726    ac_ct_CXX=$CXX
  3727    for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
  3728  do
  3729    # Extract the first word of "$ac_prog", so it can be a program name with args.
  3730  set dummy $ac_prog; ac_word=$2
  3731  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  3732  $as_echo_n "checking for $ac_word... " >&6; }
  3733 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
  3734 +if ${ac_cv_prog_ac_ct_CXX+:} false; then :
  3735    $as_echo_n "(cached) " >&6
  3736  else
  3737    if test -n "$ac_ct_CXX"; then
  3738    ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
  3739  else
  3740  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  3741  for as_dir in $PATH
  3742  do
  3743 @@ -4967,17 +4985,17 @@
  3744    fi
  3745    rm -f conftest.er1 conftest.err
  3746    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  3747    test $ac_status = 0; }
  3748  done
  3750  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
  3751  $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
  3752 -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
  3753 +if ${ac_cv_cxx_compiler_gnu+:} false; then :
  3754    $as_echo_n "(cached) " >&6
  3755  else
  3756    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  3757  /* end confdefs.h.  */
  3759  int
  3760  main ()
  3762 @@ -5004,17 +5022,17 @@
  3763    GXX=yes
  3764  else
  3765    GXX=
  3766  fi
  3767  ac_test_CXXFLAGS=${CXXFLAGS+set}
  3768  ac_save_CXXFLAGS=$CXXFLAGS
  3769  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
  3770  $as_echo_n "checking whether $CXX accepts -g... " >&6; }
  3771 -if test "${ac_cv_prog_cxx_g+set}" = set; then :
  3772 +if ${ac_cv_prog_cxx_g+:} false; then :
  3773    $as_echo_n "(cached) " >&6
  3774  else
  3775    ac_save_cxx_werror_flag=$ac_cxx_werror_flag
  3776     ac_cxx_werror_flag=yes
  3777     ac_cv_prog_cxx_g=no
  3778     CXXFLAGS="-g"
  3779     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  3780  /* end confdefs.h.  */
  3781 @@ -5090,25 +5108,26 @@
  3782  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  3783  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  3784  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  3786  depcc="$CXX"  am_compiler_list=
  3788  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
  3789  $as_echo_n "checking dependency style of $depcc... " >&6; }
  3790 -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
  3791 +if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
  3792    $as_echo_n "(cached) " >&6
  3793  else
  3794    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
  3795    # We make a subdir and do the tests there.  Otherwise we can end up
  3796    # making bogus files that we don't know about and never remove.  For
  3797    # instance it was reported that on HP-UX the gcc test will end up
  3798    # making a dummy file named `D' -- because `-MD' means `put the output
  3799    # in D'.
  3800 +  rm -rf conftest.dir
  3801    mkdir conftest.dir
  3802    # Copy depcomp to subdir because otherwise we won't find it if we're
  3803    # using a relative directory.
  3804    cp "$am_depcomp" conftest.dir
  3805    cd conftest.dir
  3806    # We will build objects and dependencies in a subdirectory because
  3807    # it helps to detect inapplicable dependency modes.  For instance
  3808    # both Tru64's cc and ICC support -MD to output dependencies as a
  3809 @@ -5158,17 +5177,17 @@
  3810        # after this tag, mechanisms are not by side-effect, so they'll
  3811        # only be used when explicitly requested
  3812        if test "x$enable_dependency_tracking" = xyes; then
  3813  	continue
  3814        else
  3815  	break
  3816        fi
  3817        ;;
  3818 -    msvisualcpp | msvcmsys)
  3819 +    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
  3820        # This compiler won't grok `-c -o', but also, the minuso test has
  3821        # not run yet.  These depmodes are late enough in the game, and
  3822        # so weak that their functioning should not be impacted.
  3823        am__obj=conftest.${OBJEXT-o}
  3824        am__minus_obj=
  3825        ;;
  3826      none) break ;;
  3827      esac
  3828 @@ -5218,17 +5237,17 @@
  3829  fi
  3832  if test -n "$ac_tool_prefix"; then
  3833    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  3834  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
  3835  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  3836  $as_echo_n "checking for $ac_word... " >&6; }
  3837 -if test "${ac_cv_prog_RANLIB+set}" = set; then :
  3838 +if ${ac_cv_prog_RANLIB+:} false; then :
  3839    $as_echo_n "(cached) " >&6
  3840  else
  3841    if test -n "$RANLIB"; then
  3842    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
  3843  else
  3844  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  3845  for as_dir in $PATH
  3846  do
  3847 @@ -5258,17 +5277,17 @@
  3849  fi
  3850  if test -z "$ac_cv_prog_RANLIB"; then
  3851    ac_ct_RANLIB=$RANLIB
  3852    # Extract the first word of "ranlib", so it can be a program name with args.
  3853  set dummy ranlib; ac_word=$2
  3854  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  3855  $as_echo_n "checking for $ac_word... " >&6; }
  3856 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
  3857 +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
  3858    $as_echo_n "(cached) " >&6
  3859  else
  3860    if test -n "$ac_ct_RANLIB"; then
  3861    ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
  3862  else
  3863  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  3864  for as_dir in $PATH
  3865  do
  3866 @@ -5318,17 +5337,17 @@
  3867    GCC_FALSE=
  3868  fi
  3869     # let the Makefile know if we're gcc
  3873  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
  3874  $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
  3875 -if test "${ac_cv_path_GREP+set}" = set; then :
  3876 +if ${ac_cv_path_GREP+:} false; then :
  3877    $as_echo_n "(cached) " >&6
  3878  else
  3879    if test -z "$GREP"; then
  3880    ac_path_GREP_found=false
  3881    # Loop through the user's path and test for each of PROGNAME-LIST
  3882    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  3883  for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  3884  do
  3885 @@ -5367,31 +5386,31 @@
  3886  esac
  3888        $ac_path_GREP_found && break 3
  3889      done
  3890    done
  3891    done
  3892  IFS=$as_save_IFS
  3893    if test -z "$ac_cv_path_GREP"; then
  3894 -    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  3895 +    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  3896    fi
  3897  else
  3898    ac_cv_path_GREP=$GREP
  3899  fi
  3901  fi
  3902  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
  3903  $as_echo "$ac_cv_path_GREP" >&6; }
  3904   GREP="$ac_cv_path_GREP"
  3907  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
  3908  $as_echo_n "checking for egrep... " >&6; }
  3909 -if test "${ac_cv_path_EGREP+set}" = set; then :
  3910 +if ${ac_cv_path_EGREP+:} false; then :
  3911    $as_echo_n "(cached) " >&6
  3912  else
  3913    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
  3914     then ac_cv_path_EGREP="$GREP -E"
  3915     else
  3916       if test -z "$EGREP"; then
  3917    ac_path_EGREP_found=false
  3918    # Loop through the user's path and test for each of PROGNAME-LIST
  3919 @@ -5433,32 +5452,32 @@
  3920  esac
  3922        $ac_path_EGREP_found && break 3
  3923      done
  3924    done
  3925    done
  3926  IFS=$as_save_IFS
  3927    if test -z "$ac_cv_path_EGREP"; then
  3928 -    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  3929 +    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  3930    fi
  3931  else
  3932    ac_cv_path_EGREP=$EGREP
  3933  fi
  3935     fi
  3936  fi
  3937  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
  3938  $as_echo "$ac_cv_path_EGREP" >&6; }
  3939   EGREP="$ac_cv_path_EGREP"
  3942  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
  3943  $as_echo_n "checking for ANSI C header files... " >&6; }
  3944 -if test "${ac_cv_header_stdc+set}" = set; then :
  3945 +if ${ac_cv_header_stdc+:} false; then :
  3946    $as_echo_n "(cached) " >&6
  3947  else
  3948    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  3949  /* end confdefs.h.  */
  3950  #include <stdlib.h>
  3951  #include <stdarg.h>
  3952  #include <string.h>
  3953  #include <float.h>
  3954 @@ -5785,17 +5804,17 @@
  3955                  PTHREAD_CFLAGS="$flag"
  3956                  ;;
  3958  		pthread-config)
  3959  		# Extract the first word of "pthread-config", so it can be a program name with args.
  3960  set dummy pthread-config; ac_word=$2
  3961  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  3962  $as_echo_n "checking for $ac_word... " >&6; }
  3963 -if test "${ac_cv_prog_ax_pthread_config+set}" = set; then :
  3964 +if ${ac_cv_prog_ax_pthread_config+:} false; then :
  3965    $as_echo_n "(cached) " >&6
  3966  else
  3967    if test -n "$ax_pthread_config"; then
  3968    ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test.
  3969  else
  3970  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  3971  for as_dir in $PATH
  3972  do
  3973 @@ -5946,17 +5965,17 @@
  3974          # More AIX lossage: must compile with xlc_r or cc_r
  3975  	if test x"$GCC" != xyes; then
  3976            for ac_prog in xlc_r cc_r
  3977  do
  3978    # Extract the first word of "$ac_prog", so it can be a program name with args.
  3979  set dummy $ac_prog; ac_word=$2
  3980  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  3981  $as_echo_n "checking for $ac_word... " >&6; }
  3982 -if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then :
  3983 +if ${ac_cv_prog_PTHREAD_CC+:} false; then :
  3984    $as_echo_n "(cached) " >&6
  3985  else
  3986    if test -n "$PTHREAD_CC"; then
  3987    ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.
  3988  else
  3989  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  3990  for as_dir in $PATH
  3991  do
  3992 @@ -6018,31 +6037,30 @@
  3994  # On IRIX 5.3, sys/types and inttypes.h are conflicting.
  3995  for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
  3996  		  inttypes.h stdint.h unistd.h
  3997  do :
  3998    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  3999  ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
  4001 -eval as_val=\$$as_ac_Header
  4002 -   if test "x$as_val" = x""yes; then :
  4003 +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
  4004    cat >>confdefs.h <<_ACEOF
  4005  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  4006  _ACEOF
  4008  fi
  4010  done
  4013  for ac_header in a.out.h
  4014  do :
  4015    ac_fn_c_check_header_mongrel "$LINENO" "a.out.h" "ac_cv_header_a_out_h" "$ac_includes_default"
  4016 -if test "x$ac_cv_header_a_out_h" = x""yes; then :
  4017 +if test "x$ac_cv_header_a_out_h" = xyes; then :
  4018    cat >>confdefs.h <<_ACEOF
  4019  #define HAVE_A_OUT_H 1
  4020  _ACEOF
  4022  fi
  4024  done
  4026 @@ -6084,17 +6102,17 @@
  4027                     CFLAGS="${CFLAGS} -m32"
  4028                     CXXFLAGS="${CXXFLAGS} -m32"
  4029                     usem32=true
  4030                     ;;
  4031                   no)
  4032                     usem32=false
  4033                     ;;
  4034                   *)
  4035 -                   as_fn_error "bad value ${enableval} for --enable-m32" "$LINENO" 5
  4036 +                   as_fn_error $? "bad value ${enableval} for --enable-m32" "$LINENO" 5
  4037                     ;;
  4038                 esac
  4039  else
  4040    usem32=false
  4041  fi
  4044  # Check whether --enable-processor was given.
  4045 @@ -6102,17 +6120,17 @@
  4046    enableval=$enable_processor; case "${enableval}" in
  4047                   yes)
  4048                     disable_processor=false
  4049                     ;;
  4050                   no)
  4051                     disable_processor=true
  4052                     ;;
  4053                   *)
  4054 -                   as_fn_error "bad value ${enableval} for --disable-processor" "$LINENO" 5
  4055 +                   as_fn_error $? "bad value ${enableval} for --disable-processor" "$LINENO" 5
  4056                     ;;
  4057                 esac
  4058  else
  4059    disable_processor=false
  4060  fi
  4062   if test x$disable_processor = xtrue; then
  4063    DISABLE_PROCESSOR_TRUE=
  4064 @@ -6128,47 +6146,47 @@
  4065    enableval=$enable_tools; case "${enableval}" in
  4066                   yes)
  4067                     disable_tools=false
  4068                     ;;
  4069                   no)
  4070                     disable_tools=true
  4071                     ;;
  4072                   *)
  4073 -                   as_fn_error "bad value ${enableval} for --disable-tools" "$LINENO" 5
  4074 +                   as_fn_error $? "bad value ${enableval} for --disable-tools" "$LINENO" 5
  4075                     ;;
  4076                 esac
  4077  else
  4078    disable_tools=false
  4079  fi
  4081   if test x$disable_tools = xtrue; then
  4082    DISABLE_TOOLS_TRUE=
  4083    DISABLE_TOOLS_FALSE='#'
  4084  else
  4085    DISABLE_TOOLS_TRUE='#'
  4086    DISABLE_TOOLS_FALSE=
  4087  fi
  4090  if test x$LINUX_HOST = xfalse -a x$disable_processor = xtrue -a x$disable_tools = xtrue; then
  4091 -   as_fn_error "--disable-processor and --disable-tools were specified, and not building for Linux. Nothing to build!" "$LINENO" 5
  4092 +   as_fn_error $? "--disable-processor and --disable-tools were specified, and not building for Linux. Nothing to build!" "$LINENO" 5
  4093  fi
  4095  # Check whether --enable-selftest was given.
  4096  if test "${enable_selftest+set}" = set; then :
  4097    enableval=$enable_selftest; case "${enableval}" in
  4098                   yes)
  4099                     selftest=true
  4100                     ;;
  4101                   no)
  4102                     selftest=false
  4103                     ;;
  4104                   *)
  4105 -                   as_fn_error "bad value ${enableval} for --enable-selftest" "$LINENO" 5
  4106 +                   as_fn_error $? "bad value ${enableval} for --enable-selftest" "$LINENO" 5
  4107                     ;;
  4108                 esac
  4109  else
  4110    selftest=false
  4111  fi
  4113   if test x$selftest = xtrue; then
  4114    SELFTEST_TRUE=
  4115 @@ -6240,35 +6258,47 @@
  4116       t clear
  4117       :clear
  4118       s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
  4119       t end
  4120       s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
  4121       :end' >>confcache
  4122  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
  4123    if test -w "$cache_file"; then
  4124 -    test "x$cache_file" != "x/dev/null" &&
  4125 +    if test "x$cache_file" != "x/dev/null"; then
  4126        { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
  4127  $as_echo "$as_me: updating cache $cache_file" >&6;}
  4128 -    cat confcache >$cache_file
  4129 +      if test ! -f "$cache_file" || test -h "$cache_file"; then
  4130 +	cat confcache >"$cache_file"
  4131 +      else
  4132 +        case $cache_file in #(
  4133 +        */* | ?:*)
  4134 +	  mv -f confcache "$cache_file"$$ &&
  4135 +	  mv -f "$cache_file"$$ "$cache_file" ;; #(
  4136 +        *)
  4137 +	  mv -f confcache "$cache_file" ;;
  4138 +	esac
  4139 +      fi
  4140 +    fi
  4141    else
  4142      { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
  4143  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
  4144    fi
  4145  fi
  4146  rm -f confcache
  4148  test "x$prefix" = xNONE && prefix=$ac_default_prefix
  4149  # Let make expand exec_prefix.
  4150  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  4152  DEFS=-DHAVE_CONFIG_H
  4154  ac_libobjs=
  4155  ac_ltlibobjs=
  4156 +U=
  4157  for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
  4158    # 1. Remove the extension, and $U if already installed.
  4159    ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
  4160    ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
  4161    # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
  4162    #    will be set to the directory where LIBOBJS objects are built.
  4163    as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
  4164    as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
  4165 @@ -6282,61 +6312,61 @@
  4166    am__EXEEXT_TRUE=
  4167    am__EXEEXT_FALSE='#'
  4168  else
  4169    am__EXEEXT_TRUE='#'
  4170    am__EXEEXT_FALSE=
  4171  fi
  4173  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
  4174 -  as_fn_error "conditional \"AMDEP\" was never defined.
  4175 +  as_fn_error $? "conditional \"AMDEP\" was never defined.
  4176  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  4177  fi
  4178  if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
  4179 -  as_fn_error "conditional \"am__fastdepCC\" was never defined.
  4180 +  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
  4181  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  4182  fi
  4183  if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
  4184 -  as_fn_error "conditional \"am__fastdepCCAS\" was never defined.
  4185 +  as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
  4186  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  4187  fi
  4188  if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
  4189 -  as_fn_error "conditional \"am__fastdepCC\" was never defined.
  4190 +  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
  4191  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  4192  fi
  4193  if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
  4194 -  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
  4195 +  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
  4196  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  4197  fi
  4198  if test -z "${GCC_TRUE}" && test -z "${GCC_FALSE}"; then
  4199 -  as_fn_error "conditional \"GCC\" was never defined.
  4200 +  as_fn_error $? "conditional \"GCC\" was never defined.
  4201  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  4202  fi
  4203  if test -z "${LINUX_HOST_TRUE}" && test -z "${LINUX_HOST_FALSE}"; then
  4204 -  as_fn_error "conditional \"LINUX_HOST\" was never defined.
  4205 +  as_fn_error $? "conditional \"LINUX_HOST\" was never defined.
  4206  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  4207  fi
  4208  if test -z "${ANDROID_HOST_TRUE}" && test -z "${ANDROID_HOST_FALSE}"; then
  4209 -  as_fn_error "conditional \"ANDROID_HOST\" was never defined.
  4210 +  as_fn_error $? "conditional \"ANDROID_HOST\" was never defined.
  4211  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  4212  fi
  4213  if test -z "${DISABLE_PROCESSOR_TRUE}" && test -z "${DISABLE_PROCESSOR_FALSE}"; then
  4214 -  as_fn_error "conditional \"DISABLE_PROCESSOR\" was never defined.
  4215 +  as_fn_error $? "conditional \"DISABLE_PROCESSOR\" was never defined.
  4216  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  4217  fi
  4218  if test -z "${DISABLE_TOOLS_TRUE}" && test -z "${DISABLE_TOOLS_FALSE}"; then
  4219 -  as_fn_error "conditional \"DISABLE_TOOLS\" was never defined.
  4220 +  as_fn_error $? "conditional \"DISABLE_TOOLS\" was never defined.
  4221  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  4222  fi
  4223  if test -z "${SELFTEST_TRUE}" && test -z "${SELFTEST_FALSE}"; then
  4224 -  as_fn_error "conditional \"SELFTEST\" was never defined.
  4225 +  as_fn_error $? "conditional \"SELFTEST\" was never defined.
  4226  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  4227  fi
  4229 -: ${CONFIG_STATUS=./config.status}
  4230 +: "${CONFIG_STATUS=./config.status}"
  4231  ac_write_fail=0
  4232  ac_clean_files_save=$ac_clean_files
  4233  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
  4234  { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
  4235  $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
  4236  as_write_fail=0
  4237  cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
  4238  #! $SHELL
  4239 @@ -6427,16 +6457,17 @@
  4240  # IFS
  4241  # We need space, tab and new line, in precisely that order.  Quoting is
  4242  # there to prevent editors from complaining about space-tab.
  4243  # (If _AS_PATH_WALK were called with IFS unset, it would disable word
  4244  # splitting by setting IFS to empty value.)
  4245  IFS=" ""	$as_nl"
  4247  # Find who we are.  Look in the path if we contain no directory separator.
  4248 +as_myself=
  4249  case $0 in #((
  4250    *[\\/]* ) as_myself=$0 ;;
  4251    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4252  for as_dir in $PATH
  4253  do
  4254    IFS=$as_save_IFS
  4255    test -z "$as_dir" && as_dir=.
  4256      test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
  4257 @@ -6472,29 +6503,29 @@
  4258  export LC_ALL
  4259  LANGUAGE=C
  4260  export LANGUAGE
  4262  # CDPATH.
  4263  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  4266 -# as_fn_error ERROR [LINENO LOG_FD]
  4267 -# ---------------------------------
  4268 +# as_fn_error STATUS ERROR [LINENO LOG_FD]
  4269 +# ----------------------------------------
  4270  # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
  4271  # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
  4272 -# script with status $?, using 1 if that was 0.
  4273 +# script with STATUS, using 1 if that was 0.
  4274  as_fn_error ()
  4276 -  as_status=$?; test $as_status -eq 0 && as_status=1
  4277 -  if test "$3"; then
  4278 -    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  4279 -    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
  4280 +  as_status=$1; test $as_status -eq 0 && as_status=1
  4281 +  if test "$4"; then
  4282 +    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  4283 +    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
  4284    fi
  4285 -  $as_echo "$as_me: error: $1" >&2
  4286 +  $as_echo "$as_me: error: $2" >&2
  4287    as_fn_exit $as_status
  4288  } # as_fn_error
  4291  # as_fn_set_status STATUS
  4292  # -----------------------
  4293  # Set $? to STATUS, without forking.
  4294  as_fn_set_status ()
  4295 @@ -6680,17 +6711,17 @@
  4296  	  /^X\(\/\).*/{
  4297  	    s//\1/
  4300  	  s/.*/./; q'`
  4301        test -d "$as_dir" && break
  4302      done
  4303      test -z "$as_dirs" || eval "mkdir $as_dirs"
  4304 -  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
  4305 +  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
  4308  } # as_fn_mkdir_p
  4309  if mkdir -p . 2>/dev/null; then
  4310    as_mkdir_p='mkdir -p "$as_dir"'
  4311  else
  4312    test -d ./-p && rmdir ./-p
  4313    as_mkdir_p=false
  4314 @@ -6734,17 +6765,17 @@
  4315  test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
  4317  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  4318  # Save the log message, to keep $0 and so on meaningful, and to
  4319  # report actual input values of CONFIG_FILES etc. instead of their
  4320  # values after options handling.
  4321  ac_log="
  4322  This file was extended by breakpad $as_me 0.1, which was
  4323 -generated by GNU Autoconf 2.65.  Invocation command line was
  4324 +generated by GNU Autoconf 2.68.  Invocation command line was
  4326    CONFIG_FILES    = $CONFIG_FILES
  4327    CONFIG_HEADERS  = $CONFIG_HEADERS
  4328    CONFIG_LINKS    = $CONFIG_LINKS
  4329    CONFIG_COMMANDS = $CONFIG_COMMANDS
  4330    $ $0 $@
  4332  on `(hostname || uname -n) 2>/dev/null | sed 1q`
  4333 @@ -6800,20 +6831,20 @@
  4335  Report bugs to <google-breakpad-dev@googlegroups.com>."
  4337  _ACEOF
  4338  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  4339  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  4340  ac_cs_version="\\
  4341  breakpad config.status 0.1
  4342 -configured by $0, generated by GNU Autoconf 2.65,
  4343 +configured by $0, generated by GNU Autoconf 2.68,
  4344    with options \\"\$ac_cs_config\\"
  4346 -Copyright (C) 2009 Free Software Foundation, Inc.
  4347 +Copyright (C) 2010 Free Software Foundation, Inc.
  4348  This config.status script is free software; the Free Software Foundation
  4349  gives unlimited permission to copy, distribute and modify it."
  4351  ac_pwd='$ac_pwd'
  4352  srcdir='$srcdir'
  4353  INSTALL='$INSTALL'
  4354  MKDIR_P='$MKDIR_P'
  4355  AWK='$AWK'
  4356 @@ -6821,21 +6852,26 @@
  4357  _ACEOF
  4359  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  4360  # The default lists apply if the user does not specify any file.
  4361  ac_need_defaults=:
  4362  while test $# != 0
  4363  do
  4364    case $1 in
  4365 -  --*=*)
  4366 +  --*=?*)
  4367      ac_option=`expr "X$1" : 'X\([^=]*\)='`
  4368      ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
  4369      ac_shift=:
  4370      ;;
  4371 +  --*=)
  4372 +    ac_option=`expr "X$1" : 'X\([^=]*\)='`
  4373 +    ac_optarg=
  4374 +    ac_shift=:
  4375 +    ;;
  4376    *)
  4377      ac_option=$1
  4378      ac_optarg=$2
  4379      ac_shift=shift
  4380      ;;
  4381    esac
  4383    case $ac_option in
  4384 @@ -6847,38 +6883,39 @@
  4385    --config | --confi | --conf | --con | --co | --c )
  4386      $as_echo "$ac_cs_config"; exit ;;
  4387    --debug | --debu | --deb | --de | --d | -d )
  4388      debug=: ;;
  4389    --file | --fil | --fi | --f )
  4390      $ac_shift
  4391      case $ac_optarg in
  4392      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
  4393 +    '') as_fn_error $? "missing file argument" ;;
  4394      esac
  4395      as_fn_append CONFIG_FILES " '$ac_optarg'"
  4396      ac_need_defaults=false;;
  4397    --header | --heade | --head | --hea )
  4398      $ac_shift
  4399      case $ac_optarg in
  4400      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
  4401      esac
  4402      as_fn_append CONFIG_HEADERS " '$ac_optarg'"
  4403      ac_need_defaults=false;;
  4404    --he | --h)
  4405      # Conflict between --help and --header
  4406 -    as_fn_error "ambiguous option: \`$1'
  4407 +    as_fn_error $? "ambiguous option: \`$1'
  4408  Try \`$0 --help' for more information.";;
  4409    --help | --hel | -h )
  4410      $as_echo "$ac_cs_usage"; exit ;;
  4411    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
  4412    | -silent | --silent | --silen | --sile | --sil | --si | --s)
  4413      ac_cs_silent=: ;;
  4415    # This is an error.
  4416 -  -*) as_fn_error "unrecognized option: \`$1'
  4417 +  -*) as_fn_error $? "unrecognized option: \`$1'
  4418  Try \`$0 --help' for more information." ;;
  4420    *) as_fn_append ac_config_targets " $1"
  4421       ac_need_defaults=false ;;
  4423    esac
  4424    shift
  4425  done
  4426 @@ -6926,17 +6963,17 @@
  4427  # Handling of arguments.
  4428  for ac_config_target in $ac_config_targets
  4429  do
  4430    case $ac_config_target in
  4431      "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
  4432      "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
  4433      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
  4435 -  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  4436 +  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  4437    esac
  4438  done
  4441  # If the user did not use the arguments to specify the items to instantiate,
  4442  # then the envvar interface is used.  Set only those that are not.
  4443  # We use the long form for the default assignment because of an extremely
  4444  # bizarre bug on SunOS 4.1.3.
  4445 @@ -6949,82 +6986,84 @@
  4446  # Have a temporary directory for convenience.  Make it in the build tree
  4447  # simply because there is no reason against having it here, and in addition,
  4448  # creating and moving files from /tmp can sometimes cause problems.
  4449  # Hook for its removal unless debugging.
  4450  # Note that there is a small window in which the directory will not be cleaned:
  4451  # after its creation but before its name has been assigned to `$tmp'.
  4452  $debug ||
  4454 -  tmp=
  4455 +  tmp= ac_tmp=
  4456    trap 'exit_status=$?
  4457 -  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  4458 +  : "${ac_tmp:=$tmp}"
  4459 +  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
  4460  ' 0
  4461    trap 'as_fn_exit 1' 1 2 13 15
  4463  # Create a (secure) tmp directory for tmp files.
  4466    tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
  4467 -  test -n "$tmp" && test -d "$tmp"
  4468 +  test -d "$tmp"
  4469  }  ||
  4471    tmp=./conf$$-$RANDOM
  4472    (umask 077 && mkdir "$tmp")
  4473 -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
  4474 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
  4475 +ac_tmp=$tmp
  4477  # Set up the scripts for CONFIG_FILES section.
  4478  # No need to generate them if there are no CONFIG_FILES.
  4479  # This happens for instance with `./config.status config.h'.
  4480  if test -n "$CONFIG_FILES"; then
  4483  ac_cr=`echo X | tr X '\015'`
  4484  # On cygwin, bash can eat \r inside `` if the user requested igncr.
  4485  # But we know of no other shell where ac_cr would be empty at this
  4486  # point, so we can use a bashism as a fallback.
  4487  if test "x$ac_cr" = x; then
  4488    eval ac_cr=\$\'\\r\'
  4489  fi
  4490  ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
  4491  if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
  4492 -  ac_cs_awk_cr='\r'
  4493 +  ac_cs_awk_cr='\\r'
  4494  else
  4495    ac_cs_awk_cr=$ac_cr
  4496  fi
  4498 -echo 'BEGIN {' >"$tmp/subs1.awk" &&
  4499 +echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
  4500  _ACEOF
  4504    echo "cat >conf$$subs.awk <<_ACEOF" &&
  4505    echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
  4506    echo "_ACEOF"
  4507  } >conf$$subs.sh ||
  4508 -  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
  4509 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
  4510 +  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
  4511 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
  4512  ac_delim='%!_!# '
  4513  for ac_last_try in false false false false false :; do
  4514    . ./conf$$subs.sh ||
  4515 -    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
  4516 +    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
  4518    ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
  4519    if test $ac_delim_n = $ac_delim_num; then
  4520      break
  4521    elif $ac_last_try; then
  4522 -    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
  4523 +    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
  4524    else
  4525      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
  4526    fi
  4527  done
  4528  rm -f conf$$subs.sh
  4530  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  4531 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
  4532 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
  4533  _ACEOF
  4534  sed -n '
  4536  s/^/S["/; s/!.*/"]=/
  4539  s/^[^!]*!//
  4540  :repl
  4541 @@ -7062,17 +7101,17 @@
  4542  /^[^""]/{
  4544    s/\n//
  4546  ' >>$CONFIG_STATUS || ac_write_fail=1
  4547  rm -f conf$$subs.awk
  4548  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  4549  _ACAWK
  4550 -cat >>"\$tmp/subs1.awk" <<_ACAWK &&
  4551 +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
  4552    for (key in S) S_is_set[key] = 1
  4553    FS = ""
  4557    line = $ 0
  4558    nfields = split(line, field, "@")
  4559    substed = 0
  4560 @@ -7094,59 +7133,67 @@
  4562  _ACAWK
  4563  _ACEOF
  4564  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  4565  if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
  4566    sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
  4567  else
  4568    cat
  4569 -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
  4570 -  || as_fn_error "could not setup config files machinery" "$LINENO" 5
  4571 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
  4572 +  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
  4573  _ACEOF
  4575 -# VPATH may cause trouble with some makes, so we remove $(srcdir),
  4576 -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
  4577 +# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
  4578 +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
  4579  # trailing colons and then remove the whole line if VPATH becomes empty
  4580  # (actually we leave an empty line to preserve line numbers).
  4581  if test "x$srcdir" = x.; then
  4582 -  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
  4583 -s/:*\$(srcdir):*/:/
  4584 -s/:*\${srcdir}:*/:/
  4585 -s/:*@srcdir@:*/:/
  4586 -s/^\([^=]*=[	 ]*\):*/\1/
  4587 +  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
  4588 +h
  4589 +s///
  4590 +s/^/:/
  4591 +s/[	 ]*$/:/
  4592 +s/:\$(srcdir):/:/g
  4593 +s/:\${srcdir}:/:/g
  4594 +s/:@srcdir@:/:/g
  4595 +s/^:*//
  4596  s/:*$//
  4597 +x
  4598 +s/\(=[	 ]*\).*/\1/
  4599 +G
  4600 +s/\n//
  4601  s/^[^=]*=[	 ]*$//
  4602  }'
  4603  fi
  4605  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  4606  fi # test -n "$CONFIG_FILES"
  4608  # Set up the scripts for CONFIG_HEADERS section.
  4609  # No need to generate them if there are no CONFIG_HEADERS.
  4610  # This happens for instance with `./config.status Makefile'.
  4611  if test -n "$CONFIG_HEADERS"; then
  4612 -cat >"$tmp/defines.awk" <<\_ACAWK ||
  4613 +cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
  4614  BEGIN {
  4615  _ACEOF
  4617  # Transform confdefs.h into an awk script `defines.awk', embedded as
  4618  # here-document in config.status, that substitutes the proper values into
  4619  # config.h.in to produce config.h.
  4621  # Create a delimiter string that does not exist in confdefs.h, to ease
  4622  # handling of long lines.
  4623  ac_delim='%!_!# '
  4624  for ac_last_try in false false :; do
  4625 -  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
  4626 -  if test -z "$ac_t"; then
  4627 +  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
  4628 +  if test -z "$ac_tt"; then
  4629      break
  4630    elif $ac_last_try; then
  4631 -    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
  4632 +    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
  4633    else
  4634      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
  4635    fi
  4636  done
  4638  # For the awk script, D is an array of macro values keyed by name,
  4639  # likewise P contains macro parameters if any.  Preserve backslash
  4640  # newline sequences.
  4641 @@ -7221,30 +7268,30 @@
  4642        next
  4646  { print }
  4647  _ACAWK
  4648  _ACEOF
  4649  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  4650 -  as_fn_error "could not setup config headers machinery" "$LINENO" 5
  4651 +  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
  4652  fi # test -n "$CONFIG_HEADERS"
  4655  eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
  4656  shift
  4657  for ac_tag
  4658  do
  4659    case $ac_tag in
  4660    :[FHLC]) ac_mode=$ac_tag; continue;;
  4661    esac
  4662    case $ac_mode$ac_tag in
  4663    :[FHL]*:*);;
  4664 -  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
  4665 +  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
  4666    :[FH]-) ac_tag=-:-;;
  4667    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
  4668    esac
  4669    ac_save_IFS=$IFS
  4670    IFS=:
  4671    set x $ac_tag
  4672    IFS=$ac_save_IFS
  4673    shift
  4674 @@ -7253,26 +7300,26 @@
  4676    case $ac_mode in
  4677    :L) ac_source=$1;;
  4678    :[FH])
  4679      ac_file_inputs=
  4680      for ac_f
  4681      do
  4682        case $ac_f in
  4683 -      -) ac_f="$tmp/stdin";;
  4684 +      -) ac_f="$ac_tmp/stdin";;
  4685        *) # Look for the file first in the build tree, then in the source tree
  4686  	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
  4687  	 # because $ac_f cannot contain `:'.
  4688  	 test -f "$ac_f" ||
  4689  	   case $ac_f in
  4690  	   [\\/$]*) false;;
  4691  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  4692  	   esac ||
  4693 -	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
  4694 +	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
  4695        esac
  4696        case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
  4697        as_fn_append ac_file_inputs " '$ac_f'"
  4698      done
  4700      # Let's still pretend it is `configure' which instantiates (i.e., don't
  4701      # use $as_me), people would be surprised to read:
  4702      #    /* config.h.  Generated by config.status.  */
  4703 @@ -7288,18 +7335,18 @@
  4704      case $configure_input in #(
  4705      *\&* | *\|* | *\\* )
  4706         ac_sed_conf_input=`$as_echo "$configure_input" |
  4707         sed 's/[\\\\&|]/\\\\&/g'`;; #(
  4708      *) ac_sed_conf_input=$configure_input;;
  4709      esac
  4711      case $ac_tag in
  4712 -    *:-:* | *:-) cat >"$tmp/stdin" \
  4713 -      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
  4714 +    *:-:* | *:-) cat >"$ac_tmp/stdin" \
  4715 +      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
  4716      esac
  4717      ;;
  4718    esac
  4720    ac_dir=`$as_dirname -- "$ac_file" ||
  4721  $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  4722  	 X"$ac_file" : 'X\(//\)[^/]' \| \
  4723  	 X"$ac_file" : 'X\(//\)$' \| \
  4724 @@ -7425,56 +7472,57 @@
  4725  s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
  4726  s&@builddir@&$ac_builddir&;t t
  4727  s&@abs_builddir@&$ac_abs_builddir&;t t
  4728  s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
  4729  s&@INSTALL@&$ac_INSTALL&;t t
  4730  s&@MKDIR_P@&$ac_MKDIR_P&;t t
  4731  $ac_datarootdir_hack
  4733 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
  4734 -  || as_fn_error "could not create $ac_file" "$LINENO" 5
  4735 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
  4736 +  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  4738  test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
  4739 -  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
  4740 -  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
  4741 +  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
  4742 +  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
  4743 +      "$ac_tmp/out"`; test -z "$ac_out"; } &&
  4744    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  4745 -which seems to be undefined.  Please make sure it is defined." >&5
  4746 +which seems to be undefined.  Please make sure it is defined" >&5
  4747  $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  4748 -which seems to be undefined.  Please make sure it is defined." >&2;}
  4750 -  rm -f "$tmp/stdin"
  4751 +which seems to be undefined.  Please make sure it is defined" >&2;}
  4753 +  rm -f "$ac_tmp/stdin"
  4754    case $ac_file in
  4755 -  -) cat "$tmp/out" && rm -f "$tmp/out";;
  4756 -  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
  4757 +  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
  4758 +  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
  4759    esac \
  4760 -  || as_fn_error "could not create $ac_file" "$LINENO" 5
  4761 +  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  4762   ;;
  4763    :H)
  4765    # CONFIG_HEADER
  4767    if test x"$ac_file" != x-; then
  4769        $as_echo "/* $configure_input  */" \
  4770 -      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
  4771 -    } >"$tmp/config.h" \
  4772 -      || as_fn_error "could not create $ac_file" "$LINENO" 5
  4773 -    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
  4774 +      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
  4775 +    } >"$ac_tmp/config.h" \
  4776 +      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  4777 +    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
  4778        { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
  4779  $as_echo "$as_me: $ac_file is unchanged" >&6;}
  4780      else
  4781        rm -f "$ac_file"
  4782 -      mv "$tmp/config.h" "$ac_file" \
  4783 -	|| as_fn_error "could not create $ac_file" "$LINENO" 5
  4784 +      mv "$ac_tmp/config.h" "$ac_file" \
  4785 +	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
  4786      fi
  4787    else
  4788      $as_echo "/* $configure_input  */" \
  4789 -      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
  4790 -      || as_fn_error "could not create -" "$LINENO" 5
  4791 +      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
  4792 +      || as_fn_error $? "could not create -" "$LINENO" 5
  4793    fi
  4794  # Compute "$ac_file"'s index in $config_headers.
  4795  _am_arg="$ac_file"
  4796  _am_stamp_count=1
  4797  for _am_header in $config_headers :; do
  4798    case $_am_header in
  4799      $_am_arg | $_am_arg:* )
  4800        break ;;
  4801 @@ -7614,17 +7662,17 @@
  4802  done # for ac_tag
  4805  as_fn_exit 0
  4806  _ACEOF
  4807  ac_clean_files=$ac_clean_files_save
  4809  test $ac_write_fail = 0 ||
  4810 -  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
  4811 +  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
  4814  # configure is writing to config.log, and then calls config.status.
  4815  # config.status does its own redirection, appending to config.log.
  4816  # Unfortunately, on DOS this fails, as config.log is still kept open
  4817  # by configure, so config.status won't be able to write to it; its
  4818  # output is simply discarded.  So we exec the FD to /dev/null,
  4819  # effectively closing config.log, so it can be properly (re)opened and
  4820 @@ -7635,15 +7683,15 @@
  4821    ac_config_status_args=
  4822    test "$silent" = yes &&
  4823      ac_config_status_args="$ac_config_status_args --quiet"
  4824    exec 5>/dev/null
  4825    $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
  4826    exec 5>>config.log
  4827    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
  4828    # would make configure fail if this is the last instruction.
  4829 -  $ac_cs_success || as_fn_exit $?
  4830 +  $ac_cs_success || as_fn_exit 1
  4831  fi
  4832  if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
  4833    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
  4834  $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  4835  fi
  4837 diff --git a/src/common/dwarf_cfi_to_module.cc b/src/common/dwarf_cfi_to_module.cc
  4838 --- a/src/common/dwarf_cfi_to_module.cc
  4839 +++ b/src/common/dwarf_cfi_to_module.cc
  4840 @@ -122,17 +122,18 @@
  4841    return_address_ = return_address;
  4843    // Breakpad STACK CFI records must provide a .ra rule, but DWARF CFI
  4844    // may not establish any rule for .ra if the return address column
  4845    // is an ordinary register, and that register holds the return
  4846    // address on entry to the function. So establish an initial .ra
  4847    // rule citing the return address register.
  4848    if (return_address_ < register_names_.size())
  4849 -    entry_->initial_rules[ra_name_] = register_names_[return_address_];
  4850 +    entry_->initial_rules[ra_name_]
  4851 +      = Module::Expr(register_names_[return_address_], 0, false);
  4853    return true;
  4856  string DwarfCFIToModule::RegisterName(int i) {
  4857    assert(entry_);
  4858    if (i < 0) {
  4859      assert(i == kCFARegister);
  4860 @@ -148,69 +149,65 @@
  4862    reporter_->UnnamedRegister(entry_offset_, reg);
  4863    char buf[30];
  4864    sprintf(buf, "unnamed_register%u", reg);
  4865    return buf;
  4868  void DwarfCFIToModule::Record(Module::Address address, int reg,
  4869 -                              const string &rule) {
  4870 +                              const Module::Expr &rule) {
  4871    assert(entry_);
  4873 -  // Place the name in our global set of strings, and then use the string
  4874 -  // from the set. Even though the assignment looks like a copy, all the
  4875 -  // major std::string implementations use reference counting internally,
  4876 -  // so the effect is to have all our data structures share copies of rules
  4877 -  // whenever possible. Since register names are drawn from a
  4878 -  // vector<string>, register names are already shared.
  4879 -  string shared_rule = *common_strings_.insert(rule).first;
  4881    // Is this one of this entry's initial rules?
  4882    if (address == entry_->address)
  4883 -    entry_->initial_rules[RegisterName(reg)] = shared_rule;
  4884 +    entry_->initial_rules[RegisterName(reg)] = rule;
  4885    // File it under the appropriate address.
  4886    else
  4887 -    entry_->rule_changes[address][RegisterName(reg)] = shared_rule;
  4888 +    entry_->rule_changes[address][RegisterName(reg)] = rule;
  4891  bool DwarfCFIToModule::UndefinedRule(uint64 address, int reg) {
  4892    reporter_->UndefinedNotSupported(entry_offset_, RegisterName(reg));
  4893    // Treat this as a non-fatal error.
  4894    return true;
  4897  bool DwarfCFIToModule::SameValueRule(uint64 address, int reg) {
  4898 -  ostringstream s;
  4899 -  s << RegisterName(reg);
  4900 -  Record(address, reg, s.str());
  4901 +  // reg + 0
  4902 +  Module::Expr rule
  4903 +    = Module::Expr(RegisterName(reg), 0, false);
  4904 +  Record(address, reg, rule);
  4905    return true;
  4908  bool DwarfCFIToModule::OffsetRule(uint64 address, int reg,
  4909                                    int base_register, long offset) {
  4910 -  ostringstream s;
  4911 -  s << RegisterName(base_register) << " " << offset << " + ^";
  4912 -  Record(address, reg, s.str());
  4913 +  // *(base_register + offset)
  4914 +  Module::Expr rule
  4915 +    = Module::Expr(RegisterName(base_register), offset, true);
  4916 +  Record(address, reg, rule);
  4917    return true;
  4920  bool DwarfCFIToModule::ValOffsetRule(uint64 address, int reg,
  4921                                       int base_register, long offset) {
  4922 -  ostringstream s;
  4923 -  s << RegisterName(base_register) << " " << offset << " +";
  4924 -  Record(address, reg, s.str());
  4925 +  // base_register + offset
  4926 +  Module::Expr rule
  4927 +    = Module::Expr(RegisterName(base_register), offset, false);
  4928 +  Record(address, reg, rule);
  4929    return true;
  4932  bool DwarfCFIToModule::RegisterRule(uint64 address, int reg,
  4933                                      int base_register) {
  4934 -  ostringstream s;
  4935 -  s << RegisterName(base_register);
  4936 -  Record(address, reg, s.str());
  4937 +  // base_register + 0
  4938 +  Module::Expr rule
  4939 +    = Module::Expr(RegisterName(base_register), 0, false);
  4940 +  Record(address, reg, rule);
  4941    return true;
  4944  bool DwarfCFIToModule::ExpressionRule(uint64 address, int reg,
  4945                                        const string &expression) {
  4946    reporter_->ExpressionsNotSupported(entry_offset_, RegisterName(reg));
  4947    // Treat this as a non-fatal error.
  4948    return true;
  4949 diff --git a/src/common/dwarf_cfi_to_module.h b/src/common/dwarf_cfi_to_module.h
  4950 --- a/src/common/dwarf_cfi_to_module.h
  4951 +++ b/src/common/dwarf_cfi_to_module.h
  4952 @@ -147,17 +147,17 @@
  4953                                   const string &expression);
  4954    virtual bool End();
  4956   private:
  4957    // Return the name to use for register REG.
  4958    string RegisterName(int i);
  4960    // Record RULE for register REG at ADDRESS.
  4961 -  void Record(Module::Address address, int reg, const string &rule);
  4962 +  void Record(Module::Address address, int reg, const Module::Expr &rule);
  4964    // The module to which we should add entries.
  4965    Module *module_;
  4967    // Map from register numbers to register names.
  4968    const vector<string> &register_names_;
  4970    // The reporter to use to report problems.
  4971 diff --git a/src/common/dwarf_cfi_to_module_unittest.cc b/src/common/dwarf_cfi_to_module_unittest.cc
  4972 --- a/src/common/dwarf_cfi_to_module_unittest.cc
  4973 +++ b/src/common/dwarf_cfi_to_module_unittest.cc
  4974 @@ -153,69 +153,71 @@
  4977  TEST_F(Rule, SameValueRule) {
  4978    StartEntry();
  4979    ASSERT_TRUE(handler.SameValueRule(entry_address, 6));
  4980    ASSERT_TRUE(handler.End());
  4981    CheckEntry();
  4982    Module::RuleMap expected_initial;
  4983 -  expected_initial["reg6"] = "reg6";
  4984 +  expected_initial["reg6"] = Module::Expr("reg6", 0, false);
  4985    EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial));
  4986    EXPECT_EQ(0U, entries[0]->rule_changes.size());
  4989  TEST_F(Rule, OffsetRule) {
  4990    StartEntry();
  4991    ASSERT_TRUE(handler.OffsetRule(entry_address + 1, return_reg,
  4992                                   DwarfCFIToModule::kCFARegister,
  4993                                   16927065));
  4994    ASSERT_TRUE(handler.End());
  4995    CheckEntry();
  4996    EXPECT_EQ(0U, entries[0]->initial_rules.size());
  4997    Module::RuleChangeMap expected_changes;
  4998 -  expected_changes[entry_address + 1][".ra"] = ".cfa 16927065 + ^";
  4999 +  expected_changes[entry_address + 1][".ra"] =
  5000 +      Module::Expr(".cfa", 16927065, true);
  5001    EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes));
  5004  TEST_F(Rule, OffsetRuleNegative) {
  5005    StartEntry();
  5006    ASSERT_TRUE(handler.OffsetRule(entry_address + 1,
  5007                                   DwarfCFIToModule::kCFARegister, 4, -34530721));
  5008    ASSERT_TRUE(handler.End());
  5009    CheckEntry();
  5010    EXPECT_EQ(0U, entries[0]->initial_rules.size());
  5011    Module::RuleChangeMap expected_changes;
  5012 -  expected_changes[entry_address + 1][".cfa"] = "reg4 -34530721 + ^";
  5013 +  expected_changes[entry_address + 1][".cfa"] =
  5014 +      Module::Expr("reg4", -34530721, true);
  5015    EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes));
  5018  TEST_F(Rule, ValOffsetRule) {
  5019    // Use an unnamed register number, to exercise that branch of RegisterName.
  5020    EXPECT_CALL(reporter, UnnamedRegister(_, 11));
  5021    StartEntry();
  5022    ASSERT_TRUE(handler.ValOffsetRule(entry_address + 0x5ab7,
  5023                                      DwarfCFIToModule::kCFARegister,
  5024                                      11, 61812979));
  5025    ASSERT_TRUE(handler.End());
  5026    CheckEntry();
  5027    EXPECT_EQ(0U, entries[0]->initial_rules.size());
  5028    Module::RuleChangeMap expected_changes;
  5029    expected_changes[entry_address + 0x5ab7][".cfa"] =
  5030 -      "unnamed_register11 61812979 +";
  5031 +      Module::Expr("unnamed_register11", 61812979, false);
  5032    EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes));
  5035  TEST_F(Rule, RegisterRule) {
  5036    StartEntry();
  5037    ASSERT_TRUE(handler.RegisterRule(entry_address, return_reg, 3));
  5038    ASSERT_TRUE(handler.End());
  5039    CheckEntry();
  5040    Module::RuleMap expected_initial;
  5041 -  expected_initial[".ra"] = "reg3";
  5042 +  expected_initial[".ra"] = Module::Expr("reg3", 0, false);
  5043    EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial));
  5044    EXPECT_EQ(0U, entries[0]->rule_changes.size());
  5047  TEST_F(Rule, ExpressionRule) {
  5048    EXPECT_CALL(reporter, ExpressionsNotSupported(_, "reg2"));
  5049    StartEntry();
  5050    ASSERT_TRUE(handler.ExpressionRule(entry_address + 0xf326, 2,
  5051 @@ -239,45 +241,46 @@
  5053  TEST_F(Rule, DefaultReturnAddressRule) {
  5054    return_reg = 2;
  5055    StartEntry();
  5056    ASSERT_TRUE(handler.RegisterRule(entry_address, 0, 1));
  5057    ASSERT_TRUE(handler.End());
  5058    CheckEntry();
  5059    Module::RuleMap expected_initial;
  5060 -  expected_initial[".ra"] = "reg2";
  5061 -  expected_initial["reg0"] = "reg1";
  5062 +  expected_initial[".ra"] = Module::Expr("reg2", 0, false);
  5063 +  expected_initial["reg0"] = Module::Expr("reg1", 0, false);
  5064    EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial));
  5065    EXPECT_EQ(0U, entries[0]->rule_changes.size());
  5068  TEST_F(Rule, DefaultReturnAddressRuleOverride) {
  5069    return_reg = 2;
  5070    StartEntry();
  5071    ASSERT_TRUE(handler.RegisterRule(entry_address, return_reg, 1));
  5072    ASSERT_TRUE(handler.End());
  5073    CheckEntry();
  5074    Module::RuleMap expected_initial;
  5075 -  expected_initial[".ra"] = "reg1";
  5076 +  expected_initial[".ra"] = Module::Expr("reg1", 0, false);
  5077    EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial));
  5078    EXPECT_EQ(0U, entries[0]->rule_changes.size());
  5081  TEST_F(Rule, DefaultReturnAddressRuleLater) {
  5082    return_reg = 2;
  5083    StartEntry();
  5084    ASSERT_TRUE(handler.RegisterRule(entry_address + 1, return_reg, 1));
  5085    ASSERT_TRUE(handler.End());
  5086    CheckEntry();
  5087    Module::RuleMap expected_initial;
  5088 -  expected_initial[".ra"] = "reg2";
  5089 +  expected_initial[".ra"] = Module::Expr("reg2", 0, false);
  5090    EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial));
  5091    Module::RuleChangeMap expected_changes;
  5092 -  expected_changes[entry_address + 1][".ra"] = "reg1";
  5093 +  expected_changes[entry_address + 1][".ra"] =
  5094 +      Module::Expr("reg1", 0, false);
  5095    EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes));
  5098  TEST(RegisterNames, I386) {
  5099    vector<string> names = DwarfCFIToModule::RegisterNames::I386();
  5101    EXPECT_EQ("$eax", names[0]);
  5102    EXPECT_EQ("$ecx", names[1]);
  5103 diff --git a/src/common/module.cc b/src/common/module.cc
  5104 --- a/src/common/module.cc
  5105 +++ b/src/common/module.cc
  5106 @@ -251,16 +251,34 @@
  5109  bool Module::ReportError() {
  5110    fprintf(stderr, "error writing symbol file: %s\n",
  5111            strerror(errno));
  5112    return false;
  5115 +std::ostream& operator<<(std::ostream& stream, const Module::Expr& expr) {
  5116 +  assert(!expr.invalid());
  5117 +  switch (expr.how_) {
  5118 +    case Module::kExprSimple:
  5119 +      stream << expr.ident_ << " " << expr.offset_ << " +";
  5120 +      break;
  5121 +    case Module::kExprSimpleMem:
  5122 +      stream << expr.ident_ << " " << expr.offset_ << " + ^";
  5123 +      break;
  5124 +    case Module::kExprPostfix:
  5125 +      stream << expr.postfix_; break;
  5126 +    case Module::kExprInvalid:
  5127 +    default:
  5128 +      break;
  5129 +  }
  5130 +  return stream;
  5131 +}
  5133  bool Module::WriteRuleMap(const RuleMap &rule_map, std::ostream &stream) {
  5134    for (RuleMap::const_iterator it = rule_map.begin();
  5135         it != rule_map.end(); ++it) {
  5136      if (it != rule_map.begin())
  5137        stream << ' ';
  5138      stream << it->first << ": " << it->second;
  5140    return stream.good();
  5141 diff --git a/src/common/module.h b/src/common/module.h
  5142 --- a/src/common/module.h
  5143 +++ b/src/common/module.h
  5144 @@ -119,21 +119,81 @@
  5145    };
  5147    // An exported symbol.
  5148    struct Extern {
  5149      Address address;
  5150      string name;
  5151    };
  5153 -  // A map from register names to postfix expressions that recover
  5154 -  // their their values. This can represent a complete set of rules to
  5155 +  // Representation of an expression.  This can either be a postfix
  5156 +  // expression, in which case it is stored as a string, or a simple
  5157 +  // expression of the form (identifier + imm) or *(identifier + imm).
  5158 +  // It can also be invalid (denoting "no value").
  5159 +  enum ExprHow {
  5160 +    kExprInvalid = 1,
  5161 +    kExprPostfix,
  5162 +    kExprSimple,
  5163 +    kExprSimpleMem
  5164 +  };
  5165 +  struct Expr {
  5166 +    // Construct a simple-form expression
  5167 +    Expr(string ident, long offset, bool deref) {
  5168 +      if (ident.empty()) {
  5169 +        Expr();
  5170 +      } else {
  5171 +        postfix_ = "";
  5172 +        ident_ = ident;
  5173 +        offset_ = offset;
  5174 +        how_ = deref ? kExprSimpleMem : kExprSimple;
  5175 +      }
  5176 +    }
  5177 +    // Construct an expression from a postfix string
  5178 +    Expr(string postfix) {
  5179 +      if (postfix.empty()) {
  5180 +        Expr();
  5181 +      } else {
  5182 +        postfix_ = postfix;
  5183 +        ident_ = "";
  5184 +        offset_ = 0;
  5185 +        how_ = kExprPostfix;
  5186 +      }
  5187 +    }
  5188 +    // Construct an invalid expression
  5189 +    Expr() {
  5190 +      postfix_ = "";
  5191 +      ident_ = "";
  5192 +      offset_ = 0;
  5193 +      how_ = kExprInvalid;
  5194 +    }
  5195 +    bool invalid() const { return how_ == kExprInvalid; }
  5196 +    bool operator==(const Expr& other) const {
  5197 +      return how_ == other.how_ &&
  5198 +          ident_ == other.ident_ &&
  5199 +          offset_ == other.offset_ &&
  5200 +          postfix_ == other.postfix_;
  5201 +    }
  5203 +    // The identifier that gives the starting value for simple expressions.
  5204 +    string  ident_;
  5205 +    // The offset to add for simple expressions.
  5206 +    long    offset_;
  5207 +    // The Postfix expression string to evaluate for non-simple expressions.
  5208 +    string  postfix_;
  5209 +    // The operation expressed by this expression.
  5210 +    ExprHow how_;
  5212 +    friend std::ostream& operator<<(std::ostream& stream, const Expr& expr);
  5213 +  };
  5215 +  // A map from register names to expressions that recover
  5216 +  // their values. This can represent a complete set of rules to
  5217    // follow at some address, or a set of changes to be applied to an
  5218    // extant set of rules.
  5219 -  typedef map<string, string> RuleMap;
  5220 +  typedef map<string, Expr> RuleMap;
  5222    // A map from addresses to RuleMaps, representing changes that take
  5223    // effect at given addresses.
  5224    typedef map<Address, RuleMap> RuleChangeMap;
  5226    // A range of 'STACK CFI' stack walking information. An instance of
  5227    // this structure corresponds to a 'STACK CFI INIT' record and the
  5228    // subsequent 'STACK CFI' records that fall within its range.
  5229 diff --git a/src/common/module_unittest.cc b/src/common/module_unittest.cc
  5230 --- a/src/common/module_unittest.cc
  5231 +++ b/src/common/module_unittest.cc
  5232 @@ -125,21 +125,21 @@
  5233    function->lines.push_back(line1);
  5235    m.AddFunction(function);
  5237    // Some stack information.
  5238    Module::StackFrameEntry *entry = new Module::StackFrameEntry();
  5239    entry->address = 0x30f9e5c83323973dULL;
  5240    entry->size = 0x49fc9ca7c7c13dc2ULL;
  5241 -  entry->initial_rules[".cfa"] = "he was a handsome man";
  5242 -  entry->initial_rules["and"] = "what i want to know is";
  5243 +  entry->initial_rules[".cfa"] = Module::Expr("he was a handsome man");
  5244 +  entry->initial_rules["and"] = Module::Expr("what i want to know is");
  5245    entry->rule_changes[0x30f9e5c83323973eULL]["how"] =
  5246 -    "do you like your blueeyed boy";
  5247 -  entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = "Death";
  5248 +    Module::Expr("do you like your blueeyed boy");
  5249 +  entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = Module::Expr("Death");
  5250    m.AddStackFrameEntry(entry);
  5252    // Set the load address.  Doing this after adding all the data to
  5253    // the module must work fine.
  5254    m.SetLoadAddress(0x2ab698b0b6407073LL);
  5256    m.Write(s, ALL_SYMBOL_DATA);
  5257    string contents = s.str();
  5258 @@ -229,21 +229,21 @@
  5259    function->lines.push_back(line1);
  5261    m.AddFunction(function);
  5263    // Some stack information.
  5264    Module::StackFrameEntry *entry = new Module::StackFrameEntry();
  5265    entry->address = 0x30f9e5c83323973dULL;
  5266    entry->size = 0x49fc9ca7c7c13dc2ULL;
  5267 -  entry->initial_rules[".cfa"] = "he was a handsome man";
  5268 -  entry->initial_rules["and"] = "what i want to know is";
  5269 +  entry->initial_rules[".cfa"] = Module::Expr("he was a handsome man");
  5270 +  entry->initial_rules["and"] = Module::Expr("what i want to know is");
  5271    entry->rule_changes[0x30f9e5c83323973eULL]["how"] =
  5272 -    "do you like your blueeyed boy";
  5273 -  entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = "Death";
  5274 +    Module::Expr("do you like your blueeyed boy");
  5275 +  entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = Module::Expr("Death");
  5276    m.AddStackFrameEntry(entry);
  5278    // Set the load address.  Doing this after adding all the data to
  5279    // the module must work fine.
  5280    m.SetLoadAddress(0x2ab698b0b6407073LL);
  5282    m.Write(s, NO_CFI);
  5283    string contents = s.str();
  5284 @@ -305,34 +305,34 @@
  5285    entry1->address = 0xddb5f41285aa7757ULL;
  5286    entry1->size = 0x1486493370dc5073ULL;
  5287    m.AddStackFrameEntry(entry1);
  5289    // Second STACK CFI entry, with initial rules but no deltas.
  5290    Module::StackFrameEntry *entry2 = new Module::StackFrameEntry();
  5291    entry2->address = 0x8064f3af5e067e38ULL;
  5292    entry2->size = 0x0de2a5ee55509407ULL;
  5293 -  entry2->initial_rules[".cfa"] = "I think that I shall never see";
  5294 -  entry2->initial_rules["stromboli"] = "a poem lovely as a tree";
  5295 -  entry2->initial_rules["cannoli"] = "a tree whose hungry mouth is prest";
  5296 +  entry2->initial_rules[".cfa"] = Module::Expr("I think that I shall never see");
  5297 +  entry2->initial_rules["stromboli"] = Module::Expr("a poem lovely as a tree");
  5298 +  entry2->initial_rules["cannoli"] = Module::Expr("a tree whose hungry mouth is prest");
  5299    m.AddStackFrameEntry(entry2);
  5301    // Third STACK CFI entry, with initial rules and deltas.
  5302    Module::StackFrameEntry *entry3 = new Module::StackFrameEntry();
  5303    entry3->address = 0x5e8d0db0a7075c6cULL;
  5304    entry3->size = 0x1c7edb12a7aea229ULL;
  5305 -  entry3->initial_rules[".cfa"] = "Whose woods are these";
  5306 +  entry3->initial_rules[".cfa"] = Module::Expr("Whose woods are these");
  5307    entry3->rule_changes[0x47ceb0f63c269d7fULL]["calzone"] =
  5308 -    "the village though";
  5309 +    Module::Expr("the village though");
  5310    entry3->rule_changes[0x47ceb0f63c269d7fULL]["cannoli"] =
  5311 -    "he will not see me stopping here";
  5312 +    Module::Expr("he will not see me stopping here");
  5313    entry3->rule_changes[0x36682fad3763ffffULL]["stromboli"] =
  5314 -    "his house is in";
  5315 +    Module::Expr("his house is in");
  5316    entry3->rule_changes[0x36682fad3763ffffULL][".cfa"] =
  5317 -    "I think I know";
  5318 +    Module::Expr("I think I know");
  5319    m.AddStackFrameEntry(entry3);
  5321    // Check that Write writes STACK CFI records properly.
  5322    m.Write(s, ALL_SYMBOL_DATA);
  5323    string contents = s.str();
  5324    EXPECT_STREQ("MODULE os-name architecture id-string name with spaces\n"
  5325                 "STACK CFI INIT 5e8d0db0a7075c6c 1c7edb12a7aea229"
  5326                 " .cfa: Whose woods are these\n"
  5327 @@ -352,33 +352,33 @@
  5328    // Check that GetStackFrameEntries works.
  5329    vector<Module::StackFrameEntry *> entries;
  5330    m.GetStackFrameEntries(&entries);
  5331    ASSERT_EQ(3U, entries.size());
  5332    // Check first entry.
  5333    EXPECT_EQ(0x5e8d0db0a7075c6cULL, entries[0]->address);
  5334    EXPECT_EQ(0x1c7edb12a7aea229ULL, entries[0]->size);
  5335    Module::RuleMap entry1_initial;
  5336 -  entry1_initial[".cfa"] = "Whose woods are these";
  5337 +  entry1_initial[".cfa"] = Module::Expr("Whose woods are these");
  5338    EXPECT_THAT(entries[0]->initial_rules, ContainerEq(entry1_initial));
  5339    Module::RuleChangeMap entry1_changes;
  5340 -  entry1_changes[0x36682fad3763ffffULL][".cfa"] = "I think I know";
  5341 -  entry1_changes[0x36682fad3763ffffULL]["stromboli"] = "his house is in";
  5342 -  entry1_changes[0x47ceb0f63c269d7fULL]["calzone"] = "the village though";
  5343 +  entry1_changes[0x36682fad3763ffffULL][".cfa"] = Module::Expr("I think I know");
  5344 +  entry1_changes[0x36682fad3763ffffULL]["stromboli"] = Module::Expr("his house is in");
  5345 +  entry1_changes[0x47ceb0f63c269d7fULL]["calzone"] = Module::Expr("the village though");
  5346    entry1_changes[0x47ceb0f63c269d7fULL]["cannoli"] =
  5347 -    "he will not see me stopping here";
  5348 +    Module::Expr("he will not see me stopping here");
  5349    EXPECT_THAT(entries[0]->rule_changes, ContainerEq(entry1_changes));
  5350    // Check second entry.
  5351    EXPECT_EQ(0x8064f3af5e067e38ULL, entries[1]->address);
  5352    EXPECT_EQ(0x0de2a5ee55509407ULL, entries[1]->size);
  5353    ASSERT_EQ(3U, entries[1]->initial_rules.size());
  5354    Module::RuleMap entry2_initial;
  5355 -  entry2_initial[".cfa"] = "I think that I shall never see";
  5356 -  entry2_initial["stromboli"] = "a poem lovely as a tree";
  5357 -  entry2_initial["cannoli"] = "a tree whose hungry mouth is prest";
  5358 +  entry2_initial[".cfa"] = Module::Expr("I think that I shall never see");
  5359 +  entry2_initial["stromboli"] = Module::Expr("a poem lovely as a tree");
  5360 +  entry2_initial["cannoli"] = Module::Expr("a tree whose hungry mouth is prest");
  5361    EXPECT_THAT(entries[1]->initial_rules, ContainerEq(entry2_initial));
  5362    ASSERT_EQ(0U, entries[1]->rule_changes.size());
  5363    // Check third entry.
  5364    EXPECT_EQ(0xddb5f41285aa7757ULL, entries[2]->address);
  5365    EXPECT_EQ(0x1486493370dc5073ULL, entries[2]->size);
  5366    ASSERT_EQ(0U, entries[2]->initial_rules.size());
  5367    ASSERT_EQ(0U, entries[2]->rule_changes.size());
  5369 @@ -585,34 +585,34 @@
  5370    entry1->address = 0x2000;
  5371    entry1->size = 0x900;
  5372    m.AddStackFrameEntry(entry1);
  5374    // Second STACK CFI entry, with initial rules but no deltas.
  5375    Module::StackFrameEntry *entry2 = new Module::StackFrameEntry();
  5376    entry2->address = 0x3000;
  5377    entry2->size = 0x900;
  5378 -  entry2->initial_rules[".cfa"] = "I think that I shall never see";
  5379 -  entry2->initial_rules["stromboli"] = "a poem lovely as a tree";
  5380 -  entry2->initial_rules["cannoli"] = "a tree whose hungry mouth is prest";
  5381 +  entry2->initial_rules[".cfa"] = Module::Expr("I think that I shall never see");
  5382 +  entry2->initial_rules["stromboli"] = Module::Expr("a poem lovely as a tree");
  5383 +  entry2->initial_rules["cannoli"] = Module::Expr("a tree whose hungry mouth is prest");
  5384    m.AddStackFrameEntry(entry2);
  5386    // Third STACK CFI entry, with initial rules and deltas.
  5387    Module::StackFrameEntry *entry3 = new Module::StackFrameEntry();
  5388    entry3->address = 0x1000;
  5389    entry3->size = 0x900;
  5390 -  entry3->initial_rules[".cfa"] = "Whose woods are these";
  5391 +  entry3->initial_rules[".cfa"] = Module::Expr("Whose woods are these");
  5392    entry3->rule_changes[0x47ceb0f63c269d7fULL]["calzone"] =
  5393 -    "the village though";
  5394 +    Module::Expr("the village though");
  5395    entry3->rule_changes[0x47ceb0f63c269d7fULL]["cannoli"] =
  5396 -    "he will not see me stopping here";
  5397 +    Module::Expr("he will not see me stopping here");
  5398    entry3->rule_changes[0x36682fad3763ffffULL]["stromboli"] =
  5399 -    "his house is in";
  5400 +    Module::Expr("his house is in");
  5401    entry3->rule_changes[0x36682fad3763ffffULL][".cfa"] =
  5402 -    "I think I know";
  5403 +    Module::Expr("I think I know");
  5404    m.AddStackFrameEntry(entry3);
  5406    Module::StackFrameEntry* s = m.FindStackFrameEntryByAddress(0x1000);
  5407    EXPECT_EQ(entry3, s);
  5408    s = m.FindStackFrameEntryByAddress(0x18FF);
  5409    EXPECT_EQ(entry3, s);
  5411    s = m.FindStackFrameEntryByAddress(0x1900);
  5412 diff --git a/src/processor/cfi_frame_info.cc b/src/processor/cfi_frame_info.cc
  5413 --- a/src/processor/cfi_frame_info.cc
  5414 +++ b/src/processor/cfi_frame_info.cc
  5415 @@ -48,17 +48,17 @@
  5416  #endif
  5418  template<typename V>
  5419  bool CFIFrameInfo::FindCallerRegs(const RegisterValueMap<V> &registers,
  5420                                    const MemoryRegion &memory,
  5421                                    RegisterValueMap<V> *caller_registers) const {
  5422    // If there are not rules for both .ra and .cfa in effect at this address,
  5423    // don't use this CFI data for stack walking.
  5424 -  if (cfa_rule_.empty() || ra_rule_.empty())
  5425 +  if (cfa_rule_.invalid() || ra_rule_.invalid())
  5426      return false;
  5428    RegisterValueMap<V> working;
  5429    PostfixEvaluator<V> evaluator(&working, &memory);
  5431    caller_registers->clear();
  5433    // First, compute the CFA.
  5434 @@ -99,20 +99,20 @@
  5435  template bool CFIFrameInfo::FindCallerRegs<uint64_t>(
  5436      const RegisterValueMap<uint64_t> &registers,
  5437      const MemoryRegion &memory,
  5438      RegisterValueMap<uint64_t> *caller_registers) const;
  5440  string CFIFrameInfo::Serialize() const {
  5441    std::ostringstream stream;
  5443 -  if (!cfa_rule_.empty()) {
  5444 +  if (!cfa_rule_.invalid()) {
  5445      stream << ".cfa: " << cfa_rule_;
  5447 -  if (!ra_rule_.empty()) {
  5448 +  if (!ra_rule_.invalid()) {
  5449      if (static_cast<std::streamoff>(stream.tellp()) != 0)
  5450        stream << " ";
  5451      stream << ".ra: " << ra_rule_;
  5453    for (RuleMap::const_iterator iter = register_rules_.begin();
  5454         iter != register_rules_.end();
  5455         ++iter) {
  5456      if (static_cast<std::streamoff>(stream.tellp()) != 0)
  5457 @@ -166,21 +166,22 @@
  5458    if (name_.empty() || expression_.empty()) return false;
  5459    if (name_ == ".cfa") handler_->CFARule(expression_);
  5460    else if (name_ == ".ra") handler_->RARule(expression_);
  5461    else handler_->RegisterRule(name_, expression_);
  5462    return true;
  5465  void CFIFrameInfoParseHandler::CFARule(const string &expression) {
  5466 -  frame_info_->SetCFARule(expression);
  5467 +  // 'expression' is a postfix expression string.
  5468 +  frame_info_->SetCFARule(Module::Expr(expression));
  5471  void CFIFrameInfoParseHandler::RARule(const string &expression) {
  5472 -  frame_info_->SetRARule(expression);
  5473 +  frame_info_->SetRARule(Module::Expr(expression));
  5476  void CFIFrameInfoParseHandler::RegisterRule(const string &name,
  5477                                              const string &expression) {
  5478 -  frame_info_->SetRegisterRule(name, expression);
  5479 +  frame_info_->SetRegisterRule(name, Module::Expr(expression));
  5482  } // namespace google_breakpad
  5483 diff --git a/src/processor/cfi_frame_info.h b/src/processor/cfi_frame_info.h
  5484 --- a/src/processor/cfi_frame_info.h
  5485 +++ b/src/processor/cfi_frame_info.h
  5486 @@ -38,16 +38,17 @@
  5487  #ifndef PROCESSOR_CFI_FRAME_INFO_H_
  5488  #define PROCESSOR_CFI_FRAME_INFO_H_
  5490  #include <map>
  5491  #include <string>
  5493  #include "common/using_std_string.h"
  5494  #include "google_breakpad/common/breakpad_types.h"
  5495 +#include "common/module.h"
  5497  namespace google_breakpad {
  5499  using std::map;
  5501  class MemoryRegion;
  5503  // A set of rules for recovering the calling frame's registers'
  5504 @@ -61,26 +62,27 @@
  5505  // INIT' record that covers that instruction, and then apply the
  5506  // changes given by the 'STACK CFI' records up to our instruction's
  5507  // address. Then, use the FindCallerRegs member function to apply the
  5508  // rules to the callee frame's register values, yielding the caller
  5509  // frame's register values.
  5510  class CFIFrameInfo {
  5511   public:
  5512    // A map from register names onto values.
  5513 -  template<typename ValueType> class RegisterValueMap: 
  5514 +  template<typename ValueType> class RegisterValueMap:
  5515      public map<string, ValueType> { };
  5517    // Set the expression for computing a call frame address, return
  5518    // address, or register's value. At least the CFA rule and the RA
  5519    // rule must be set before calling FindCallerRegs.
  5520 -  void SetCFARule(const string &expression) { cfa_rule_ = expression; }
  5521 -  void SetRARule(const string &expression)  { ra_rule_ = expression; }
  5522 -  void SetRegisterRule(const string &register_name, const string &expression) {
  5523 -    register_rules_[register_name] = expression;
  5524 +  void SetCFARule(const Module::Expr& rule) { cfa_rule_ = rule; }
  5525 +  void SetRARule(const Module::Expr& rule)  { ra_rule_ = rule; }
  5526 +  void SetRegisterRule(const string& register_name,
  5527 +                       const Module::Expr& rule) {
  5528 +    register_rules_[register_name] = rule;
  5531    // Compute the values of the calling frame's registers, according to
  5532    // this rule set. Use ValueType in expression evaluation; this
  5533    // should be uint32_t on machines with 32-bit addresses, or
  5534    // uint64_t on machines with 64-bit addresses.
  5535    //
  5536    // Return true on success, false otherwise.
  5537 @@ -101,37 +103,33 @@
  5538                        RegisterValueMap<ValueType> *caller_registers) const;
  5540    // Serialize the rules in this object into a string in the format
  5541    // of STACK CFI records.
  5542    string Serialize() const;
  5544   private:
  5546 -  // A map from register names onto evaluation rules. 
  5547 -  typedef map<string, string> RuleMap;
  5548 +  // A map from register names onto evaluation rules.
  5549 +  typedef map<string, Module::Expr> RuleMap;
  5551 -  // In this type, a "postfix expression" is an expression of the sort
  5552 -  // interpreted by google_breakpad::PostfixEvaluator.
  5554 -  // A postfix expression for computing the current frame's CFA (call
  5555 +  // An expression for computing the current frame's CFA (call
  5556    // frame address). The CFA is a reference address for the frame that
  5557    // remains unchanged throughout the frame's lifetime. You should
  5558    // evaluate this expression with a dictionary initially populated
  5559    // with the values of the current frame's known registers.
  5560 -  string cfa_rule_;
  5561 +  Module::Expr cfa_rule_;
  5563    // The following expressions should be evaluated with a dictionary
  5564    // initially populated with the values of the current frame's known
  5565    // registers, and with ".cfa" set to the result of evaluating the
  5566    // cfa_rule expression, above.
  5568 -  // A postfix expression for computing the current frame's return
  5569 -  // address. 
  5570 -  string ra_rule_;
  5571 +  // An expression for computing the current frame's return address.
  5572 +  Module::Expr ra_rule_;
  5574    // For a register named REG, rules[REG] is a postfix expression
  5575    // which leaves the value of REG in the calling frame on the top of
  5576    // the stack. You should evaluate this expression
  5577    RuleMap register_rules_;
  5578  };
  5580  // A parser for STACK CFI-style rule sets.
  5581 diff --git a/src/processor/cfi_frame_info_unittest.cc b/src/processor/cfi_frame_info_unittest.cc
  5582 --- a/src/processor/cfi_frame_info_unittest.cc
  5583 +++ b/src/processor/cfi_frame_info_unittest.cc
  5584 @@ -30,24 +30,26 @@
  5585  // Original author: Jim Blandy <jimb@mozilla.com> <jimb@red-bean.com>
  5587  // cfi_frame_info_unittest.cc: Unit tests for CFIFrameInfo,
  5588  // CFIRuleParser, CFIFrameInfoParseHandler, and SimpleCFIWalker.
  5590  #include <string.h>
  5592  #include "breakpad_googletest_includes.h"
  5593 +#include "common/module.h"
  5594  #include "common/using_std_string.h"
  5595  #include "processor/cfi_frame_info.h"
  5596  #include "google_breakpad/processor/memory_region.h"
  5598  using google_breakpad::CFIFrameInfo;
  5599  using google_breakpad::CFIFrameInfoParseHandler;
  5600  using google_breakpad::CFIRuleParser;
  5601  using google_breakpad::MemoryRegion;
  5602 +using google_breakpad::Module;
  5603  using google_breakpad::SimpleCFIWalker;
  5604  using testing::_;
  5605  using testing::A;
  5606  using testing::AtMost;
  5607  using testing::DoAll;
  5608  using testing::Return;
  5609  using testing::SetArgumentPointee;
  5610  using testing::Test;
  5611 @@ -81,56 +83,56 @@
  5612  };
  5614  class Simple: public CFIFixture, public Test { };
  5616  // FindCallerRegs should fail if no .cfa rule is provided.
  5617  TEST_F(Simple, NoCFA) {
  5618    ExpectNoMemoryReferences();
  5620 -  cfi.SetRARule("0");
  5621 +  cfi.SetRARule(Module::Expr("0"));
  5622    ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  5623                                               &caller_registers));
  5624    ASSERT_EQ(".ra: 0", cfi.Serialize());
  5627  // FindCallerRegs should fail if no .ra rule is provided.
  5628  TEST_F(Simple, NoRA) {
  5629    ExpectNoMemoryReferences();
  5631 -  cfi.SetCFARule("0");
  5632 +  cfi.SetCFARule(Module::Expr("0"));
  5633    ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  5634                                               &caller_registers));
  5635    ASSERT_EQ(".cfa: 0", cfi.Serialize());
  5638  TEST_F(Simple, SetCFAAndRARule) {
  5639    ExpectNoMemoryReferences();
  5641 -  cfi.SetCFARule("330903416631436410");
  5642 -  cfi.SetRARule("5870666104170902211");
  5643 +  cfi.SetCFARule(Module::Expr("330903416631436410"));
  5644 +  cfi.SetRARule(Module::Expr("5870666104170902211"));
  5645    ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  5646                                              &caller_registers));
  5647    ASSERT_EQ(2U, caller_registers.size());
  5648    ASSERT_EQ(330903416631436410ULL, caller_registers[".cfa"]);
  5649    ASSERT_EQ(5870666104170902211ULL, caller_registers[".ra"]);
  5651    ASSERT_EQ(".cfa: 330903416631436410 .ra: 5870666104170902211",
  5652              cfi.Serialize());
  5655  TEST_F(Simple, SetManyRules) {
  5656    ExpectNoMemoryReferences();
  5658 -  cfi.SetCFARule("$temp1 68737028 = $temp2 61072337 = $temp1 $temp2 -");
  5659 -  cfi.SetRARule(".cfa 99804755 +");
  5660 -  cfi.SetRegisterRule("register1", ".cfa 54370437 *");
  5661 -  cfi.SetRegisterRule("vodkathumbscrewingly", "24076308 .cfa +");
  5662 -  cfi.SetRegisterRule("pubvexingfjordschmaltzy", ".cfa 29801007 -");
  5663 -  cfi.SetRegisterRule("uncopyrightables", "92642917 .cfa /");
  5664 +  cfi.SetCFARule(Module::Expr("$temp1 68737028 = $temp2 61072337 = $temp1 $temp2 -"));
  5665 +  cfi.SetRARule(Module::Expr(".cfa 99804755 +"));
  5666 +  cfi.SetRegisterRule("register1", Module::Expr(".cfa 54370437 *"));
  5667 +  cfi.SetRegisterRule("vodkathumbscrewingly", Module::Expr("24076308 .cfa +"));
  5668 +  cfi.SetRegisterRule("pubvexingfjordschmaltzy", Module::Expr(".cfa 29801007 -"));
  5669 +  cfi.SetRegisterRule("uncopyrightables", Module::Expr("92642917 .cfa /"));
  5670    ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  5671                                              &caller_registers));
  5672    ASSERT_EQ(6U, caller_registers.size());
  5673    ASSERT_EQ(7664691U,           caller_registers[".cfa"]);
  5674    ASSERT_EQ(107469446U,         caller_registers[".ra"]);
  5675    ASSERT_EQ(416732599139967ULL, caller_registers["register1"]);
  5676    ASSERT_EQ(31740999U,          caller_registers["vodkathumbscrewingly"]);
  5677    ASSERT_EQ(-22136316ULL,       caller_registers["pubvexingfjordschmaltzy"]);
  5678 @@ -142,154 +144,154 @@
  5679              "uncopyrightables: 92642917 .cfa / "
  5680              "vodkathumbscrewingly: 24076308 .cfa +",
  5681              cfi.Serialize());
  5684  TEST_F(Simple, RulesOverride) {
  5685    ExpectNoMemoryReferences();
  5687 -  cfi.SetCFARule("330903416631436410");
  5688 -  cfi.SetRARule("5870666104170902211");
  5689 -  cfi.SetCFARule("2828089117179001");
  5690 +  cfi.SetCFARule(Module::Expr("330903416631436410"));
  5691 +  cfi.SetRARule(Module::Expr("5870666104170902211"));
  5692 +  cfi.SetCFARule(Module::Expr("2828089117179001"));
  5693    ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  5694                                              &caller_registers));
  5695    ASSERT_EQ(2U, caller_registers.size());
  5696    ASSERT_EQ(2828089117179001ULL, caller_registers[".cfa"]);
  5697    ASSERT_EQ(5870666104170902211ULL, caller_registers[".ra"]);
  5698    ASSERT_EQ(".cfa: 2828089117179001 .ra: 5870666104170902211",
  5699              cfi.Serialize());
  5702  class Scope: public CFIFixture, public Test { };
  5704  // There should be no value for .cfa in scope when evaluating the CFA rule.
  5705  TEST_F(Scope, CFALacksCFA) {
  5706    ExpectNoMemoryReferences();
  5708 -  cfi.SetCFARule(".cfa");
  5709 -  cfi.SetRARule("0");
  5710 +  cfi.SetCFARule(Module::Expr(".cfa"));
  5711 +  cfi.SetRARule(Module::Expr("0"));
  5712    ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  5713                                               &caller_registers));
  5716  // There should be no value for .ra in scope when evaluating the CFA rule.
  5717  TEST_F(Scope, CFALacksRA) {
  5718    ExpectNoMemoryReferences();
  5720 -  cfi.SetCFARule(".ra");
  5721 -  cfi.SetRARule("0");
  5722 +  cfi.SetCFARule(Module::Expr(".ra"));
  5723 +  cfi.SetRARule(Module::Expr("0"));
  5724    ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  5725                                               &caller_registers));
  5728  // The current frame's registers should be in scope when evaluating
  5729  // the CFA rule.
  5730  TEST_F(Scope, CFASeesCurrentRegs) {
  5731    ExpectNoMemoryReferences();
  5733    registers[".baraminology"] = 0x06a7bc63e4f13893ULL;
  5734    registers[".ornithorhynchus"] = 0x5e0bf850bafce9d2ULL;
  5735 -  cfi.SetCFARule(".baraminology .ornithorhynchus +");
  5736 -  cfi.SetRARule("0");
  5737 +  cfi.SetCFARule(Module::Expr(".baraminology .ornithorhynchus +"));
  5738 +  cfi.SetRARule(Module::Expr("0"));
  5739    ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  5740                                              &caller_registers));
  5741    ASSERT_EQ(2U, caller_registers.size());
  5742    ASSERT_EQ(0x06a7bc63e4f13893ULL + 0x5e0bf850bafce9d2ULL,
  5743              caller_registers[".cfa"]);
  5746  // .cfa should be in scope in the return address expression.
  5747  TEST_F(Scope, RASeesCFA) {
  5748    ExpectNoMemoryReferences();
  5750 -  cfi.SetCFARule("48364076");
  5751 -  cfi.SetRARule(".cfa");
  5752 +  cfi.SetCFARule(Module::Expr("48364076"));
  5753 +  cfi.SetRARule(Module::Expr(".cfa"));
  5754    ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  5755                                              &caller_registers));
  5756    ASSERT_EQ(2U, caller_registers.size());
  5757    ASSERT_EQ(48364076U, caller_registers[".ra"]);
  5760  // There should be no value for .ra in scope when evaluating the CFA rule.
  5761  TEST_F(Scope, RALacksRA) {
  5762    ExpectNoMemoryReferences();
  5764 -  cfi.SetCFARule("0");
  5765 -  cfi.SetRARule(".ra");
  5766 +  cfi.SetCFARule(Module::Expr("0"));
  5767 +  cfi.SetRARule(Module::Expr(".ra"));
  5768    ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  5769                                               &caller_registers));
  5772  // The current frame's registers should be in scope in the return
  5773  // address expression.
  5774  TEST_F(Scope, RASeesCurrentRegs) {
  5775    ExpectNoMemoryReferences();
  5777    registers["noachian"] = 0x54dc4a5d8e5eb503ULL;
  5778 -  cfi.SetCFARule("10359370");
  5779 -  cfi.SetRARule("noachian");
  5780 +  cfi.SetCFARule(Module::Expr("10359370"));
  5781 +  cfi.SetRARule(Module::Expr("noachian"));
  5782    ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  5783                                              &caller_registers));
  5784    ASSERT_EQ(2U, caller_registers.size());
  5785    ASSERT_EQ(0x54dc4a5d8e5eb503ULL, caller_registers[".ra"]);
  5788  // .cfa should be in scope for register rules.
  5789  TEST_F(Scope, RegistersSeeCFA) {
  5790    ExpectNoMemoryReferences();
  5792 -  cfi.SetCFARule("6515179");
  5793 -  cfi.SetRARule(".cfa");
  5794 -  cfi.SetRegisterRule("rogerian", ".cfa");
  5795 +  cfi.SetCFARule(Module::Expr("6515179"));
  5796 +  cfi.SetRARule(Module::Expr(".cfa"));
  5797 +  cfi.SetRegisterRule("rogerian", Module::Expr(".cfa"));
  5798    ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  5799                                              &caller_registers));
  5800    ASSERT_EQ(3U, caller_registers.size());
  5801    ASSERT_EQ(6515179U, caller_registers["rogerian"]);
  5804  // The return address should not be in scope for register rules.
  5805  TEST_F(Scope, RegsLackRA) {
  5806    ExpectNoMemoryReferences();
  5808 -  cfi.SetCFARule("42740329");
  5809 -  cfi.SetRARule("27045204");
  5810 -  cfi.SetRegisterRule("$r1", ".ra");
  5811 +  cfi.SetCFARule(Module::Expr("42740329"));
  5812 +  cfi.SetRARule(Module::Expr("27045204"));
  5813 +  cfi.SetRegisterRule("$r1", Module::Expr(".ra"));
  5814    ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  5815                                               &caller_registers));
  5818  // Register rules can see the current frame's register values.
  5819  TEST_F(Scope, RegsSeeRegs) {
  5820    ExpectNoMemoryReferences();
  5822    registers["$r1"] = 0x6ed3582c4bedb9adULL;
  5823    registers["$r2"] = 0xd27d9e742b8df6d0ULL;
  5824 -  cfi.SetCFARule("88239303");
  5825 -  cfi.SetRARule("30503835");
  5826 -  cfi.SetRegisterRule("$r1", "$r1 42175211 = $r2");
  5827 -  cfi.SetRegisterRule("$r2", "$r2 21357221 = $r1");
  5828 +  cfi.SetCFARule(Module::Expr("88239303"));
  5829 +  cfi.SetRARule(Module::Expr("30503835"));
  5830 +  cfi.SetRegisterRule("$r1", Module::Expr("$r1 42175211 = $r2"));
  5831 +  cfi.SetRegisterRule("$r2", Module::Expr("$r2 21357221 = $r1"));
  5832    ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  5833                                              &caller_registers));
  5834    ASSERT_EQ(4U, caller_registers.size());
  5835    ASSERT_EQ(0xd27d9e742b8df6d0ULL, caller_registers["$r1"]);
  5836    ASSERT_EQ(0x6ed3582c4bedb9adULL, caller_registers["$r2"]);
  5839  // Each rule's temporaries are separate.
  5840  TEST_F(Scope, SeparateTempsRA) {
  5841    ExpectNoMemoryReferences();
  5843 -  cfi.SetCFARule("$temp1 76569129 = $temp1");
  5844 -  cfi.SetRARule("0");
  5845 +  cfi.SetCFARule(Module::Expr("$temp1 76569129 = $temp1"));
  5846 +  cfi.SetRARule(Module::Expr("0"));
  5847    ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  5848                                              &caller_registers));
  5850 -  cfi.SetCFARule("$temp1 76569129 = $temp1");
  5851 -  cfi.SetRARule("$temp1");
  5852 +  cfi.SetCFARule(Module::Expr("$temp1 76569129 = $temp1"));
  5853 +  cfi.SetRARule(Module::Expr("$temp1"));
  5854    ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  5855                                               &caller_registers));
  5858  class MockCFIRuleParserHandler: public CFIRuleParser::Handler {
  5859   public:
  5860    MOCK_METHOD1(CFARule, void(const string &));
  5861    MOCK_METHOD1(RARule,  void(const string &));
  5862 @@ -512,20 +514,20 @@
  5863        .WillRepeatedly(DoAll(SetArgumentPointee<1>(0xdc1975eba8602302ULL),
  5864                              Return(true)));
  5865    // Saved return address.
  5866    EXPECT_CALL(memory,
  5867                GetMemoryAtAddress(stack_top + 16, A<uint64_t *>()))
  5868        .WillRepeatedly(DoAll(SetArgumentPointee<1>(0xba5ad6d9acce28deULL),
  5869                              Return(true)));
  5871 -  call_frame_info.SetCFARule("sp 24 +");
  5872 -  call_frame_info.SetRARule(".cfa 8 - ^");
  5873 -  call_frame_info.SetRegisterRule("r0", ".cfa 24 - ^");
  5874 -  call_frame_info.SetRegisterRule("r1", "r2");
  5875 +  call_frame_info.SetCFARule(Module::Expr("sp 24 +"));
  5876 +  call_frame_info.SetRARule(Module::Expr(".cfa 8 - ^"));
  5877 +  call_frame_info.SetRegisterRule("r0", Module::Expr(".cfa 24 - ^"));
  5878 +  call_frame_info.SetRegisterRule("r1", Module::Expr("r2"));
  5880    callee_context.r0 = 0x94e030ca79edd119ULL;
  5881    callee_context.r1 = 0x937b4d7e95ce52d9ULL;
  5882    callee_context.r2 = 0x5fe0027416b8b62aULL; // caller's r1
  5883    // callee_context.r3 is not valid in callee.
  5884    // callee_context.r4 is not valid in callee.
  5885    callee_context.sp = stack_top;
  5886    callee_context.pc = 0x25b21b224311d280ULL;
  5887 diff --git a/src/processor/postfix_evaluator-inl.h b/src/processor/postfix_evaluator-inl.h
  5888 --- a/src/processor/postfix_evaluator-inl.h
  5889 +++ b/src/processor/postfix_evaluator-inl.h
  5890 @@ -226,52 +226,100 @@
  5891        return false;
  5895    return true;
  5898  template<typename ValueType>
  5899 -bool PostfixEvaluator<ValueType>::Evaluate(const string &expression,
  5900 -                                           DictionaryValidityType *assigned) {
  5901 +bool PostfixEvaluator<ValueType>::Evaluate(const Module::Expr& expr,
  5902 +                                           DictionaryValidityType* assigned) {
  5903 +  // The expression is being exevaluated only for its side effects.  Skip
  5904 +  // expressions that denote values only.
  5905 +  if (expr.how_ != Module::kExprPostfix) {
  5906 +    BPLOG(ERROR) << "Can't evaluate for side-effects: " << expr;
  5907 +    return false;
  5908 +  }
  5910    // Ensure that the stack is cleared before returning.
  5911    AutoStackClearer clearer(&stack_);
  5913 -  if (!EvaluateInternal(expression, assigned))
  5914 +  if (!EvaluateInternal(expr.postfix_, assigned))
  5915      return false;
  5917    // If there's anything left on the stack, it indicates incomplete execution.
  5918    // This is a failure case.  If the stack is empty, evalution was complete
  5919    // and successful.
  5920    if (stack_.empty())
  5921      return true;
  5923 -  BPLOG(ERROR) << "Incomplete execution: " << expression;
  5924 +  BPLOG(ERROR) << "Incomplete execution: " << expr;
  5925    return false;
  5928  template<typename ValueType>
  5929 -bool PostfixEvaluator<ValueType>::EvaluateForValue(const string &expression,
  5930 -                                                   ValueType *result) {
  5931 -  // Ensure that the stack is cleared before returning.
  5932 -  AutoStackClearer clearer(&stack_);
  5933 +bool PostfixEvaluator<ValueType>::EvaluateForValue(const Module::Expr& expr,
  5934 +                                                   ValueType* result) {
  5935 +  switch (expr.how_) {
  5937 -  if (!EvaluateInternal(expression, NULL))
  5938 -    return false;
  5939 +    // Postfix expression.  Give to the evaluator and return the
  5940 +    // one-and-only stack element that should be left over.
  5941 +    case Module::kExprPostfix: {
  5942 +      // Ensure that the stack is cleared before returning.
  5943 +      AutoStackClearer clearer(&stack_);
  5945 -  // A successful execution should leave exactly one value on the stack.
  5946 -  if (stack_.size() != 1) {
  5947 -    BPLOG(ERROR) << "Expression yielded bad number of results: "
  5948 -                 << "'" << expression << "'";
  5949 -    return false;
  5950 +      if (!EvaluateInternal(expr.postfix_, NULL))
  5951 +        return false;
  5953 +      // A successful execution should leave exactly one value on the stack.
  5954 +      if (stack_.size() != 1) {
  5955 +        BPLOG(ERROR) << "Expression yielded bad number of results: "
  5956 +                     << "'" << expr << "'";
  5957 +        return false;
  5958 +      }
  5960 +      return PopValue(result);
  5961 +    }
  5963 +    // Simple-form expressions
  5964 +    case Module::kExprSimple:
  5965 +    case Module::kExprSimpleMem: {
  5966 +      // Look up the base value
  5967 +      typename DictionaryType::const_iterator iterator
  5968 +        = dictionary_->find(expr.ident_);
  5969 +      if (iterator == dictionary_->end()) {
  5970 +        // The identifier wasn't found in the dictionary.  Don't imply any
  5971 +        // default value, just fail.
  5972 +        BPLOG(INFO) << "Identifier " << expr.ident_
  5973 +                    << " not in dictionary (kExprSimple{Mem})";
  5974 +        return false;
  5975 +      }
  5977 +      // Form the sum
  5978 +      ValueType sum = iterator->second + (int64_t)expr.offset_;
  5980 +      // and dereference if necessary
  5981 +      if (expr.how_ == Module::kExprSimpleMem) {
  5982 +        ValueType derefd;
  5983 +        if (!memory_ || !memory_->GetMemoryAtAddress(sum, &derefd)) {
  5984 +          return false;
  5985 +        }
  5986 +        *result = derefd;
  5987 +      } else {
  5988 +        *result = sum;
  5989 +      }
  5990 +      return true;
  5991 +    }
  5993 +    default:
  5994 +      return false;
  5996 +}
  5998 -  return PopValue(result);
  5999 -}
  6001  template<typename ValueType>
  6002  typename PostfixEvaluator<ValueType>::PopResult
  6003  PostfixEvaluator<ValueType>::PopValueOrIdentifier(
  6004      ValueType *value, string *identifier) {
  6005    // There needs to be at least one element on the stack to pop.
  6006    if (!stack_.size())
  6007      return POP_RESULT_FAIL;
  6008 diff --git a/src/processor/postfix_evaluator.h b/src/processor/postfix_evaluator.h
  6009 --- a/src/processor/postfix_evaluator.h
  6010 +++ b/src/processor/postfix_evaluator.h
  6011 @@ -70,16 +70,17 @@
  6012  #define PROCESSOR_POSTFIX_EVALUATOR_H__
  6015  #include <map>
  6016  #include <string>
  6017  #include <vector>
  6019  #include "common/using_std_string.h"
  6020 +#include "common/module.h"
  6022  namespace google_breakpad {
  6024  using std::map;
  6025  using std::vector;
  6027  class MemoryRegion;
  6029 @@ -100,23 +101,23 @@
  6031    // Evaluate the expression, starting with an empty stack. The results of
  6032    // execution will be stored in one (or more) variables in the dictionary.
  6033    // Returns false if any failures occur during execution, leaving
  6034    // variables in the dictionary in an indeterminate state. If assigned is
  6035    // non-NULL, any keys set in the dictionary as a result of evaluation
  6036    // will also be set to true in assigned, providing a way to determine if
  6037    // an expression modifies any of its input variables.
  6038 -  bool Evaluate(const string &expression, DictionaryValidityType *assigned);
  6039 +  bool Evaluate(const Module::Expr &expr, DictionaryValidityType *assigned);
  6041 -  // Like Evaluate, but provides the value left on the stack to the
  6042 -  // caller. If evaluation succeeds and leaves exactly one value on
  6043 -  // the stack, pop that value, store it in *result, and return true.
  6044 -  // Otherwise, return false.
  6045 -  bool EvaluateForValue(const string &expression, ValueType *result);
  6046 +  // Like Evaluate, but expects the expression to denote a value.
  6047 +  // If evaluation succeeds and (in the case of a postfix expression)
  6048 +  // leaves exactly one value on the stack, pop that value, store it in
  6049 +  // *result, and return true. Otherwise, return false.
  6050 +  bool EvaluateForValue(const Module::Expr& expression, ValueType* result);
  6052    DictionaryType* dictionary() const { return dictionary_; }
  6054    // Reset the dictionary.  PostfixEvaluator does not take ownership.
  6055    void set_dictionary(DictionaryType *dictionary) {dictionary_ = dictionary; }
  6057   private:
  6058    // Return values for PopValueOrIdentifier

mercurial