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

changeset 0
6474c204b198
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/toolkit/crashreporter/breakpad-patches/02-cfi-rule-repr.patch	Wed Dec 31 06:09:35 2014 +0100
     1.3 @@ -0,0 +1,6058 @@
     1.4 +# HG changeset patch
     1.5 +# User Ted Mielczarek <ted.mielczarek@gmail.com>
     1.6 +# Date 1360255133 18000
     1.7 +# Node ID d23a69a6c34a1f1c21e241f37b388c8689f2386b
     1.8 +# Parent  c3b1109dd392c16a9fe4e85da693010966dbbf0b
     1.9 +Change the representation of CFI rules to avoid postfix expressions in most cases
    1.10 +Patch by Julian Seward <jseward@acm.org>
    1.11 +R=ted
    1.12 +
    1.13 +diff --git a/Makefile.am b/Makefile.am
    1.14 +--- a/Makefile.am
    1.15 ++++ b/Makefile.am
    1.16 +@@ -133,16 +133,17 @@
    1.17 + 	src/google_breakpad/processor/source_line_resolver_base.h \
    1.18 + 	src/google_breakpad/processor/source_line_resolver_interface.h \
    1.19 + 	src/google_breakpad/processor/stack_frame.h \
    1.20 + 	src/google_breakpad/processor/stack_frame_cpu.h \
    1.21 + 	src/google_breakpad/processor/stack_frame_symbolizer.h \
    1.22 + 	src/google_breakpad/processor/stackwalker.h \
    1.23 + 	src/google_breakpad/processor/symbol_supplier.h \
    1.24 + 	src/google_breakpad/processor/system_info.h \
    1.25 ++	src/common/module.cc \
    1.26 + 	src/processor/address_map-inl.h \
    1.27 + 	src/processor/address_map.h \
    1.28 + 	src/processor/basic_code_module.h \
    1.29 + 	src/processor/basic_code_modules.cc \
    1.30 + 	src/processor/basic_code_modules.h \
    1.31 + 	src/processor/basic_source_line_resolver_types.h \
    1.32 + 	src/processor/basic_source_line_resolver.cc \
    1.33 + 	src/processor/binarystream.h \
    1.34 +@@ -555,30 +556,32 @@
    1.35 + 	src/testing/src/gmock-all.cc
    1.36 + src_processor_basic_source_line_resolver_unittest_CPPFLAGS = \
    1.37 + 	-I$(top_srcdir)/src \
    1.38 + 	-I$(top_srcdir)/src/testing/include \
    1.39 + 	-I$(top_srcdir)/src/testing/gtest/include \
    1.40 + 	-I$(top_srcdir)/src/testing/gtest \
    1.41 + 	-I$(top_srcdir)/src/testing
    1.42 + src_processor_basic_source_line_resolver_unittest_LDADD = \
    1.43 ++	src/common/module.o \
    1.44 + 	src/processor/basic_source_line_resolver.o \
    1.45 + 	src/processor/cfi_frame_info.o \
    1.46 + 	src/processor/pathname_stripper.o \
    1.47 + 	src/processor/logging.o \
    1.48 + 	src/processor/source_line_resolver_base.o \
    1.49 + 	src/processor/tokenize.o \
    1.50 + 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
    1.51 + 
    1.52 + src_processor_cfi_frame_info_unittest_SOURCES = \
    1.53 + 	src/processor/cfi_frame_info_unittest.cc \
    1.54 + 	src/testing/gtest/src/gtest-all.cc \
    1.55 + 	src/testing/gtest/src/gtest_main.cc \
    1.56 + 	src/testing/src/gmock-all.cc
    1.57 + src_processor_cfi_frame_info_unittest_LDADD = \
    1.58 ++	src/common/module.o \
    1.59 + 	src/processor/cfi_frame_info.o \
    1.60 + 	src/processor/logging.o \
    1.61 + 	src/processor/pathname_stripper.o \
    1.62 + 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
    1.63 + src_processor_cfi_frame_info_unittest_CPPFLAGS = \
    1.64 + 	-I$(top_srcdir)/src \
    1.65 + 	-I$(top_srcdir)/src/testing/include \
    1.66 + 	-I$(top_srcdir)/src/testing/gtest/include \
    1.67 +@@ -598,16 +601,17 @@
    1.68 + 	src/testing/src/gmock-all.cc
    1.69 + src_processor_exploitability_unittest_CPPFLAGS = \
    1.70 + 	-I$(top_srcdir)/src \
    1.71 + 	-I$(top_srcdir)/src/testing/include \
    1.72 + 	-I$(top_srcdir)/src/testing/gtest/include \
    1.73 + 	-I$(top_srcdir)/src/testing/gtest \
    1.74 + 	-I$(top_srcdir)/src/testing
    1.75 + src_processor_exploitability_unittest_LDADD = \
    1.76 ++	src/common/module.o \
    1.77 + 	src/processor/minidump_processor.o \
    1.78 + 	src/processor/process_state.o \
    1.79 + 	src/processor/disassembler_x86.o \
    1.80 + 	src/processor/exploitability.o \
    1.81 + 	src/processor/exploitability_win.o \
    1.82 + 	src/processor/basic_code_modules.o \
    1.83 + 	src/processor/basic_source_line_resolver.o \
    1.84 + 	src/processor/call_stack.o \
    1.85 +@@ -649,16 +653,17 @@
    1.86 + 	src/testing/src/gmock-all.cc
    1.87 + src_processor_fast_source_line_resolver_unittest_CPPFLAGS = \
    1.88 + 	-I$(top_srcdir)/src \
    1.89 + 	-I$(top_srcdir)/src/testing/include \
    1.90 + 	-I$(top_srcdir)/src/testing/gtest/include \
    1.91 + 	-I$(top_srcdir)/src/testing/gtest \
    1.92 + 	-I$(top_srcdir)/src/testing
    1.93 + src_processor_fast_source_line_resolver_unittest_LDADD = \
    1.94 ++	src/common/module.o \
    1.95 + 	src/processor/fast_source_line_resolver.o \
    1.96 + 	src/processor/basic_source_line_resolver.o \
    1.97 + 	src/processor/cfi_frame_info.o \
    1.98 + 	src/processor/module_comparer.o \
    1.99 + 	src/processor/module_serializer.o \
   1.100 + 	src/processor/pathname_stripper.o \
   1.101 + 	src/processor/logging.o \
   1.102 + 	src/processor/source_line_resolver_base.o \
   1.103 +@@ -686,16 +691,17 @@
   1.104 + 	src/testing/src/gmock-all.cc
   1.105 + src_processor_minidump_processor_unittest_CPPFLAGS = \
   1.106 + 	-I$(top_srcdir)/src \
   1.107 + 	-I$(top_srcdir)/src/testing/include \
   1.108 + 	-I$(top_srcdir)/src/testing/gtest/include \
   1.109 + 	-I$(top_srcdir)/src/testing/gtest \
   1.110 + 	-I$(top_srcdir)/src/testing
   1.111 + src_processor_minidump_processor_unittest_LDADD = \
   1.112 ++	src/common/module.o \
   1.113 + 	src/processor/basic_code_modules.o \
   1.114 + 	src/processor/basic_source_line_resolver.o \
   1.115 + 	src/processor/call_stack.o \
   1.116 + 	src/processor/cfi_frame_info.o \
   1.117 + 	src/processor/disassembler_x86.o \
   1.118 + 	src/processor/exploitability.o \
   1.119 + 	src/processor/exploitability_win.o \
   1.120 + 	src/processor/logging.o \
   1.121 +@@ -799,16 +805,17 @@
   1.122 + 	src/processor/pathname_stripper_unittest.cc
   1.123 + src_processor_pathname_stripper_unittest_LDADD = \
   1.124 + 	src/processor/pathname_stripper.o \
   1.125 + 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
   1.126 + 
   1.127 + src_processor_postfix_evaluator_unittest_SOURCES = \
   1.128 + 	src/processor/postfix_evaluator_unittest.cc
   1.129 + src_processor_postfix_evaluator_unittest_LDADD = \
   1.130 ++	src/common/module.o \
   1.131 + 	src/processor/logging.o \
   1.132 + 	src/processor/pathname_stripper.o \
   1.133 + 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
   1.134 + 
   1.135 + src_processor_range_map_unittest_SOURCES = \
   1.136 + 	src/processor/range_map_unittest.cc
   1.137 + src_processor_range_map_unittest_LDADD = \
   1.138 + 	src/processor/logging.o \
   1.139 +@@ -928,16 +935,17 @@
   1.140 + 	src/processor/basic_code_modules.o \
   1.141 + 	src/processor/logging.o \
   1.142 + 	src/processor/minidump.o \
   1.143 + 	src/processor/pathname_stripper.o
   1.144 + 
   1.145 + src_processor_minidump_stackwalk_SOURCES = \
   1.146 + 	src/processor/minidump_stackwalk.cc
   1.147 + src_processor_minidump_stackwalk_LDADD = \
   1.148 ++	src/common/module.o \
   1.149 + 	src/processor/basic_code_modules.o \
   1.150 + 	src/processor/basic_source_line_resolver.o \
   1.151 + 	src/processor/binarystream.o \
   1.152 + 	src/processor/call_stack.o \
   1.153 + 	src/processor/cfi_frame_info.o \
   1.154 + 	src/processor/disassembler_x86.o \
   1.155 + 	src/processor/exploitability.o \
   1.156 + 	src/processor/exploitability_win.o \
   1.157 +diff --git a/Makefile.in b/Makefile.in
   1.158 +--- a/Makefile.in
   1.159 ++++ b/Makefile.in
   1.160 +@@ -1,14 +1,14 @@
   1.161 +-# Makefile.in generated by automake 1.11.1 from Makefile.am.
   1.162 ++# Makefile.in generated by automake 1.11.3 from Makefile.am.
   1.163 + # @configure_input@
   1.164 + 
   1.165 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
   1.166 +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
   1.167 +-# Inc.
   1.168 ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
   1.169 ++# Foundation, Inc.
   1.170 + # This Makefile.in is free software; the Free Software Foundation
   1.171 + # gives unlimited permission to copy and/or distribute it,
   1.172 + # with or without modifications, as long as this notice is preserved.
   1.173 + 
   1.174 + # This program is distributed in the hope that it will be useful,
   1.175 + # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
   1.176 + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
   1.177 + # PARTICULAR PURPOSE.
   1.178 +@@ -190,16 +190,22 @@
   1.179 +   sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
   1.180 +   $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
   1.181 +     if (++n[$$2] == $(am__install_max)) \
   1.182 +       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
   1.183 +     END { for (dir in files) print dir, files[dir] }'
   1.184 + am__base_list = \
   1.185 +   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   1.186 +   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
   1.187 ++am__uninstall_files_from_dir = { \
   1.188 ++  test -z "$$files" \
   1.189 ++    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
   1.190 ++    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
   1.191 ++         $(am__cd) "$$dir" && rm -f $$files; }; \
   1.192 ++  }
   1.193 + am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
   1.194 + 	"$(DESTDIR)$(docdir)"
   1.195 + LIBRARIES = $(lib_LIBRARIES) $(noinst_LIBRARIES)
   1.196 + AR = ar
   1.197 + ARFLAGS = cru
   1.198 + src_client_linux_libbreakpad_client_a_AR = $(AR) $(ARFLAGS)
   1.199 + src_client_linux_libbreakpad_client_a_LIBADD =
   1.200 + am__src_client_linux_libbreakpad_client_a_SOURCES_DIST =  \
   1.201 +@@ -261,18 +267,18 @@
   1.202 + 	src/google_breakpad/processor/source_line_resolver_base.h \
   1.203 + 	src/google_breakpad/processor/source_line_resolver_interface.h \
   1.204 + 	src/google_breakpad/processor/stack_frame.h \
   1.205 + 	src/google_breakpad/processor/stack_frame_cpu.h \
   1.206 + 	src/google_breakpad/processor/stack_frame_symbolizer.h \
   1.207 + 	src/google_breakpad/processor/stackwalker.h \
   1.208 + 	src/google_breakpad/processor/symbol_supplier.h \
   1.209 + 	src/google_breakpad/processor/system_info.h \
   1.210 +-	src/processor/address_map-inl.h src/processor/address_map.h \
   1.211 +-	src/processor/basic_code_module.h \
   1.212 ++	src/common/module.cc src/processor/address_map-inl.h \
   1.213 ++	src/processor/address_map.h src/processor/basic_code_module.h \
   1.214 + 	src/processor/basic_code_modules.cc \
   1.215 + 	src/processor/basic_code_modules.h \
   1.216 + 	src/processor/basic_source_line_resolver_types.h \
   1.217 + 	src/processor/basic_source_line_resolver.cc \
   1.218 + 	src/processor/binarystream.h src/processor/binarystream.cc \
   1.219 + 	src/processor/call_stack.cc src/processor/cfi_frame_info.cc \
   1.220 + 	src/processor/cfi_frame_info.h \
   1.221 + 	src/processor/contained_range_map-inl.h \
   1.222 +@@ -322,17 +328,19 @@
   1.223 + 	src/processor/static_contained_range_map-inl.h \
   1.224 + 	src/processor/static_contained_range_map.h \
   1.225 + 	src/processor/static_map_iterator-inl.h \
   1.226 + 	src/processor/static_map_iterator.h \
   1.227 + 	src/processor/static_map-inl.h src/processor/static_map.h \
   1.228 + 	src/processor/static_range_map-inl.h \
   1.229 + 	src/processor/static_range_map.h src/processor/tokenize.cc \
   1.230 + 	src/processor/tokenize.h
   1.231 +-@DISABLE_PROCESSOR_FALSE@am_src_libbreakpad_a_OBJECTS = src/processor/basic_code_modules.$(OBJEXT) \
   1.232 ++@DISABLE_PROCESSOR_FALSE@am_src_libbreakpad_a_OBJECTS =  \
   1.233 ++@DISABLE_PROCESSOR_FALSE@	src/common/module.$(OBJEXT) \
   1.234 ++@DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_modules.$(OBJEXT) \
   1.235 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.$(OBJEXT) \
   1.236 + @DISABLE_PROCESSOR_FALSE@	src/processor/binarystream.$(OBJEXT) \
   1.237 + @DISABLE_PROCESSOR_FALSE@	src/processor/call_stack.$(OBJEXT) \
   1.238 + @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.$(OBJEXT) \
   1.239 + @DISABLE_PROCESSOR_FALSE@	src/processor/disassembler_x86.$(OBJEXT) \
   1.240 + @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability.$(OBJEXT) \
   1.241 + @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability_win.$(OBJEXT) \
   1.242 + @DISABLE_PROCESSOR_FALSE@	src/processor/fast_source_line_resolver.$(OBJEXT) \
   1.243 +@@ -620,17 +628,19 @@
   1.244 + am__src_processor_basic_source_line_resolver_unittest_SOURCES_DIST =  \
   1.245 + 	src/processor/basic_source_line_resolver_unittest.cc \
   1.246 + 	src/testing/gtest/src/gtest-all.cc \
   1.247 + 	src/testing/src/gmock-all.cc
   1.248 + @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) \
   1.249 + @DISABLE_PROCESSOR_FALSE@	src/testing/gtest/src/src_processor_basic_source_line_resolver_unittest-gtest-all.$(OBJEXT) \
   1.250 + @DISABLE_PROCESSOR_FALSE@	src/testing/src/src_processor_basic_source_line_resolver_unittest-gmock-all.$(OBJEXT)
   1.251 + src_processor_basic_source_line_resolver_unittest_OBJECTS = $(am_src_processor_basic_source_line_resolver_unittest_OBJECTS)
   1.252 +-@DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_DEPENDENCIES = src/processor/basic_source_line_resolver.o \
   1.253 ++@DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_DEPENDENCIES =  \
   1.254 ++@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   1.255 ++@DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   1.256 + @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   1.257 + @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o \
   1.258 + @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   1.259 + @DISABLE_PROCESSOR_FALSE@	src/processor/source_line_resolver_base.o \
   1.260 + @DISABLE_PROCESSOR_FALSE@	src/processor/tokenize.o \
   1.261 + @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1) \
   1.262 + @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1)
   1.263 + am__src_processor_binarystream_unittest_SOURCES_DIST =  \
   1.264 +@@ -653,16 +663,17 @@
   1.265 + 	src/testing/src/gmock-all.cc
   1.266 + @DISABLE_PROCESSOR_FALSE@am_src_processor_cfi_frame_info_unittest_OBJECTS = src/processor/src_processor_cfi_frame_info_unittest-cfi_frame_info_unittest.$(OBJEXT) \
   1.267 + @DISABLE_PROCESSOR_FALSE@	src/testing/gtest/src/src_processor_cfi_frame_info_unittest-gtest-all.$(OBJEXT) \
   1.268 + @DISABLE_PROCESSOR_FALSE@	src/testing/gtest/src/src_processor_cfi_frame_info_unittest-gtest_main.$(OBJEXT) \
   1.269 + @DISABLE_PROCESSOR_FALSE@	src/testing/src/src_processor_cfi_frame_info_unittest-gmock-all.$(OBJEXT)
   1.270 + src_processor_cfi_frame_info_unittest_OBJECTS =  \
   1.271 + 	$(am_src_processor_cfi_frame_info_unittest_OBJECTS)
   1.272 + @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_DEPENDENCIES =  \
   1.273 ++@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   1.274 + @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   1.275 + @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   1.276 + @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o \
   1.277 + @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1) \
   1.278 + @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1)
   1.279 + am__src_processor_contained_range_map_unittest_SOURCES_DIST =  \
   1.280 + 	src/processor/contained_range_map_unittest.cc
   1.281 + @DISABLE_PROCESSOR_FALSE@am_src_processor_contained_range_map_unittest_OBJECTS = src/processor/contained_range_map_unittest.$(OBJEXT)
   1.282 +@@ -694,16 +705,17 @@
   1.283 + 	src/testing/src/gmock-all.cc
   1.284 + @DISABLE_PROCESSOR_FALSE@am_src_processor_exploitability_unittest_OBJECTS = src/processor/src_processor_exploitability_unittest-exploitability_unittest.$(OBJEXT) \
   1.285 + @DISABLE_PROCESSOR_FALSE@	src/testing/gtest/src/src_processor_exploitability_unittest-gtest-all.$(OBJEXT) \
   1.286 + @DISABLE_PROCESSOR_FALSE@	src/testing/gtest/src/src_processor_exploitability_unittest-gtest_main.$(OBJEXT) \
   1.287 + @DISABLE_PROCESSOR_FALSE@	src/testing/src/src_processor_exploitability_unittest-gmock-all.$(OBJEXT)
   1.288 + src_processor_exploitability_unittest_OBJECTS =  \
   1.289 + 	$(am_src_processor_exploitability_unittest_OBJECTS)
   1.290 + @DISABLE_PROCESSOR_FALSE@src_processor_exploitability_unittest_DEPENDENCIES =  \
   1.291 ++@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   1.292 + @DISABLE_PROCESSOR_FALSE@	src/processor/minidump_processor.o \
   1.293 + @DISABLE_PROCESSOR_FALSE@	src/processor/process_state.o \
   1.294 + @DISABLE_PROCESSOR_FALSE@	src/processor/disassembler_x86.o \
   1.295 + @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability.o \
   1.296 + @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability_win.o \
   1.297 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_modules.o \
   1.298 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   1.299 + @DISABLE_PROCESSOR_FALSE@	src/processor/call_stack.o \
   1.300 +@@ -726,17 +738,19 @@
   1.301 + am__src_processor_fast_source_line_resolver_unittest_SOURCES_DIST =  \
   1.302 + 	src/processor/fast_source_line_resolver_unittest.cc \
   1.303 + 	src/testing/gtest/src/gtest-all.cc \
   1.304 + 	src/testing/src/gmock-all.cc
   1.305 + @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) \
   1.306 + @DISABLE_PROCESSOR_FALSE@	src/testing/gtest/src/src_processor_fast_source_line_resolver_unittest-gtest-all.$(OBJEXT) \
   1.307 + @DISABLE_PROCESSOR_FALSE@	src/testing/src/src_processor_fast_source_line_resolver_unittest-gmock-all.$(OBJEXT)
   1.308 + src_processor_fast_source_line_resolver_unittest_OBJECTS = $(am_src_processor_fast_source_line_resolver_unittest_OBJECTS)
   1.309 +-@DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_DEPENDENCIES = src/processor/fast_source_line_resolver.o \
   1.310 ++@DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_DEPENDENCIES =  \
   1.311 ++@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   1.312 ++@DISABLE_PROCESSOR_FALSE@	src/processor/fast_source_line_resolver.o \
   1.313 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   1.314 + @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   1.315 + @DISABLE_PROCESSOR_FALSE@	src/processor/module_comparer.o \
   1.316 + @DISABLE_PROCESSOR_FALSE@	src/processor/module_serializer.o \
   1.317 + @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o \
   1.318 + @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   1.319 + @DISABLE_PROCESSOR_FALSE@	src/processor/source_line_resolver_base.o \
   1.320 + @DISABLE_PROCESSOR_FALSE@	src/processor/tokenize.o \
   1.321 +@@ -771,16 +785,17 @@
   1.322 + 	src/testing/gtest/src/gtest-all.cc \
   1.323 + 	src/testing/src/gmock-all.cc
   1.324 + @DISABLE_PROCESSOR_FALSE@am_src_processor_minidump_processor_unittest_OBJECTS = src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.$(OBJEXT) \
   1.325 + @DISABLE_PROCESSOR_FALSE@	src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.$(OBJEXT) \
   1.326 + @DISABLE_PROCESSOR_FALSE@	src/testing/src/src_processor_minidump_processor_unittest-gmock-all.$(OBJEXT)
   1.327 + src_processor_minidump_processor_unittest_OBJECTS =  \
   1.328 + 	$(am_src_processor_minidump_processor_unittest_OBJECTS)
   1.329 + @DISABLE_PROCESSOR_FALSE@src_processor_minidump_processor_unittest_DEPENDENCIES =  \
   1.330 ++@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   1.331 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_modules.o \
   1.332 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   1.333 + @DISABLE_PROCESSOR_FALSE@	src/processor/call_stack.o \
   1.334 + @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   1.335 + @DISABLE_PROCESSOR_FALSE@	src/processor/disassembler_x86.o \
   1.336 + @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability.o \
   1.337 + @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability_win.o \
   1.338 + @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   1.339 +@@ -801,16 +816,17 @@
   1.340 + @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1) \
   1.341 + @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1)
   1.342 + am__src_processor_minidump_stackwalk_SOURCES_DIST =  \
   1.343 + 	src/processor/minidump_stackwalk.cc
   1.344 + @DISABLE_PROCESSOR_FALSE@am_src_processor_minidump_stackwalk_OBJECTS = src/processor/minidump_stackwalk.$(OBJEXT)
   1.345 + src_processor_minidump_stackwalk_OBJECTS =  \
   1.346 + 	$(am_src_processor_minidump_stackwalk_OBJECTS)
   1.347 + @DISABLE_PROCESSOR_FALSE@src_processor_minidump_stackwalk_DEPENDENCIES =  \
   1.348 ++@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   1.349 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_modules.o \
   1.350 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   1.351 + @DISABLE_PROCESSOR_FALSE@	src/processor/binarystream.o \
   1.352 + @DISABLE_PROCESSOR_FALSE@	src/processor/call_stack.o \
   1.353 + @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   1.354 + @DISABLE_PROCESSOR_FALSE@	src/processor/disassembler_x86.o \
   1.355 + @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability.o \
   1.356 + @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability_win.o \
   1.357 +@@ -862,16 +878,17 @@
   1.358 + @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1) \
   1.359 + @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1)
   1.360 + am__src_processor_postfix_evaluator_unittest_SOURCES_DIST =  \
   1.361 + 	src/processor/postfix_evaluator_unittest.cc
   1.362 + @DISABLE_PROCESSOR_FALSE@am_src_processor_postfix_evaluator_unittest_OBJECTS = src/processor/postfix_evaluator_unittest.$(OBJEXT)
   1.363 + src_processor_postfix_evaluator_unittest_OBJECTS =  \
   1.364 + 	$(am_src_processor_postfix_evaluator_unittest_OBJECTS)
   1.365 + @DISABLE_PROCESSOR_FALSE@src_processor_postfix_evaluator_unittest_DEPENDENCIES =  \
   1.366 ++@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   1.367 + @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   1.368 + @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o \
   1.369 + @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1) \
   1.370 + @DISABLE_PROCESSOR_FALSE@	$(am__DEPENDENCIES_1)
   1.371 + am__src_processor_range_map_unittest_SOURCES_DIST =  \
   1.372 + 	src/processor/range_map_unittest.cc
   1.373 + @DISABLE_PROCESSOR_FALSE@am_src_processor_range_map_unittest_OBJECTS = src/processor/range_map_unittest.$(OBJEXT)
   1.374 + src_processor_range_map_unittest_OBJECTS =  \
   1.375 +@@ -1212,22 +1229,26 @@
   1.376 + ETAGS = etags
   1.377 + CTAGS = ctags
   1.378 + am__tty_colors = \
   1.379 + red=; grn=; lgn=; blu=; std=
   1.380 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
   1.381 + distdir = $(PACKAGE)-$(VERSION)
   1.382 + top_distdir = $(distdir)
   1.383 + am__remove_distdir = \
   1.384 +-  { test ! -d "$(distdir)" \
   1.385 +-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
   1.386 +-         && rm -fr "$(distdir)"; }; }
   1.387 ++  if test -d "$(distdir)"; then \
   1.388 ++    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
   1.389 ++      && rm -rf "$(distdir)" \
   1.390 ++      || { sleep 5 && rm -rf "$(distdir)"; }; \
   1.391 ++  else :; fi
   1.392 + DIST_ARCHIVES = $(distdir).tar.gz
   1.393 + GZIP_ENV = --best
   1.394 + distuninstallcheck_listfiles = find . -type f -print
   1.395 ++am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   1.396 ++  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
   1.397 + distcleancheck_listfiles = find . -type f -print
   1.398 + ACLOCAL = @ACLOCAL@
   1.399 + AMTAR = @AMTAR@
   1.400 + AUTOCONF = @AUTOCONF@
   1.401 + AUTOHEADER = @AUTOHEADER@
   1.402 + AUTOMAKE = @AUTOMAKE@
   1.403 + AWK = @AWK@
   1.404 + CC = @CC@
   1.405 +@@ -1383,16 +1404,17 @@
   1.406 + @DISABLE_PROCESSOR_FALSE@	src/google_breakpad/processor/source_line_resolver_base.h \
   1.407 + @DISABLE_PROCESSOR_FALSE@	src/google_breakpad/processor/source_line_resolver_interface.h \
   1.408 + @DISABLE_PROCESSOR_FALSE@	src/google_breakpad/processor/stack_frame.h \
   1.409 + @DISABLE_PROCESSOR_FALSE@	src/google_breakpad/processor/stack_frame_cpu.h \
   1.410 + @DISABLE_PROCESSOR_FALSE@	src/google_breakpad/processor/stack_frame_symbolizer.h \
   1.411 + @DISABLE_PROCESSOR_FALSE@	src/google_breakpad/processor/stackwalker.h \
   1.412 + @DISABLE_PROCESSOR_FALSE@	src/google_breakpad/processor/symbol_supplier.h \
   1.413 + @DISABLE_PROCESSOR_FALSE@	src/google_breakpad/processor/system_info.h \
   1.414 ++@DISABLE_PROCESSOR_FALSE@	src/common/module.cc \
   1.415 + @DISABLE_PROCESSOR_FALSE@	src/processor/address_map-inl.h \
   1.416 + @DISABLE_PROCESSOR_FALSE@	src/processor/address_map.h \
   1.417 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_module.h \
   1.418 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_modules.cc \
   1.419 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_modules.h \
   1.420 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver_types.h \
   1.421 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.cc \
   1.422 + @DISABLE_PROCESSOR_FALSE@	src/processor/binarystream.h \
   1.423 +@@ -1715,31 +1737,33 @@
   1.424 + @DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_CPPFLAGS = \
   1.425 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src \
   1.426 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/include \
   1.427 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/gtest/include \
   1.428 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/gtest \
   1.429 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing
   1.430 + 
   1.431 + @DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_LDADD = \
   1.432 ++@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   1.433 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   1.434 + @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   1.435 + @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o \
   1.436 + @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   1.437 + @DISABLE_PROCESSOR_FALSE@	src/processor/source_line_resolver_base.o \
   1.438 + @DISABLE_PROCESSOR_FALSE@	src/processor/tokenize.o \
   1.439 + @DISABLE_PROCESSOR_FALSE@	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
   1.440 + 
   1.441 + @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_SOURCES = \
   1.442 + @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info_unittest.cc \
   1.443 + @DISABLE_PROCESSOR_FALSE@	src/testing/gtest/src/gtest-all.cc \
   1.444 + @DISABLE_PROCESSOR_FALSE@	src/testing/gtest/src/gtest_main.cc \
   1.445 + @DISABLE_PROCESSOR_FALSE@	src/testing/src/gmock-all.cc
   1.446 + 
   1.447 + @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_LDADD = \
   1.448 ++@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   1.449 + @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   1.450 + @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   1.451 + @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o \
   1.452 + @DISABLE_PROCESSOR_FALSE@	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
   1.453 + 
   1.454 + @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_CPPFLAGS = \
   1.455 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src \
   1.456 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/include \
   1.457 +@@ -1763,16 +1787,17 @@
   1.458 + @DISABLE_PROCESSOR_FALSE@src_processor_exploitability_unittest_CPPFLAGS = \
   1.459 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src \
   1.460 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/include \
   1.461 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/gtest/include \
   1.462 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/gtest \
   1.463 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing
   1.464 + 
   1.465 + @DISABLE_PROCESSOR_FALSE@src_processor_exploitability_unittest_LDADD = \
   1.466 ++@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   1.467 + @DISABLE_PROCESSOR_FALSE@	src/processor/minidump_processor.o \
   1.468 + @DISABLE_PROCESSOR_FALSE@	src/processor/process_state.o \
   1.469 + @DISABLE_PROCESSOR_FALSE@	src/processor/disassembler_x86.o \
   1.470 + @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability.o \
   1.471 + @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability_win.o \
   1.472 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_modules.o \
   1.473 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   1.474 + @DISABLE_PROCESSOR_FALSE@	src/processor/call_stack.o \
   1.475 +@@ -1818,16 +1843,17 @@
   1.476 + @DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_CPPFLAGS = \
   1.477 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src \
   1.478 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/include \
   1.479 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/gtest/include \
   1.480 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/gtest \
   1.481 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing
   1.482 + 
   1.483 + @DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_LDADD = \
   1.484 ++@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   1.485 + @DISABLE_PROCESSOR_FALSE@	src/processor/fast_source_line_resolver.o \
   1.486 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   1.487 + @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   1.488 + @DISABLE_PROCESSOR_FALSE@	src/processor/module_comparer.o \
   1.489 + @DISABLE_PROCESSOR_FALSE@	src/processor/module_serializer.o \
   1.490 + @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o \
   1.491 + @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   1.492 + @DISABLE_PROCESSOR_FALSE@	src/processor/source_line_resolver_base.o \
   1.493 +@@ -1859,16 +1885,17 @@
   1.494 + @DISABLE_PROCESSOR_FALSE@src_processor_minidump_processor_unittest_CPPFLAGS = \
   1.495 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src \
   1.496 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/include \
   1.497 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/gtest/include \
   1.498 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing/gtest \
   1.499 + @DISABLE_PROCESSOR_FALSE@	-I$(top_srcdir)/src/testing
   1.500 + 
   1.501 + @DISABLE_PROCESSOR_FALSE@src_processor_minidump_processor_unittest_LDADD = \
   1.502 ++@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   1.503 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_modules.o \
   1.504 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   1.505 + @DISABLE_PROCESSOR_FALSE@	src/processor/call_stack.o \
   1.506 + @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   1.507 + @DISABLE_PROCESSOR_FALSE@	src/processor/disassembler_x86.o \
   1.508 + @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability.o \
   1.509 + @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability_win.o \
   1.510 + @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   1.511 +@@ -1984,16 +2011,17 @@
   1.512 + @DISABLE_PROCESSOR_FALSE@src_processor_pathname_stripper_unittest_LDADD = \
   1.513 + @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o \
   1.514 + @DISABLE_PROCESSOR_FALSE@	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
   1.515 + 
   1.516 + @DISABLE_PROCESSOR_FALSE@src_processor_postfix_evaluator_unittest_SOURCES = \
   1.517 + @DISABLE_PROCESSOR_FALSE@	src/processor/postfix_evaluator_unittest.cc
   1.518 + 
   1.519 + @DISABLE_PROCESSOR_FALSE@src_processor_postfix_evaluator_unittest_LDADD = \
   1.520 ++@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   1.521 + @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   1.522 + @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o \
   1.523 + @DISABLE_PROCESSOR_FALSE@	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
   1.524 + 
   1.525 + @DISABLE_PROCESSOR_FALSE@src_processor_range_map_unittest_SOURCES = \
   1.526 + @DISABLE_PROCESSOR_FALSE@	src/processor/range_map_unittest.cc
   1.527 + 
   1.528 + @DISABLE_PROCESSOR_FALSE@src_processor_range_map_unittest_LDADD = \
   1.529 +@@ -2122,16 +2150,17 @@
   1.530 + @DISABLE_PROCESSOR_FALSE@	src/processor/logging.o \
   1.531 + @DISABLE_PROCESSOR_FALSE@	src/processor/minidump.o \
   1.532 + @DISABLE_PROCESSOR_FALSE@	src/processor/pathname_stripper.o
   1.533 + 
   1.534 + @DISABLE_PROCESSOR_FALSE@src_processor_minidump_stackwalk_SOURCES = \
   1.535 + @DISABLE_PROCESSOR_FALSE@	src/processor/minidump_stackwalk.cc
   1.536 + 
   1.537 + @DISABLE_PROCESSOR_FALSE@src_processor_minidump_stackwalk_LDADD = \
   1.538 ++@DISABLE_PROCESSOR_FALSE@	src/common/module.o \
   1.539 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_code_modules.o \
   1.540 + @DISABLE_PROCESSOR_FALSE@	src/processor/basic_source_line_resolver.o \
   1.541 + @DISABLE_PROCESSOR_FALSE@	src/processor/binarystream.o \
   1.542 + @DISABLE_PROCESSOR_FALSE@	src/processor/call_stack.o \
   1.543 + @DISABLE_PROCESSOR_FALSE@	src/processor/cfi_frame_info.o \
   1.544 + @DISABLE_PROCESSOR_FALSE@	src/processor/disassembler_x86.o \
   1.545 + @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability.o \
   1.546 + @DISABLE_PROCESSOR_FALSE@	src/processor/exploitability_win.o \
   1.547 +@@ -2289,17 +2318,17 @@
   1.548 + 	src/tools/windows/dump_syms/testdata/dump_syms_regtest.sym \
   1.549 + 	src/tools/windows/symupload/symupload.cc \
   1.550 + 	src/tools/windows/symupload/symupload.vcproj
   1.551 + 
   1.552 + all: all-am
   1.553 + 
   1.554 + .SUFFIXES:
   1.555 + .SUFFIXES: .S .c .cc .o .obj
   1.556 +-am--refresh:
   1.557 ++am--refresh: Makefile
   1.558 + 	@:
   1.559 + $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
   1.560 + 	@for dep in $?; do \
   1.561 + 	  case '$(am__configure_deps)' in \
   1.562 + 	    *$$dep*) \
   1.563 + 	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
   1.564 + 	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
   1.565 + 		&& exit 0; \
   1.566 +@@ -2325,20 +2354,18 @@
   1.567 + 
   1.568 + $(top_srcdir)/configure:  $(am__configure_deps)
   1.569 + 	$(am__cd) $(srcdir) && $(AUTOCONF)
   1.570 + $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
   1.571 + 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
   1.572 + $(am__aclocal_m4_deps):
   1.573 + 
   1.574 + src/config.h: src/stamp-h1
   1.575 +-	@if test ! -f $@; then \
   1.576 +-	  rm -f src/stamp-h1; \
   1.577 +-	  $(MAKE) $(AM_MAKEFLAGS) src/stamp-h1; \
   1.578 +-	else :; fi
   1.579 ++	@if test ! -f $@; then rm -f src/stamp-h1; else :; fi
   1.580 ++	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) src/stamp-h1; else :; fi
   1.581 + 
   1.582 + src/stamp-h1: $(top_srcdir)/src/config.h.in $(top_builddir)/config.status
   1.583 + 	@rm -f src/stamp-h1
   1.584 + 	cd $(top_builddir) && $(SHELL) ./config.status src/config.h
   1.585 + $(top_srcdir)/src/config.h.in:  $(am__configure_deps) 
   1.586 + 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
   1.587 + 	rm -f src/stamp-h1
   1.588 + 	touch $@
   1.589 +@@ -2366,19 +2393,17 @@
   1.590 + 	    ( cd "$(DESTDIR)$(libdir)" && $(RANLIB) $$f ) || exit $$?; \
   1.591 + 	  else :; fi; \
   1.592 + 	done
   1.593 + 
   1.594 + uninstall-libLIBRARIES:
   1.595 + 	@$(NORMAL_UNINSTALL)
   1.596 + 	@list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
   1.597 + 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
   1.598 +-	test -n "$$files" || exit 0; \
   1.599 +-	echo " ( cd '$(DESTDIR)$(libdir)' && rm -f "$$files" )"; \
   1.600 +-	cd "$(DESTDIR)$(libdir)" && rm -f $$files
   1.601 ++	dir='$(DESTDIR)$(libdir)'; $(am__uninstall_files_from_dir)
   1.602 + 
   1.603 + clean-libLIBRARIES:
   1.604 + 	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
   1.605 + 
   1.606 + clean-noinstLIBRARIES:
   1.607 + 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
   1.608 + src/client/linux/crash_generation/$(am__dirstamp):
   1.609 + 	@$(MKDIR_P) src/client/linux/crash_generation
   1.610 +@@ -2477,20 +2502,22 @@
   1.611 + 	@$(MKDIR_P) src/common/android/$(DEPDIR)
   1.612 + 	@: > src/common/android/$(DEPDIR)/$(am__dirstamp)
   1.613 + src/common/android/breakpad_getcontext.$(OBJEXT):  \
   1.614 + 	src/common/android/$(am__dirstamp) \
   1.615 + 	src/common/android/$(DEPDIR)/$(am__dirstamp)
   1.616 + src/client/linux/$(am__dirstamp):
   1.617 + 	@$(MKDIR_P) src/client/linux
   1.618 + 	@: > src/client/linux/$(am__dirstamp)
   1.619 +-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)
   1.620 ++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)
   1.621 + 	-rm -f src/client/linux/libbreakpad_client.a
   1.622 + 	$(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)
   1.623 + 	$(RANLIB) src/client/linux/libbreakpad_client.a
   1.624 ++src/common/module.$(OBJEXT): src/common/$(am__dirstamp) \
   1.625 ++	src/common/$(DEPDIR)/$(am__dirstamp)
   1.626 + src/processor/$(am__dirstamp):
   1.627 + 	@$(MKDIR_P) src/processor
   1.628 + 	@: > src/processor/$(am__dirstamp)
   1.629 + src/processor/$(DEPDIR)/$(am__dirstamp):
   1.630 + 	@$(MKDIR_P) src/processor/$(DEPDIR)
   1.631 + 	@: > src/processor/$(DEPDIR)/$(am__dirstamp)
   1.632 + src/processor/basic_code_modules.$(OBJEXT):  \
   1.633 + 	src/processor/$(am__dirstamp) \
   1.634 +@@ -2559,17 +2586,17 @@
   1.635 + src/processor/stackwalker_x86.$(OBJEXT):  \
   1.636 + 	src/processor/$(am__dirstamp) \
   1.637 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.638 + src/processor/tokenize.$(OBJEXT): src/processor/$(am__dirstamp) \
   1.639 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.640 + src/$(am__dirstamp):
   1.641 + 	@$(MKDIR_P) src
   1.642 + 	@: > src/$(am__dirstamp)
   1.643 +-src/libbreakpad.a: $(src_libbreakpad_a_OBJECTS) $(src_libbreakpad_a_DEPENDENCIES) src/$(am__dirstamp)
   1.644 ++src/libbreakpad.a: $(src_libbreakpad_a_OBJECTS) $(src_libbreakpad_a_DEPENDENCIES) $(EXTRA_src_libbreakpad_a_DEPENDENCIES) src/$(am__dirstamp)
   1.645 + 	-rm -f src/libbreakpad.a
   1.646 + 	$(src_libbreakpad_a_AR) src/libbreakpad.a $(src_libbreakpad_a_OBJECTS) $(src_libbreakpad_a_LIBADD)
   1.647 + 	$(RANLIB) src/libbreakpad.a
   1.648 + src/third_party/libdisasm/$(am__dirstamp):
   1.649 + 	@$(MKDIR_P) src/third_party/libdisasm
   1.650 + 	@: > src/third_party/libdisasm/$(am__dirstamp)
   1.651 + src/third_party/libdisasm/$(DEPDIR)/$(am__dirstamp):
   1.652 + 	@$(MKDIR_P) src/third_party/libdisasm/$(DEPDIR)
   1.653 +@@ -2611,17 +2638,17 @@
   1.654 + 	src/third_party/libdisasm/$(am__dirstamp) \
   1.655 + 	src/third_party/libdisasm/$(DEPDIR)/$(am__dirstamp)
   1.656 + src/third_party/libdisasm/x86_misc.$(OBJEXT):  \
   1.657 + 	src/third_party/libdisasm/$(am__dirstamp) \
   1.658 + 	src/third_party/libdisasm/$(DEPDIR)/$(am__dirstamp)
   1.659 + src/third_party/libdisasm/x86_operand_list.$(OBJEXT):  \
   1.660 + 	src/third_party/libdisasm/$(am__dirstamp) \
   1.661 + 	src/third_party/libdisasm/$(DEPDIR)/$(am__dirstamp)
   1.662 +-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)
   1.663 ++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)
   1.664 + 	-rm -f src/third_party/libdisasm/libdisasm.a
   1.665 + 	$(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)
   1.666 + 	$(RANLIB) src/third_party/libdisasm/libdisasm.a
   1.667 + install-binPROGRAMS: $(bin_PROGRAMS)
   1.668 + 	@$(NORMAL_INSTALL)
   1.669 + 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
   1.670 + 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
   1.671 + 	for p in $$list; do echo "$$p $$p"; done | \
   1.672 +@@ -2658,17 +2685,17 @@
   1.673 + clean-binPROGRAMS:
   1.674 + 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
   1.675 + 
   1.676 + clean-checkPROGRAMS:
   1.677 + 	-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
   1.678 + 
   1.679 + clean-noinstPROGRAMS:
   1.680 + 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
   1.681 +-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)
   1.682 ++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)
   1.683 + 	@rm -f src/client/linux/linux_client_unittest$(EXEEXT)
   1.684 + 	$(src_client_linux_linux_client_unittest_LINK) $(src_client_linux_linux_client_unittest_OBJECTS) $(src_client_linux_linux_client_unittest_LDADD) $(LIBS)
   1.685 + src/client/linux/handler/src_client_linux_linux_client_unittest_shlib-exception_handler_unittest.$(OBJEXT):  \
   1.686 + 	src/client/linux/handler/$(am__dirstamp) \
   1.687 + 	src/client/linux/handler/$(DEPDIR)/$(am__dirstamp)
   1.688 + src/client/linux/minidump_writer/src_client_linux_linux_client_unittest_shlib-directory_reader_unittest.$(OBJEXT):  \
   1.689 + 	src/client/linux/minidump_writer/$(am__dirstamp) \
   1.690 + 	src/client/linux/minidump_writer/$(DEPDIR)/$(am__dirstamp)
   1.691 +@@ -2751,23 +2778,23 @@
   1.692 + 	src/processor/$(am__dirstamp) \
   1.693 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.694 + src/common/android/src_client_linux_linux_client_unittest_shlib-breakpad_getcontext.$(OBJEXT):  \
   1.695 + 	src/common/android/$(am__dirstamp) \
   1.696 + 	src/common/android/$(DEPDIR)/$(am__dirstamp)
   1.697 + src/common/android/src_client_linux_linux_client_unittest_shlib-breakpad_getcontext_unittest.$(OBJEXT):  \
   1.698 + 	src/common/android/$(am__dirstamp) \
   1.699 + 	src/common/android/$(DEPDIR)/$(am__dirstamp)
   1.700 +-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)
   1.701 ++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)
   1.702 + 	@rm -f src/client/linux/linux_client_unittest_shlib$(EXEEXT)
   1.703 + 	$(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)
   1.704 + src/client/linux/minidump_writer/src_client_linux_linux_dumper_unittest_helper-linux_dumper_unittest_helper.$(OBJEXT):  \
   1.705 + 	src/client/linux/minidump_writer/$(am__dirstamp) \
   1.706 + 	src/client/linux/minidump_writer/$(DEPDIR)/$(am__dirstamp)
   1.707 +-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)
   1.708 ++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)
   1.709 + 	@rm -f src/client/linux/linux_dumper_unittest_helper$(EXEEXT)
   1.710 + 	$(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)
   1.711 + src/common/src_common_dumper_unittest-byte_cursor_unittest.$(OBJEXT):  \
   1.712 + 	src/common/$(am__dirstamp) \
   1.713 + 	src/common/$(DEPDIR)/$(am__dirstamp)
   1.714 + src/common/src_common_dumper_unittest-dwarf_cfi_to_module.$(OBJEXT):  \
   1.715 + 	src/common/$(am__dirstamp) \
   1.716 + 	src/common/$(DEPDIR)/$(am__dirstamp)
   1.717 +@@ -2901,17 +2928,17 @@
   1.718 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.719 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.720 + src/testing/gtest/src/src_common_dumper_unittest-gtest_main.$(OBJEXT):  \
   1.721 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.722 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.723 + src/testing/src/src_common_dumper_unittest-gmock-all.$(OBJEXT):  \
   1.724 + 	src/testing/src/$(am__dirstamp) \
   1.725 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   1.726 +-src/common/dumper_unittest$(EXEEXT): $(src_common_dumper_unittest_OBJECTS) $(src_common_dumper_unittest_DEPENDENCIES) src/common/$(am__dirstamp)
   1.727 ++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)
   1.728 + 	@rm -f src/common/dumper_unittest$(EXEEXT)
   1.729 + 	$(CXXLINK) $(src_common_dumper_unittest_OBJECTS) $(src_common_dumper_unittest_LDADD) $(LIBS)
   1.730 + src/common/src_common_test_assembler_unittest-test_assembler.$(OBJEXT):  \
   1.731 + 	src/common/$(am__dirstamp) \
   1.732 + 	src/common/$(DEPDIR)/$(am__dirstamp)
   1.733 + src/common/src_common_test_assembler_unittest-test_assembler_unittest.$(OBJEXT):  \
   1.734 + 	src/common/$(am__dirstamp) \
   1.735 + 	src/common/$(DEPDIR)/$(am__dirstamp)
   1.736 +@@ -2919,145 +2946,145 @@
   1.737 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.738 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.739 + src/testing/gtest/src/src_common_test_assembler_unittest-gtest_main.$(OBJEXT):  \
   1.740 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.741 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.742 + src/testing/src/src_common_test_assembler_unittest-gmock-all.$(OBJEXT):  \
   1.743 + 	src/testing/src/$(am__dirstamp) \
   1.744 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   1.745 +-src/common/test_assembler_unittest$(EXEEXT): $(src_common_test_assembler_unittest_OBJECTS) $(src_common_test_assembler_unittest_DEPENDENCIES) src/common/$(am__dirstamp)
   1.746 ++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)
   1.747 + 	@rm -f src/common/test_assembler_unittest$(EXEEXT)
   1.748 + 	$(CXXLINK) $(src_common_test_assembler_unittest_OBJECTS) $(src_common_test_assembler_unittest_LDADD) $(LIBS)
   1.749 + src/processor/address_map_unittest.$(OBJEXT):  \
   1.750 + 	src/processor/$(am__dirstamp) \
   1.751 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.752 +-src/processor/address_map_unittest$(EXEEXT): $(src_processor_address_map_unittest_OBJECTS) $(src_processor_address_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   1.753 ++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)
   1.754 + 	@rm -f src/processor/address_map_unittest$(EXEEXT)
   1.755 + 	$(CXXLINK) $(src_processor_address_map_unittest_OBJECTS) $(src_processor_address_map_unittest_LDADD) $(LIBS)
   1.756 + src/processor/src_processor_basic_source_line_resolver_unittest-basic_source_line_resolver_unittest.$(OBJEXT):  \
   1.757 + 	src/processor/$(am__dirstamp) \
   1.758 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.759 + src/testing/gtest/src/src_processor_basic_source_line_resolver_unittest-gtest-all.$(OBJEXT):  \
   1.760 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.761 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.762 + src/testing/src/src_processor_basic_source_line_resolver_unittest-gmock-all.$(OBJEXT):  \
   1.763 + 	src/testing/src/$(am__dirstamp) \
   1.764 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   1.765 +-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)
   1.766 ++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)
   1.767 + 	@rm -f src/processor/basic_source_line_resolver_unittest$(EXEEXT)
   1.768 + 	$(CXXLINK) $(src_processor_basic_source_line_resolver_unittest_OBJECTS) $(src_processor_basic_source_line_resolver_unittest_LDADD) $(LIBS)
   1.769 + src/processor/src_processor_binarystream_unittest-binarystream_unittest.$(OBJEXT):  \
   1.770 + 	src/processor/$(am__dirstamp) \
   1.771 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.772 + src/testing/gtest/src/src_processor_binarystream_unittest-gtest-all.$(OBJEXT):  \
   1.773 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.774 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.775 + src/testing/src/src_processor_binarystream_unittest-gmock-all.$(OBJEXT):  \
   1.776 + 	src/testing/src/$(am__dirstamp) \
   1.777 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   1.778 +-src/processor/binarystream_unittest$(EXEEXT): $(src_processor_binarystream_unittest_OBJECTS) $(src_processor_binarystream_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   1.779 ++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)
   1.780 + 	@rm -f src/processor/binarystream_unittest$(EXEEXT)
   1.781 + 	$(CXXLINK) $(src_processor_binarystream_unittest_OBJECTS) $(src_processor_binarystream_unittest_LDADD) $(LIBS)
   1.782 + src/processor/src_processor_cfi_frame_info_unittest-cfi_frame_info_unittest.$(OBJEXT):  \
   1.783 + 	src/processor/$(am__dirstamp) \
   1.784 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.785 + src/testing/gtest/src/src_processor_cfi_frame_info_unittest-gtest-all.$(OBJEXT):  \
   1.786 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.787 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.788 + src/testing/gtest/src/src_processor_cfi_frame_info_unittest-gtest_main.$(OBJEXT):  \
   1.789 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.790 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.791 + src/testing/src/src_processor_cfi_frame_info_unittest-gmock-all.$(OBJEXT):  \
   1.792 + 	src/testing/src/$(am__dirstamp) \
   1.793 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   1.794 +-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)
   1.795 ++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)
   1.796 + 	@rm -f src/processor/cfi_frame_info_unittest$(EXEEXT)
   1.797 + 	$(CXXLINK) $(src_processor_cfi_frame_info_unittest_OBJECTS) $(src_processor_cfi_frame_info_unittest_LDADD) $(LIBS)
   1.798 + src/processor/contained_range_map_unittest.$(OBJEXT):  \
   1.799 + 	src/processor/$(am__dirstamp) \
   1.800 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.801 +-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)
   1.802 ++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)
   1.803 + 	@rm -f src/processor/contained_range_map_unittest$(EXEEXT)
   1.804 + 	$(CXXLINK) $(src_processor_contained_range_map_unittest_OBJECTS) $(src_processor_contained_range_map_unittest_LDADD) $(LIBS)
   1.805 + src/processor/src_processor_disassembler_x86_unittest-disassembler_x86_unittest.$(OBJEXT):  \
   1.806 + 	src/processor/$(am__dirstamp) \
   1.807 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.808 + src/testing/gtest/src/src_processor_disassembler_x86_unittest-gtest-all.$(OBJEXT):  \
   1.809 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.810 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.811 + src/testing/gtest/src/src_processor_disassembler_x86_unittest-gtest_main.$(OBJEXT):  \
   1.812 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.813 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.814 + src/testing/src/src_processor_disassembler_x86_unittest-gmock-all.$(OBJEXT):  \
   1.815 + 	src/testing/src/$(am__dirstamp) \
   1.816 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   1.817 +-src/processor/disassembler_x86_unittest$(EXEEXT): $(src_processor_disassembler_x86_unittest_OBJECTS) $(src_processor_disassembler_x86_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   1.818 ++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)
   1.819 + 	@rm -f src/processor/disassembler_x86_unittest$(EXEEXT)
   1.820 + 	$(CXXLINK) $(src_processor_disassembler_x86_unittest_OBJECTS) $(src_processor_disassembler_x86_unittest_LDADD) $(LIBS)
   1.821 + src/processor/src_processor_exploitability_unittest-exploitability_unittest.$(OBJEXT):  \
   1.822 + 	src/processor/$(am__dirstamp) \
   1.823 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.824 + src/testing/gtest/src/src_processor_exploitability_unittest-gtest-all.$(OBJEXT):  \
   1.825 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.826 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.827 + src/testing/gtest/src/src_processor_exploitability_unittest-gtest_main.$(OBJEXT):  \
   1.828 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.829 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.830 + src/testing/src/src_processor_exploitability_unittest-gmock-all.$(OBJEXT):  \
   1.831 + 	src/testing/src/$(am__dirstamp) \
   1.832 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   1.833 +-src/processor/exploitability_unittest$(EXEEXT): $(src_processor_exploitability_unittest_OBJECTS) $(src_processor_exploitability_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   1.834 ++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)
   1.835 + 	@rm -f src/processor/exploitability_unittest$(EXEEXT)
   1.836 + 	$(CXXLINK) $(src_processor_exploitability_unittest_OBJECTS) $(src_processor_exploitability_unittest_LDADD) $(LIBS)
   1.837 + src/processor/src_processor_fast_source_line_resolver_unittest-fast_source_line_resolver_unittest.$(OBJEXT):  \
   1.838 + 	src/processor/$(am__dirstamp) \
   1.839 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.840 + src/testing/gtest/src/src_processor_fast_source_line_resolver_unittest-gtest-all.$(OBJEXT):  \
   1.841 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.842 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.843 + src/testing/src/src_processor_fast_source_line_resolver_unittest-gmock-all.$(OBJEXT):  \
   1.844 + 	src/testing/src/$(am__dirstamp) \
   1.845 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   1.846 +-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)
   1.847 ++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)
   1.848 + 	@rm -f src/processor/fast_source_line_resolver_unittest$(EXEEXT)
   1.849 + 	$(CXXLINK) $(src_processor_fast_source_line_resolver_unittest_OBJECTS) $(src_processor_fast_source_line_resolver_unittest_LDADD) $(LIBS)
   1.850 + src/processor/src_processor_map_serializers_unittest-map_serializers_unittest.$(OBJEXT):  \
   1.851 + 	src/processor/$(am__dirstamp) \
   1.852 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.853 + src/testing/gtest/src/src_processor_map_serializers_unittest-gtest-all.$(OBJEXT):  \
   1.854 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.855 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.856 + src/testing/src/src_processor_map_serializers_unittest-gmock-all.$(OBJEXT):  \
   1.857 + 	src/testing/src/$(am__dirstamp) \
   1.858 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   1.859 +-src/processor/map_serializers_unittest$(EXEEXT): $(src_processor_map_serializers_unittest_OBJECTS) $(src_processor_map_serializers_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   1.860 ++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)
   1.861 + 	@rm -f src/processor/map_serializers_unittest$(EXEEXT)
   1.862 + 	$(CXXLINK) $(src_processor_map_serializers_unittest_OBJECTS) $(src_processor_map_serializers_unittest_LDADD) $(LIBS)
   1.863 + src/processor/minidump_dump.$(OBJEXT): src/processor/$(am__dirstamp) \
   1.864 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.865 +-src/processor/minidump_dump$(EXEEXT): $(src_processor_minidump_dump_OBJECTS) $(src_processor_minidump_dump_DEPENDENCIES) src/processor/$(am__dirstamp)
   1.866 ++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)
   1.867 + 	@rm -f src/processor/minidump_dump$(EXEEXT)
   1.868 + 	$(CXXLINK) $(src_processor_minidump_dump_OBJECTS) $(src_processor_minidump_dump_LDADD) $(LIBS)
   1.869 + src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.$(OBJEXT):  \
   1.870 + 	src/processor/$(am__dirstamp) \
   1.871 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.872 + src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.$(OBJEXT):  \
   1.873 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.874 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.875 + src/testing/src/src_processor_minidump_processor_unittest-gmock-all.$(OBJEXT):  \
   1.876 + 	src/testing/src/$(am__dirstamp) \
   1.877 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   1.878 +-src/processor/minidump_processor_unittest$(EXEEXT): $(src_processor_minidump_processor_unittest_OBJECTS) $(src_processor_minidump_processor_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   1.879 ++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)
   1.880 + 	@rm -f src/processor/minidump_processor_unittest$(EXEEXT)
   1.881 + 	$(CXXLINK) $(src_processor_minidump_processor_unittest_OBJECTS) $(src_processor_minidump_processor_unittest_LDADD) $(LIBS)
   1.882 + src/processor/minidump_stackwalk.$(OBJEXT):  \
   1.883 + 	src/processor/$(am__dirstamp) \
   1.884 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.885 +-src/processor/minidump_stackwalk$(EXEEXT): $(src_processor_minidump_stackwalk_OBJECTS) $(src_processor_minidump_stackwalk_DEPENDENCIES) src/processor/$(am__dirstamp)
   1.886 ++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)
   1.887 + 	@rm -f src/processor/minidump_stackwalk$(EXEEXT)
   1.888 + 	$(CXXLINK) $(src_processor_minidump_stackwalk_OBJECTS) $(src_processor_minidump_stackwalk_LDADD) $(LIBS)
   1.889 + src/common/src_processor_minidump_unittest-test_assembler.$(OBJEXT):  \
   1.890 + 	src/common/$(am__dirstamp) \
   1.891 + 	src/common/$(DEPDIR)/$(am__dirstamp)
   1.892 + src/processor/src_processor_minidump_unittest-minidump_unittest.$(OBJEXT):  \
   1.893 + 	src/processor/$(am__dirstamp) \
   1.894 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.895 +@@ -3068,35 +3095,35 @@
   1.896 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.897 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.898 + src/testing/gtest/src/src_processor_minidump_unittest-gtest_main.$(OBJEXT):  \
   1.899 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.900 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.901 + src/testing/src/src_processor_minidump_unittest-gmock-all.$(OBJEXT):  \
   1.902 + 	src/testing/src/$(am__dirstamp) \
   1.903 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   1.904 +-src/processor/minidump_unittest$(EXEEXT): $(src_processor_minidump_unittest_OBJECTS) $(src_processor_minidump_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   1.905 ++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)
   1.906 + 	@rm -f src/processor/minidump_unittest$(EXEEXT)
   1.907 + 	$(CXXLINK) $(src_processor_minidump_unittest_OBJECTS) $(src_processor_minidump_unittest_LDADD) $(LIBS)
   1.908 + src/processor/pathname_stripper_unittest.$(OBJEXT):  \
   1.909 + 	src/processor/$(am__dirstamp) \
   1.910 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.911 +-src/processor/pathname_stripper_unittest$(EXEEXT): $(src_processor_pathname_stripper_unittest_OBJECTS) $(src_processor_pathname_stripper_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   1.912 ++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)
   1.913 + 	@rm -f src/processor/pathname_stripper_unittest$(EXEEXT)
   1.914 + 	$(CXXLINK) $(src_processor_pathname_stripper_unittest_OBJECTS) $(src_processor_pathname_stripper_unittest_LDADD) $(LIBS)
   1.915 + src/processor/postfix_evaluator_unittest.$(OBJEXT):  \
   1.916 + 	src/processor/$(am__dirstamp) \
   1.917 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.918 +-src/processor/postfix_evaluator_unittest$(EXEEXT): $(src_processor_postfix_evaluator_unittest_OBJECTS) $(src_processor_postfix_evaluator_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   1.919 ++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)
   1.920 + 	@rm -f src/processor/postfix_evaluator_unittest$(EXEEXT)
   1.921 + 	$(CXXLINK) $(src_processor_postfix_evaluator_unittest_OBJECTS) $(src_processor_postfix_evaluator_unittest_LDADD) $(LIBS)
   1.922 + src/processor/range_map_unittest.$(OBJEXT):  \
   1.923 + 	src/processor/$(am__dirstamp) \
   1.924 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.925 +-src/processor/range_map_unittest$(EXEEXT): $(src_processor_range_map_unittest_OBJECTS) $(src_processor_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   1.926 ++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)
   1.927 + 	@rm -f src/processor/range_map_unittest$(EXEEXT)
   1.928 + 	$(CXXLINK) $(src_processor_range_map_unittest_OBJECTS) $(src_processor_range_map_unittest_LDADD) $(LIBS)
   1.929 + src/common/src_processor_stackwalker_amd64_unittest-test_assembler.$(OBJEXT):  \
   1.930 + 	src/common/$(am__dirstamp) \
   1.931 + 	src/common/$(DEPDIR)/$(am__dirstamp)
   1.932 + src/processor/src_processor_stackwalker_amd64_unittest-stackwalker_amd64_unittest.$(OBJEXT):  \
   1.933 + 	src/processor/$(am__dirstamp) \
   1.934 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.935 +@@ -3104,17 +3131,17 @@
   1.936 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.937 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.938 + src/testing/gtest/src/src_processor_stackwalker_amd64_unittest-gtest_main.$(OBJEXT):  \
   1.939 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.940 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.941 + src/testing/src/src_processor_stackwalker_amd64_unittest-gmock-all.$(OBJEXT):  \
   1.942 + 	src/testing/src/$(am__dirstamp) \
   1.943 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   1.944 +-src/processor/stackwalker_amd64_unittest$(EXEEXT): $(src_processor_stackwalker_amd64_unittest_OBJECTS) $(src_processor_stackwalker_amd64_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   1.945 ++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)
   1.946 + 	@rm -f src/processor/stackwalker_amd64_unittest$(EXEEXT)
   1.947 + 	$(CXXLINK) $(src_processor_stackwalker_amd64_unittest_OBJECTS) $(src_processor_stackwalker_amd64_unittest_LDADD) $(LIBS)
   1.948 + src/common/src_processor_stackwalker_arm_unittest-test_assembler.$(OBJEXT):  \
   1.949 + 	src/common/$(am__dirstamp) \
   1.950 + 	src/common/$(DEPDIR)/$(am__dirstamp)
   1.951 + src/processor/src_processor_stackwalker_arm_unittest-stackwalker_arm_unittest.$(OBJEXT):  \
   1.952 + 	src/processor/$(am__dirstamp) \
   1.953 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.954 +@@ -3122,23 +3149,23 @@
   1.955 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.956 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.957 + src/testing/gtest/src/src_processor_stackwalker_arm_unittest-gtest_main.$(OBJEXT):  \
   1.958 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.959 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.960 + src/testing/src/src_processor_stackwalker_arm_unittest-gmock-all.$(OBJEXT):  \
   1.961 + 	src/testing/src/$(am__dirstamp) \
   1.962 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   1.963 +-src/processor/stackwalker_arm_unittest$(EXEEXT): $(src_processor_stackwalker_arm_unittest_OBJECTS) $(src_processor_stackwalker_arm_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   1.964 ++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)
   1.965 + 	@rm -f src/processor/stackwalker_arm_unittest$(EXEEXT)
   1.966 + 	$(CXXLINK) $(src_processor_stackwalker_arm_unittest_OBJECTS) $(src_processor_stackwalker_arm_unittest_LDADD) $(LIBS)
   1.967 + src/processor/stackwalker_selftest.$(OBJEXT):  \
   1.968 + 	src/processor/$(am__dirstamp) \
   1.969 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.970 +-src/processor/stackwalker_selftest$(EXEEXT): $(src_processor_stackwalker_selftest_OBJECTS) $(src_processor_stackwalker_selftest_DEPENDENCIES) src/processor/$(am__dirstamp)
   1.971 ++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)
   1.972 + 	@rm -f src/processor/stackwalker_selftest$(EXEEXT)
   1.973 + 	$(CXXLINK) $(src_processor_stackwalker_selftest_OBJECTS) $(src_processor_stackwalker_selftest_LDADD) $(LIBS)
   1.974 + src/common/src_processor_stackwalker_x86_unittest-test_assembler.$(OBJEXT):  \
   1.975 + 	src/common/$(am__dirstamp) \
   1.976 + 	src/common/$(DEPDIR)/$(am__dirstamp)
   1.977 + src/processor/src_processor_stackwalker_x86_unittest-stackwalker_x86_unittest.$(OBJEXT):  \
   1.978 + 	src/processor/$(am__dirstamp) \
   1.979 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.980 +@@ -3146,65 +3173,65 @@
   1.981 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.982 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.983 + src/testing/gtest/src/src_processor_stackwalker_x86_unittest-gtest_main.$(OBJEXT):  \
   1.984 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.985 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.986 + src/testing/src/src_processor_stackwalker_x86_unittest-gmock-all.$(OBJEXT):  \
   1.987 + 	src/testing/src/$(am__dirstamp) \
   1.988 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
   1.989 +-src/processor/stackwalker_x86_unittest$(EXEEXT): $(src_processor_stackwalker_x86_unittest_OBJECTS) $(src_processor_stackwalker_x86_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
   1.990 ++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)
   1.991 + 	@rm -f src/processor/stackwalker_x86_unittest$(EXEEXT)
   1.992 + 	$(CXXLINK) $(src_processor_stackwalker_x86_unittest_OBJECTS) $(src_processor_stackwalker_x86_unittest_LDADD) $(LIBS)
   1.993 + src/processor/src_processor_static_address_map_unittest-static_address_map_unittest.$(OBJEXT):  \
   1.994 + 	src/processor/$(am__dirstamp) \
   1.995 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
   1.996 + src/testing/gtest/src/src_processor_static_address_map_unittest-gtest-all.$(OBJEXT):  \
   1.997 + 	src/testing/gtest/src/$(am__dirstamp) \
   1.998 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
   1.999 + src/testing/src/src_processor_static_address_map_unittest-gmock-all.$(OBJEXT):  \
  1.1000 + 	src/testing/src/$(am__dirstamp) \
  1.1001 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
  1.1002 +-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)
  1.1003 ++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)
  1.1004 + 	@rm -f src/processor/static_address_map_unittest$(EXEEXT)
  1.1005 + 	$(CXXLINK) $(src_processor_static_address_map_unittest_OBJECTS) $(src_processor_static_address_map_unittest_LDADD) $(LIBS)
  1.1006 + src/processor/src_processor_static_contained_range_map_unittest-static_contained_range_map_unittest.$(OBJEXT):  \
  1.1007 + 	src/processor/$(am__dirstamp) \
  1.1008 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
  1.1009 + src/testing/gtest/src/src_processor_static_contained_range_map_unittest-gtest-all.$(OBJEXT):  \
  1.1010 + 	src/testing/gtest/src/$(am__dirstamp) \
  1.1011 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
  1.1012 + src/testing/src/src_processor_static_contained_range_map_unittest-gmock-all.$(OBJEXT):  \
  1.1013 + 	src/testing/src/$(am__dirstamp) \
  1.1014 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
  1.1015 +-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)
  1.1016 ++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)
  1.1017 + 	@rm -f src/processor/static_contained_range_map_unittest$(EXEEXT)
  1.1018 + 	$(CXXLINK) $(src_processor_static_contained_range_map_unittest_OBJECTS) $(src_processor_static_contained_range_map_unittest_LDADD) $(LIBS)
  1.1019 + src/processor/src_processor_static_map_unittest-static_map_unittest.$(OBJEXT):  \
  1.1020 + 	src/processor/$(am__dirstamp) \
  1.1021 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
  1.1022 + src/testing/gtest/src/src_processor_static_map_unittest-gtest-all.$(OBJEXT):  \
  1.1023 + 	src/testing/gtest/src/$(am__dirstamp) \
  1.1024 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
  1.1025 + src/testing/src/src_processor_static_map_unittest-gmock-all.$(OBJEXT):  \
  1.1026 + 	src/testing/src/$(am__dirstamp) \
  1.1027 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
  1.1028 +-src/processor/static_map_unittest$(EXEEXT): $(src_processor_static_map_unittest_OBJECTS) $(src_processor_static_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
  1.1029 ++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)
  1.1030 + 	@rm -f src/processor/static_map_unittest$(EXEEXT)
  1.1031 + 	$(CXXLINK) $(src_processor_static_map_unittest_OBJECTS) $(src_processor_static_map_unittest_LDADD) $(LIBS)
  1.1032 + src/processor/src_processor_static_range_map_unittest-static_range_map_unittest.$(OBJEXT):  \
  1.1033 + 	src/processor/$(am__dirstamp) \
  1.1034 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
  1.1035 + src/testing/gtest/src/src_processor_static_range_map_unittest-gtest-all.$(OBJEXT):  \
  1.1036 + 	src/testing/gtest/src/$(am__dirstamp) \
  1.1037 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
  1.1038 + src/testing/src/src_processor_static_range_map_unittest-gmock-all.$(OBJEXT):  \
  1.1039 + 	src/testing/src/$(am__dirstamp) \
  1.1040 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
  1.1041 +-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)
  1.1042 ++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)
  1.1043 + 	@rm -f src/processor/static_range_map_unittest$(EXEEXT)
  1.1044 + 	$(CXXLINK) $(src_processor_static_range_map_unittest_OBJECTS) $(src_processor_static_range_map_unittest_LDADD) $(LIBS)
  1.1045 + src/common/src_processor_synth_minidump_unittest-test_assembler.$(OBJEXT):  \
  1.1046 + 	src/common/$(am__dirstamp) \
  1.1047 + 	src/common/$(DEPDIR)/$(am__dirstamp)
  1.1048 + src/processor/src_processor_synth_minidump_unittest-synth_minidump_unittest.$(OBJEXT):  \
  1.1049 + 	src/processor/$(am__dirstamp) \
  1.1050 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
  1.1051 +@@ -3215,17 +3242,17 @@
  1.1052 + 	src/testing/gtest/src/$(am__dirstamp) \
  1.1053 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
  1.1054 + src/testing/src/src_processor_synth_minidump_unittest-gmock-all.$(OBJEXT):  \
  1.1055 + 	src/testing/src/$(am__dirstamp) \
  1.1056 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
  1.1057 + src/processor/src_processor_synth_minidump_unittest-synth_minidump.$(OBJEXT):  \
  1.1058 + 	src/processor/$(am__dirstamp) \
  1.1059 + 	src/processor/$(DEPDIR)/$(am__dirstamp)
  1.1060 +-src/processor/synth_minidump_unittest$(EXEEXT): $(src_processor_synth_minidump_unittest_OBJECTS) $(src_processor_synth_minidump_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
  1.1061 ++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)
  1.1062 + 	@rm -f src/processor/synth_minidump_unittest$(EXEEXT)
  1.1063 + 	$(CXXLINK) $(src_processor_synth_minidump_unittest_OBJECTS) $(src_processor_synth_minidump_unittest_LDADD) $(LIBS)
  1.1064 + src/tools/linux/core2md/$(am__dirstamp):
  1.1065 + 	@$(MKDIR_P) src/tools/linux/core2md
  1.1066 + 	@: > src/tools/linux/core2md/$(am__dirstamp)
  1.1067 + src/tools/linux/core2md/$(DEPDIR)/$(am__dirstamp):
  1.1068 + 	@$(MKDIR_P) src/tools/linux/core2md/$(DEPDIR)
  1.1069 + 	@: > src/tools/linux/core2md/$(DEPDIR)/$(am__dirstamp)
  1.1070 +@@ -3233,29 +3260,27 @@
  1.1071 + 	src/tools/linux/core2md/$(am__dirstamp) \
  1.1072 + 	src/tools/linux/core2md/$(DEPDIR)/$(am__dirstamp)
  1.1073 + src/client/linux/minidump_writer/linux_core_dumper.$(OBJEXT):  \
  1.1074 + 	src/client/linux/minidump_writer/$(am__dirstamp) \
  1.1075 + 	src/client/linux/minidump_writer/$(DEPDIR)/$(am__dirstamp)
  1.1076 + src/common/linux/elf_core_dump.$(OBJEXT):  \
  1.1077 + 	src/common/linux/$(am__dirstamp) \
  1.1078 + 	src/common/linux/$(DEPDIR)/$(am__dirstamp)
  1.1079 +-src/tools/linux/core2md/core2md$(EXEEXT): $(src_tools_linux_core2md_core2md_OBJECTS) $(src_tools_linux_core2md_core2md_DEPENDENCIES) src/tools/linux/core2md/$(am__dirstamp)
  1.1080 ++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)
  1.1081 + 	@rm -f src/tools/linux/core2md/core2md$(EXEEXT)
  1.1082 + 	$(CXXLINK) $(src_tools_linux_core2md_core2md_OBJECTS) $(src_tools_linux_core2md_core2md_LDADD) $(LIBS)
  1.1083 + src/common/dwarf_cfi_to_module.$(OBJEXT): src/common/$(am__dirstamp) \
  1.1084 + 	src/common/$(DEPDIR)/$(am__dirstamp)
  1.1085 + src/common/dwarf_cu_to_module.$(OBJEXT): src/common/$(am__dirstamp) \
  1.1086 + 	src/common/$(DEPDIR)/$(am__dirstamp)
  1.1087 + src/common/dwarf_line_to_module.$(OBJEXT): src/common/$(am__dirstamp) \
  1.1088 + 	src/common/$(DEPDIR)/$(am__dirstamp)
  1.1089 + src/common/language.$(OBJEXT): src/common/$(am__dirstamp) \
  1.1090 + 	src/common/$(DEPDIR)/$(am__dirstamp)
  1.1091 +-src/common/module.$(OBJEXT): src/common/$(am__dirstamp) \
  1.1092 +-	src/common/$(DEPDIR)/$(am__dirstamp)
  1.1093 + src/common/stabs_reader.$(OBJEXT): src/common/$(am__dirstamp) \
  1.1094 + 	src/common/$(DEPDIR)/$(am__dirstamp)
  1.1095 + src/common/stabs_to_module.$(OBJEXT): src/common/$(am__dirstamp) \
  1.1096 + 	src/common/$(DEPDIR)/$(am__dirstamp)
  1.1097 + src/common/dwarf/bytereader.$(OBJEXT):  \
  1.1098 + 	src/common/dwarf/$(am__dirstamp) \
  1.1099 + 	src/common/dwarf/$(DEPDIR)/$(am__dirstamp)
  1.1100 + src/common/dwarf/dwarf2diehandler.$(OBJEXT):  \
  1.1101 +@@ -3274,65 +3299,65 @@
  1.1102 + 	@$(MKDIR_P) src/tools/linux/dump_syms
  1.1103 + 	@: > src/tools/linux/dump_syms/$(am__dirstamp)
  1.1104 + src/tools/linux/dump_syms/$(DEPDIR)/$(am__dirstamp):
  1.1105 + 	@$(MKDIR_P) src/tools/linux/dump_syms/$(DEPDIR)
  1.1106 + 	@: > src/tools/linux/dump_syms/$(DEPDIR)/$(am__dirstamp)
  1.1107 + src/tools/linux/dump_syms/dump_syms.$(OBJEXT):  \
  1.1108 + 	src/tools/linux/dump_syms/$(am__dirstamp) \
  1.1109 + 	src/tools/linux/dump_syms/$(DEPDIR)/$(am__dirstamp)
  1.1110 +-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)
  1.1111 ++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)
  1.1112 + 	@rm -f src/tools/linux/dump_syms/dump_syms$(EXEEXT)
  1.1113 + 	$(CXXLINK) $(src_tools_linux_dump_syms_dump_syms_OBJECTS) $(src_tools_linux_dump_syms_dump_syms_LDADD) $(LIBS)
  1.1114 + src/tools/linux/md2core/$(am__dirstamp):
  1.1115 + 	@$(MKDIR_P) src/tools/linux/md2core
  1.1116 + 	@: > src/tools/linux/md2core/$(am__dirstamp)
  1.1117 + src/tools/linux/md2core/$(DEPDIR)/$(am__dirstamp):
  1.1118 + 	@$(MKDIR_P) src/tools/linux/md2core/$(DEPDIR)
  1.1119 + 	@: > src/tools/linux/md2core/$(DEPDIR)/$(am__dirstamp)
  1.1120 + src/tools/linux/md2core/minidump-2-core.$(OBJEXT):  \
  1.1121 + 	src/tools/linux/md2core/$(am__dirstamp) \
  1.1122 + 	src/tools/linux/md2core/$(DEPDIR)/$(am__dirstamp)
  1.1123 +-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)
  1.1124 ++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)
  1.1125 + 	@rm -f src/tools/linux/md2core/minidump-2-core$(EXEEXT)
  1.1126 + 	$(CXXLINK) $(src_tools_linux_md2core_minidump_2_core_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_LDADD) $(LIBS)
  1.1127 + src/testing/gtest/src/src_tools_linux_md2core_minidump_2_core_unittest-gtest-all.$(OBJEXT):  \
  1.1128 + 	src/testing/gtest/src/$(am__dirstamp) \
  1.1129 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
  1.1130 + src/testing/gtest/src/src_tools_linux_md2core_minidump_2_core_unittest-gtest_main.$(OBJEXT):  \
  1.1131 + 	src/testing/gtest/src/$(am__dirstamp) \
  1.1132 + 	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)
  1.1133 + src/testing/src/src_tools_linux_md2core_minidump_2_core_unittest-gmock-all.$(OBJEXT):  \
  1.1134 + 	src/testing/src/$(am__dirstamp) \
  1.1135 + 	src/testing/src/$(DEPDIR)/$(am__dirstamp)
  1.1136 + src/tools/linux/md2core/src_tools_linux_md2core_minidump_2_core_unittest-minidump_memory_range_unittest.$(OBJEXT):  \
  1.1137 + 	src/tools/linux/md2core/$(am__dirstamp) \
  1.1138 + 	src/tools/linux/md2core/$(DEPDIR)/$(am__dirstamp)
  1.1139 +-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)
  1.1140 ++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)
  1.1141 + 	@rm -f src/tools/linux/md2core/minidump_2_core_unittest$(EXEEXT)
  1.1142 + 	$(CXXLINK) $(src_tools_linux_md2core_minidump_2_core_unittest_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_unittest_LDADD) $(LIBS)
  1.1143 + src/common/linux/http_upload.$(OBJEXT):  \
  1.1144 + 	src/common/linux/$(am__dirstamp) \
  1.1145 + 	src/common/linux/$(DEPDIR)/$(am__dirstamp)
  1.1146 + src/tools/linux/symupload/$(am__dirstamp):
  1.1147 + 	@$(MKDIR_P) src/tools/linux/symupload
  1.1148 + 	@: > src/tools/linux/symupload/$(am__dirstamp)
  1.1149 + src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp):
  1.1150 + 	@$(MKDIR_P) src/tools/linux/symupload/$(DEPDIR)
  1.1151 + 	@: > src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp)
  1.1152 + src/tools/linux/symupload/minidump_upload.$(OBJEXT):  \
  1.1153 + 	src/tools/linux/symupload/$(am__dirstamp) \
  1.1154 + 	src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp)
  1.1155 +-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)
  1.1156 ++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)
  1.1157 + 	@rm -f src/tools/linux/symupload/minidump_upload$(EXEEXT)
  1.1158 + 	$(CXXLINK) $(src_tools_linux_symupload_minidump_upload_OBJECTS) $(src_tools_linux_symupload_minidump_upload_LDADD) $(LIBS)
  1.1159 + src/tools/linux/symupload/sym_upload.$(OBJEXT):  \
  1.1160 + 	src/tools/linux/symupload/$(am__dirstamp) \
  1.1161 + 	src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp)
  1.1162 +-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)
  1.1163 ++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)
  1.1164 + 	@rm -f src/tools/linux/symupload/sym_upload$(EXEEXT)
  1.1165 + 	$(CXXLINK) $(src_tools_linux_symupload_sym_upload_OBJECTS) $(src_tools_linux_symupload_sym_upload_LDADD) $(LIBS)
  1.1166 + 
  1.1167 + mostlyclean-compile:
  1.1168 + 	-rm -f *.$(OBJEXT)
  1.1169 + 	-rm -f src/client/linux/crash_generation/crash_generation_client.$(OBJEXT)
  1.1170 + 	-rm -f src/client/linux/crash_generation/crash_generation_server.$(OBJEXT)
  1.1171 + 	-rm -f src/client/linux/handler/exception_handler.$(OBJEXT)
  1.1172 +@@ -5859,19 +5884,17 @@
  1.1173 + 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
  1.1174 + 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
  1.1175 + 	done
  1.1176 + 
  1.1177 + uninstall-dist_docDATA:
  1.1178 + 	@$(NORMAL_UNINSTALL)
  1.1179 + 	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
  1.1180 + 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
  1.1181 +-	test -n "$$files" || exit 0; \
  1.1182 +-	echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
  1.1183 +-	cd "$(DESTDIR)$(docdir)" && rm -f $$files
  1.1184 ++	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
  1.1185 + 
  1.1186 + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  1.1187 + 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  1.1188 + 	unique=`for i in $$list; do \
  1.1189 + 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  1.1190 + 	  done | \
  1.1191 + 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
  1.1192 + 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
  1.1193 +@@ -5996,24 +6019,25 @@
  1.1194 + 	  report=""; \
  1.1195 + 	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
  1.1196 + 	    report="Please report to $(PACKAGE_BUGREPORT)"; \
  1.1197 + 	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
  1.1198 + 	      dashes="$$report"; \
  1.1199 + 	  fi; \
  1.1200 + 	  dashes=`echo "$$dashes" | sed s/./=/g`; \
  1.1201 + 	  if test "$$failed" -eq 0; then \
  1.1202 +-	    echo "$$grn$$dashes"; \
  1.1203 ++	    col="$$grn"; \
  1.1204 + 	  else \
  1.1205 +-	    echo "$$red$$dashes"; \
  1.1206 ++	    col="$$red"; \
  1.1207 + 	  fi; \
  1.1208 +-	  echo "$$banner"; \
  1.1209 +-	  test -z "$$skipped" || echo "$$skipped"; \
  1.1210 +-	  test -z "$$report" || echo "$$report"; \
  1.1211 +-	  echo "$$dashes$$std"; \
  1.1212 ++	  echo "$${col}$$dashes$${std}"; \
  1.1213 ++	  echo "$${col}$$banner$${std}"; \
  1.1214 ++	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
  1.1215 ++	  test -z "$$report" || echo "$${col}$$report$${std}"; \
  1.1216 ++	  echo "$${col}$$dashes$${std}"; \
  1.1217 + 	  test "$$failed" -eq 0; \
  1.1218 + 	else :; fi
  1.1219 + 
  1.1220 + distdir: $(DISTFILES)
  1.1221 + 	$(am__remove_distdir)
  1.1222 + 	test -d "$(distdir)" || mkdir "$(distdir)"
  1.1223 + 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
  1.1224 + 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
  1.1225 +@@ -6051,25 +6075,29 @@
  1.1226 + 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
  1.1227 + 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
  1.1228 + 	|| chmod -R a+r "$(distdir)"
  1.1229 + dist-gzip: distdir
  1.1230 + 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
  1.1231 + 	$(am__remove_distdir)
  1.1232 + 
  1.1233 + dist-bzip2: distdir
  1.1234 +-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
  1.1235 ++	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
  1.1236 ++	$(am__remove_distdir)
  1.1237 ++
  1.1238 ++dist-lzip: distdir
  1.1239 ++	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
  1.1240 + 	$(am__remove_distdir)
  1.1241 + 
  1.1242 + dist-lzma: distdir
  1.1243 + 	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
  1.1244 + 	$(am__remove_distdir)
  1.1245 + 
  1.1246 + dist-xz: distdir
  1.1247 +-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
  1.1248 ++	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
  1.1249 + 	$(am__remove_distdir)
  1.1250 + 
  1.1251 + dist-tarZ: distdir
  1.1252 + 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
  1.1253 + 	$(am__remove_distdir)
  1.1254 + 
  1.1255 + dist-shar: distdir
  1.1256 + 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
  1.1257 +@@ -6090,16 +6118,18 @@
  1.1258 + distcheck: dist
  1.1259 + 	case '$(DIST_ARCHIVES)' in \
  1.1260 + 	*.tar.gz*) \
  1.1261 + 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
  1.1262 + 	*.tar.bz2*) \
  1.1263 + 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
  1.1264 + 	*.tar.lzma*) \
  1.1265 + 	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
  1.1266 ++	*.tar.lz*) \
  1.1267 ++	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
  1.1268 + 	*.tar.xz*) \
  1.1269 + 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
  1.1270 + 	*.tar.Z*) \
  1.1271 + 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
  1.1272 + 	*.shar.gz*) \
  1.1273 + 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
  1.1274 + 	*.zip*) \
  1.1275 + 	  unzip $(distdir).zip ;;\
  1.1276 +@@ -6109,16 +6139,17 @@
  1.1277 + 	mkdir $(distdir)/_inst
  1.1278 + 	chmod a-w $(distdir)
  1.1279 + 	test -d $(distdir)/_build || exit 0; \
  1.1280 + 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
  1.1281 + 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
  1.1282 + 	  && am__cwd=`pwd` \
  1.1283 + 	  && $(am__cd) $(distdir)/_build \
  1.1284 + 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
  1.1285 ++	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
  1.1286 + 	    $(DISTCHECK_CONFIGURE_FLAGS) \
  1.1287 + 	  && $(MAKE) $(AM_MAKEFLAGS) \
  1.1288 + 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
  1.1289 + 	  && $(MAKE) $(AM_MAKEFLAGS) check \
  1.1290 + 	  && $(MAKE) $(AM_MAKEFLAGS) install \
  1.1291 + 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
  1.1292 + 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
  1.1293 + 	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
  1.1294 +@@ -6137,18 +6168,26 @@
  1.1295 + 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
  1.1296 + 	  && cd "$$am__cwd" \
  1.1297 + 	  || exit 1
  1.1298 + 	$(am__remove_distdir)
  1.1299 + 	@(echo "$(distdir) archives ready for distribution: "; \
  1.1300 + 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
  1.1301 + 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
  1.1302 + distuninstallcheck:
  1.1303 +-	@$(am__cd) '$(distuninstallcheck_dir)' \
  1.1304 +-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
  1.1305 ++	@test -n '$(distuninstallcheck_dir)' || { \
  1.1306 ++	  echo 'ERROR: trying to run $@ with an empty' \
  1.1307 ++	       '$$(distuninstallcheck_dir)' >&2; \
  1.1308 ++	  exit 1; \
  1.1309 ++	}; \
  1.1310 ++	$(am__cd) '$(distuninstallcheck_dir)' || { \
  1.1311 ++	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
  1.1312 ++	  exit 1; \
  1.1313 ++	}; \
  1.1314 ++	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
  1.1315 + 	   || { echo "ERROR: files left after uninstall:" ; \
  1.1316 + 	        if test -n "$(DESTDIR)"; then \
  1.1317 + 	          echo "  (check DESTDIR support)"; \
  1.1318 + 	        fi ; \
  1.1319 + 	        $(distuninstallcheck_listfiles) ; \
  1.1320 + 	        exit 1; } >&2
  1.1321 + distcleancheck: distclean
  1.1322 + 	@if test '$(srcdir)' = . ; then \
  1.1323 +@@ -6173,20 +6212,25 @@
  1.1324 + install-data: install-data-am
  1.1325 + uninstall: uninstall-am
  1.1326 + 
  1.1327 + install-am: all-am
  1.1328 + 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
  1.1329 + 
  1.1330 + installcheck: installcheck-am
  1.1331 + install-strip:
  1.1332 +-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
  1.1333 +-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
  1.1334 +-	  `test -z '$(STRIP)' || \
  1.1335 +-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
  1.1336 ++	if test -z '$(STRIP)'; then \
  1.1337 ++	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
  1.1338 ++	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
  1.1339 ++	      install; \
  1.1340 ++	else \
  1.1341 ++	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
  1.1342 ++	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
  1.1343 ++	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
  1.1344 ++	fi
  1.1345 + mostlyclean-generic:
  1.1346 + 
  1.1347 + clean-generic:
  1.1348 + 
  1.1349 + distclean-generic:
  1.1350 + 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  1.1351 + 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  1.1352 + 	-rm -f src/$(am__dirstamp)
  1.1353 +@@ -6308,18 +6352,18 @@
  1.1354 + uninstall-am: uninstall-binPROGRAMS uninstall-dist_docDATA \
  1.1355 + 	uninstall-libLIBRARIES
  1.1356 + 
  1.1357 + .MAKE: check-am install-am install-strip
  1.1358 + 
  1.1359 + .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \
  1.1360 + 	clean clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
  1.1361 + 	clean-libLIBRARIES clean-noinstLIBRARIES clean-noinstPROGRAMS \
  1.1362 +-	ctags dist dist-all dist-bzip2 dist-gzip dist-lzma dist-shar \
  1.1363 +-	dist-tarZ dist-xz dist-zip distcheck distclean \
  1.1364 ++	ctags dist dist-all dist-bzip2 dist-gzip dist-lzip dist-lzma \
  1.1365 ++	dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
  1.1366 + 	distclean-compile distclean-generic distclean-hdr \
  1.1367 + 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
  1.1368 + 	dvi-am html html-am info info-am install install-am \
  1.1369 + 	install-binPROGRAMS install-data install-data-am \
  1.1370 + 	install-dist_docDATA install-dvi install-dvi-am install-exec \
  1.1371 + 	install-exec-am install-html install-html-am install-info \
  1.1372 + 	install-info-am install-libLIBRARIES install-man install-pdf \
  1.1373 + 	install-pdf-am install-ps install-ps-am install-strip \
  1.1374 +diff --git a/aclocal.m4 b/aclocal.m4
  1.1375 +--- a/aclocal.m4
  1.1376 ++++ b/aclocal.m4
  1.1377 +@@ -1,61 +1,65 @@
  1.1378 +-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
  1.1379 ++# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
  1.1380 + 
  1.1381 + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
  1.1382 +-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
  1.1383 ++# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
  1.1384 ++# Inc.
  1.1385 + # This file is free software; the Free Software Foundation
  1.1386 + # gives unlimited permission to copy and/or distribute it,
  1.1387 + # with or without modifications, as long as this notice is preserved.
  1.1388 + 
  1.1389 + # This program is distributed in the hope that it will be useful,
  1.1390 + # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
  1.1391 + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  1.1392 + # PARTICULAR PURPOSE.
  1.1393 + 
  1.1394 + m4_ifndef([AC_AUTOCONF_VERSION],
  1.1395 +   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
  1.1396 +-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
  1.1397 +-[m4_warning([this file was generated for autoconf 2.65.
  1.1398 ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
  1.1399 ++[m4_warning([this file was generated for autoconf 2.68.
  1.1400 + You have another version of autoconf.  It may work, but is not guaranteed to.
  1.1401 + If you have problems, you may need to regenerate the build system entirely.
  1.1402 + To do so, use the procedure documented by the package, typically `autoreconf'.])])
  1.1403 + 
  1.1404 +-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
  1.1405 ++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
  1.1406 ++# Foundation, Inc.
  1.1407 + #
  1.1408 + # This file is free software; the Free Software Foundation
  1.1409 + # gives unlimited permission to copy and/or distribute it,
  1.1410 + # with or without modifications, as long as this notice is preserved.
  1.1411 + 
  1.1412 ++# serial 1
  1.1413 ++
  1.1414 + # AM_AUTOMAKE_VERSION(VERSION)
  1.1415 + # ----------------------------
  1.1416 + # Automake X.Y traces this macro to ensure aclocal.m4 has been
  1.1417 + # generated from the m4 files accompanying Automake X.Y.
  1.1418 + # (This private macro should not be called outside this file.)
  1.1419 + AC_DEFUN([AM_AUTOMAKE_VERSION],
  1.1420 + [am__api_version='1.11'
  1.1421 + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
  1.1422 + dnl require some minimum version.  Point them to the right macro.
  1.1423 +-m4_if([$1], [1.11.1], [],
  1.1424 ++m4_if([$1], [1.11.3], [],
  1.1425 +       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
  1.1426 + ])
  1.1427 + 
  1.1428 + # _AM_AUTOCONF_VERSION(VERSION)
  1.1429 + # -----------------------------
  1.1430 + # aclocal traces this macro to find the Autoconf version.
  1.1431 + # This is a private macro too.  Using m4_define simplifies
  1.1432 + # the logic in aclocal, which can simply ignore this definition.
  1.1433 + m4_define([_AM_AUTOCONF_VERSION], [])
  1.1434 + 
  1.1435 + # AM_SET_CURRENT_AUTOMAKE_VERSION
  1.1436 + # -------------------------------
  1.1437 + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
  1.1438 + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
  1.1439 + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
  1.1440 +-[AM_AUTOMAKE_VERSION([1.11.1])dnl
  1.1441 ++[AM_AUTOMAKE_VERSION([1.11.3])dnl
  1.1442 + m4_ifndef([AC_AUTOCONF_VERSION],
  1.1443 +   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
  1.1444 + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
  1.1445 + 
  1.1446 + # Figure out how to run the assembler.                      -*- Autoconf -*-
  1.1447 + 
  1.1448 + # Copyright (C) 2001, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
  1.1449 + #
  1.1450 +@@ -74,22 +78,24 @@
  1.1451 + test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
  1.1452 + AC_ARG_VAR([CCAS],      [assembler compiler command (defaults to CC)])
  1.1453 + AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
  1.1454 + _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
  1.1455 + ])
  1.1456 + 
  1.1457 + # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
  1.1458 + 
  1.1459 +-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
  1.1460 ++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
  1.1461 + #
  1.1462 + # This file is free software; the Free Software Foundation
  1.1463 + # gives unlimited permission to copy and/or distribute it,
  1.1464 + # with or without modifications, as long as this notice is preserved.
  1.1465 + 
  1.1466 ++# serial 1
  1.1467 ++
  1.1468 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
  1.1469 + # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
  1.1470 + # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
  1.1471 + #
  1.1472 + # Of course, Automake must honor this variable whenever it calls a
  1.1473 + # tool from the auxiliary directory.  The problem is that $srcdir (and
  1.1474 + # therefore $ac_aux_dir as well) can be either absolute or relative,
  1.1475 + # depending on how configure is run.  This is pretty annoying, since
  1.1476 +@@ -161,24 +167,24 @@
  1.1477 +   $1_FALSE=
  1.1478 + fi
  1.1479 + AC_CONFIG_COMMANDS_PRE(
  1.1480 + [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
  1.1481 +   AC_MSG_ERROR([[conditional "$1" was never defined.
  1.1482 + Usually this means the macro was only invoked conditionally.]])
  1.1483 + fi])])
  1.1484 + 
  1.1485 +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
  1.1486 +-# Free Software Foundation, Inc.
  1.1487 ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
  1.1488 ++# 2010, 2011 Free Software Foundation, Inc.
  1.1489 + #
  1.1490 + # This file is free software; the Free Software Foundation
  1.1491 + # gives unlimited permission to copy and/or distribute it,
  1.1492 + # with or without modifications, as long as this notice is preserved.
  1.1493 + 
  1.1494 +-# serial 10
  1.1495 ++# serial 12
  1.1496 + 
  1.1497 + # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
  1.1498 + # written in clear, in which case automake, when reading aclocal.m4,
  1.1499 + # will think it sees a *use*, and therefore will trigger all it's
  1.1500 + # C support machinery.  Also note that it means that autoscan, seeing
  1.1501 + # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
  1.1502 + 
  1.1503 + 
  1.1504 +@@ -208,16 +214,17 @@
  1.1505 + AC_CACHE_CHECK([dependency style of $depcc],
  1.1506 +                [am_cv_$1_dependencies_compiler_type],
  1.1507 + [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
  1.1508 +   # We make a subdir and do the tests there.  Otherwise we can end up
  1.1509 +   # making bogus files that we don't know about and never remove.  For
  1.1510 +   # instance it was reported that on HP-UX the gcc test will end up
  1.1511 +   # making a dummy file named `D' -- because `-MD' means `put the output
  1.1512 +   # in D'.
  1.1513 ++  rm -rf conftest.dir
  1.1514 +   mkdir conftest.dir
  1.1515 +   # Copy depcomp to subdir because otherwise we won't find it if we're
  1.1516 +   # using a relative directory.
  1.1517 +   cp "$am_depcomp" conftest.dir
  1.1518 +   cd conftest.dir
  1.1519 +   # We will build objects and dependencies in a subdirectory because
  1.1520 +   # it helps to detect inapplicable dependency modes.  For instance
  1.1521 +   # both Tru64's cc and ICC support -MD to output dependencies as a
  1.1522 +@@ -272,17 +279,17 @@
  1.1523 +       # after this tag, mechanisms are not by side-effect, so they'll
  1.1524 +       # only be used when explicitly requested
  1.1525 +       if test "x$enable_dependency_tracking" = xyes; then
  1.1526 + 	continue
  1.1527 +       else
  1.1528 + 	break
  1.1529 +       fi
  1.1530 +       ;;
  1.1531 +-    msvisualcpp | msvcmsys)
  1.1532 ++    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
  1.1533 +       # This compiler won't grok `-c -o', but also, the minuso test has
  1.1534 +       # not run yet.  These depmodes are late enough in the game, and
  1.1535 +       # so weak that their functioning should not be impacted.
  1.1536 +       am__obj=conftest.${OBJEXT-o}
  1.1537 +       am__minus_obj=
  1.1538 +       ;;
  1.1539 +     none) break ;;
  1.1540 +     esac
  1.1541 +@@ -337,20 +344,23 @@
  1.1542 + # ------------
  1.1543 + AC_DEFUN([AM_DEP_TRACK],
  1.1544 + [AC_ARG_ENABLE(dependency-tracking,
  1.1545 + [  --disable-dependency-tracking  speeds up one-time build
  1.1546 +   --enable-dependency-tracking   do not reject slow dependency extractors])
  1.1547 + if test "x$enable_dependency_tracking" != xno; then
  1.1548 +   am_depcomp="$ac_aux_dir/depcomp"
  1.1549 +   AMDEPBACKSLASH='\'
  1.1550 ++  am__nodep='_no'
  1.1551 + fi
  1.1552 + AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
  1.1553 + AC_SUBST([AMDEPBACKSLASH])dnl
  1.1554 + _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
  1.1555 ++AC_SUBST([am__nodep])dnl
  1.1556 ++_AM_SUBST_NOTMAKE([am__nodep])dnl
  1.1557 + ])
  1.1558 + 
  1.1559 + # Generate code to set up dependency tracking.              -*- Autoconf -*-
  1.1560 + 
  1.1561 + # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
  1.1562 + # Free Software Foundation, Inc.
  1.1563 + #
  1.1564 + # This file is free software; the Free Software Foundation
  1.1565 +@@ -574,22 +584,25 @@
  1.1566 +     $_am_arg | $_am_arg:* )
  1.1567 +       break ;;
  1.1568 +     * )
  1.1569 +       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
  1.1570 +   esac
  1.1571 + done
  1.1572 + echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
  1.1573 + 
  1.1574 +-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
  1.1575 ++# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
  1.1576 ++# Inc.
  1.1577 + #
  1.1578 + # This file is free software; the Free Software Foundation
  1.1579 + # gives unlimited permission to copy and/or distribute it,
  1.1580 + # with or without modifications, as long as this notice is preserved.
  1.1581 + 
  1.1582 ++# serial 1
  1.1583 ++
  1.1584 + # AM_PROG_INSTALL_SH
  1.1585 + # ------------------
  1.1586 + # Define $install_sh.
  1.1587 + AC_DEFUN([AM_PROG_INSTALL_SH],
  1.1588 + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
  1.1589 + if test x"${install_sh}" != xset; then
  1.1590 +   case $am_aux_dir in
  1.1591 +   *\ * | *\	*)
  1.1592 +@@ -746,22 +759,25 @@
  1.1593 + if eval "$MISSING --run true"; then
  1.1594 +   am_missing_run="$MISSING --run "
  1.1595 + else
  1.1596 +   am_missing_run=
  1.1597 +   AC_MSG_WARN([`missing' script is too old or missing])
  1.1598 + fi
  1.1599 + ])
  1.1600 + 
  1.1601 +-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
  1.1602 ++# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
  1.1603 ++# Inc.
  1.1604 + #
  1.1605 + # This file is free software; the Free Software Foundation
  1.1606 + # gives unlimited permission to copy and/or distribute it,
  1.1607 + # with or without modifications, as long as this notice is preserved.
  1.1608 + 
  1.1609 ++# serial 1
  1.1610 ++
  1.1611 + # AM_PROG_MKDIR_P
  1.1612 + # ---------------
  1.1613 + # Check for `mkdir -p'.
  1.1614 + AC_DEFUN([AM_PROG_MKDIR_P],
  1.1615 + [AC_PREREQ([2.60])dnl
  1.1616 + AC_REQUIRE([AC_PROG_MKDIR_P])dnl
  1.1617 + dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
  1.1618 + dnl while keeping a definition of mkdir_p for backward compatibility.
  1.1619 +@@ -774,53 +790,56 @@
  1.1620 + case $mkdir_p in
  1.1621 +   [[\\/$]]* | ?:[[\\/]]*) ;;
  1.1622 +   */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
  1.1623 + esac
  1.1624 + ])
  1.1625 + 
  1.1626 + # Helper functions for option handling.                     -*- Autoconf -*-
  1.1627 + 
  1.1628 +-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
  1.1629 ++# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
  1.1630 ++# Foundation, Inc.
  1.1631 + #
  1.1632 + # This file is free software; the Free Software Foundation
  1.1633 + # gives unlimited permission to copy and/or distribute it,
  1.1634 + # with or without modifications, as long as this notice is preserved.
  1.1635 + 
  1.1636 +-# serial 4
  1.1637 ++# serial 5
  1.1638 + 
  1.1639 + # _AM_MANGLE_OPTION(NAME)
  1.1640 + # -----------------------
  1.1641 + AC_DEFUN([_AM_MANGLE_OPTION],
  1.1642 + [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
  1.1643 + 
  1.1644 + # _AM_SET_OPTION(NAME)
  1.1645 +-# ------------------------------
  1.1646 ++# --------------------
  1.1647 + # Set option NAME.  Presently that only means defining a flag for this option.
  1.1648 + AC_DEFUN([_AM_SET_OPTION],
  1.1649 + [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
  1.1650 + 
  1.1651 + # _AM_SET_OPTIONS(OPTIONS)
  1.1652 +-# ----------------------------------
  1.1653 ++# ------------------------
  1.1654 + # OPTIONS is a space-separated list of Automake options.
  1.1655 + AC_DEFUN([_AM_SET_OPTIONS],
  1.1656 + [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
  1.1657 + 
  1.1658 + # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
  1.1659 + # -------------------------------------------
  1.1660 + # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
  1.1661 + AC_DEFUN([_AM_IF_OPTION],
  1.1662 + [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
  1.1663 + 
  1.1664 +-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
  1.1665 ++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
  1.1666 + #
  1.1667 + # This file is free software; the Free Software Foundation
  1.1668 + # gives unlimited permission to copy and/or distribute it,
  1.1669 + # with or without modifications, as long as this notice is preserved.
  1.1670 + 
  1.1671 ++# serial 1
  1.1672 ++
  1.1673 + # AM_RUN_LOG(COMMAND)
  1.1674 + # -------------------
  1.1675 + # Run COMMAND, save the exit status in ac_status, and log it.
  1.1676 + # (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
  1.1677 + AC_DEFUN([AM_RUN_LOG],
  1.1678 + [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
  1.1679 +    ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
  1.1680 +    ac_status=$?
  1.1681 +@@ -887,22 +906,24 @@
  1.1682 +    # Ok.
  1.1683 +    :
  1.1684 + else
  1.1685 +    AC_MSG_ERROR([newly created file is older than distributed files!
  1.1686 + Check your system clock])
  1.1687 + fi
  1.1688 + AC_MSG_RESULT(yes)])
  1.1689 + 
  1.1690 +-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
  1.1691 ++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
  1.1692 + #
  1.1693 + # This file is free software; the Free Software Foundation
  1.1694 + # gives unlimited permission to copy and/or distribute it,
  1.1695 + # with or without modifications, as long as this notice is preserved.
  1.1696 + 
  1.1697 ++# serial 1
  1.1698 ++
  1.1699 + # AM_PROG_INSTALL_STRIP
  1.1700 + # ---------------------
  1.1701 + # One issue with vendor `install' (even GNU) is that you can't
  1.1702 + # specify the program used to strip binaries.  This is especially
  1.1703 + # annoying in cross-compiling environments, where the build's strip
  1.1704 + # is unlikely to handle the host's binaries.
  1.1705 + # Fortunately install-sh will honor a STRIPPROG variable, so we
  1.1706 + # always use install-sh in `make install-strip', and initialize
  1.1707 +@@ -915,38 +936,38 @@
  1.1708 + # will honor the `STRIP' environment variable to overrule this program.
  1.1709 + dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
  1.1710 + if test "$cross_compiling" != no; then
  1.1711 +   AC_CHECK_TOOL([STRIP], [strip], :)
  1.1712 + fi
  1.1713 + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
  1.1714 + AC_SUBST([INSTALL_STRIP_PROGRAM])])
  1.1715 + 
  1.1716 +-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
  1.1717 ++# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
  1.1718 + #
  1.1719 + # This file is free software; the Free Software Foundation
  1.1720 + # gives unlimited permission to copy and/or distribute it,
  1.1721 + # with or without modifications, as long as this notice is preserved.
  1.1722 + 
  1.1723 +-# serial 2
  1.1724 ++# serial 3
  1.1725 + 
  1.1726 + # _AM_SUBST_NOTMAKE(VARIABLE)
  1.1727 + # ---------------------------
  1.1728 + # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
  1.1729 + # This macro is traced by Automake.
  1.1730 + AC_DEFUN([_AM_SUBST_NOTMAKE])
  1.1731 + 
  1.1732 + # AM_SUBST_NOTMAKE(VARIABLE)
  1.1733 +-# ---------------------------
  1.1734 ++# --------------------------
  1.1735 + # Public sister of _AM_SUBST_NOTMAKE.
  1.1736 + AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
  1.1737 + 
  1.1738 + # Check how to create a tarball.                            -*- Autoconf -*-
  1.1739 + 
  1.1740 +-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
  1.1741 ++# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
  1.1742 + #
  1.1743 + # This file is free software; the Free Software Foundation
  1.1744 + # gives unlimited permission to copy and/or distribute it,
  1.1745 + # with or without modifications, as long as this notice is preserved.
  1.1746 + 
  1.1747 + # serial 2
  1.1748 + 
  1.1749 + # _AM_PROG_TAR(FORMAT)
  1.1750 +@@ -958,20 +979,21 @@
  1.1751 + # writing to stdout a FORMAT-tarball containing the directory
  1.1752 + # $tardir.
  1.1753 + #     tardir=directory && $(am__tar) > result.tar
  1.1754 + #
  1.1755 + # Substitute a variable $(am__untar) that extract such
  1.1756 + # a tarball read from stdin.
  1.1757 + #     $(am__untar) < result.tar
  1.1758 + AC_DEFUN([_AM_PROG_TAR],
  1.1759 +-[# Always define AMTAR for backward compatibility.
  1.1760 +-AM_MISSING_PROG([AMTAR], [tar])
  1.1761 ++[# Always define AMTAR for backward compatibility.  Yes, it's still used
  1.1762 ++# in the wild :-(  We should find a proper way to deprecate it ...
  1.1763 ++AC_SUBST([AMTAR], ['$${TAR-tar}'])
  1.1764 + m4_if([$1], [v7],
  1.1765 +-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
  1.1766 ++     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
  1.1767 +      [m4_case([$1], [ustar],, [pax],,
  1.1768 +               [m4_fatal([Unknown tar format])])
  1.1769 + AC_MSG_CHECKING([how to create a $1 tar archive])
  1.1770 + # Loop over all known methods to create a tar archive until one works.
  1.1771 + _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
  1.1772 + _am_tools=${am_cv_prog_tar_$1-$_am_tools}
  1.1773 + # Do not fold the above two line into one, because Tru64 sh and
  1.1774 + # Solaris sh will not grok spaces in the rhs of `-'.
  1.1775 +diff --git a/configure b/configure
  1.1776 +--- a/configure
  1.1777 ++++ b/configure
  1.1778 +@@ -1,18 +1,18 @@
  1.1779 + #! /bin/sh
  1.1780 + # Guess values for system-dependent variables and create Makefiles.
  1.1781 +-# Generated by GNU Autoconf 2.65 for breakpad 0.1.
  1.1782 ++# Generated by GNU Autoconf 2.68 for breakpad 0.1.
  1.1783 + #
  1.1784 + # Report bugs to <google-breakpad-dev@googlegroups.com>.
  1.1785 + #
  1.1786 + #
  1.1787 + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
  1.1788 +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
  1.1789 +-# Inc.
  1.1790 ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
  1.1791 ++# Foundation, Inc.
  1.1792 + #
  1.1793 + #
  1.1794 + # This configure script is free software; the Free Software Foundation
  1.1795 + # gives unlimited permission to copy, distribute and modify it.
  1.1796 + ## -------------------- ##
  1.1797 + ## M4sh Initialization. ##
  1.1798 + ## -------------------- ##
  1.1799 + 
  1.1800 +@@ -86,16 +86,17 @@
  1.1801 + # IFS
  1.1802 + # We need space, tab and new line, in precisely that order.  Quoting is
  1.1803 + # there to prevent editors from complaining about space-tab.
  1.1804 + # (If _AS_PATH_WALK were called with IFS unset, it would disable word
  1.1805 + # splitting by setting IFS to empty value.)
  1.1806 + IFS=" ""	$as_nl"
  1.1807 + 
  1.1808 + # Find who we are.  Look in the path if we contain no directory separator.
  1.1809 ++as_myself=
  1.1810 + case $0 in #((
  1.1811 +   *[\\/]* ) as_myself=$0 ;;
  1.1812 +   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.1813 + for as_dir in $PATH
  1.1814 + do
  1.1815 +   IFS=$as_save_IFS
  1.1816 +   test -z "$as_dir" && as_dir=.
  1.1817 +     test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
  1.1818 +@@ -211,21 +212,28 @@
  1.1819 + fi; }
  1.1820 + IFS=$as_save_IFS
  1.1821 + 
  1.1822 + 
  1.1823 +       if test "x$CONFIG_SHELL" != x; then :
  1.1824 +   # We cannot yet assume a decent shell, so we have to provide a
  1.1825 + 	# neutralization value for shells without unset; and this also
  1.1826 + 	# works around shells that cannot unset nonexistent variables.
  1.1827 ++	# Preserve -v and -x to the replacement shell.
  1.1828 + 	BASH_ENV=/dev/null
  1.1829 + 	ENV=/dev/null
  1.1830 + 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
  1.1831 + 	export CONFIG_SHELL
  1.1832 +-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
  1.1833 ++	case $- in # ((((
  1.1834 ++	  *v*x* | *x*v* ) as_opts=-vx ;;
  1.1835 ++	  *v* ) as_opts=-v ;;
  1.1836 ++	  *x* ) as_opts=-x ;;
  1.1837 ++	  * ) as_opts= ;;
  1.1838 ++	esac
  1.1839 ++	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
  1.1840 + fi
  1.1841 + 
  1.1842 +     if test x$as_have_required = xno; then :
  1.1843 +   $as_echo "$0: This script requires a shell more modern than all"
  1.1844 +   $as_echo "$0: the shells that I found on your system."
  1.1845 +   if test x${ZSH_VERSION+set} = xset ; then
  1.1846 +     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
  1.1847 +     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
  1.1848 +@@ -314,17 +322,17 @@
  1.1849 + 	  /^X\(\/\).*/{
  1.1850 + 	    s//\1/
  1.1851 + 	    q
  1.1852 + 	  }
  1.1853 + 	  s/.*/./; q'`
  1.1854 +       test -d "$as_dir" && break
  1.1855 +     done
  1.1856 +     test -z "$as_dirs" || eval "mkdir $as_dirs"
  1.1857 +-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
  1.1858 ++  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
  1.1859 + 
  1.1860 + 
  1.1861 + } # as_fn_mkdir_p
  1.1862 + # as_fn_append VAR VALUE
  1.1863 + # ----------------------
  1.1864 + # Append the text in VALUE to the end of the definition contained in VAR. Take
  1.1865 + # advantage of any shell optimizations that allow amortized linear growth over
  1.1866 + # repeated appends, instead of the typical quadratic growth present in naive
  1.1867 +@@ -354,29 +362,29 @@
  1.1868 + else
  1.1869 +   as_fn_arith ()
  1.1870 +   {
  1.1871 +     as_val=`expr "$@" || test $? -eq 1`
  1.1872 +   }
  1.1873 + fi # as_fn_arith
  1.1874 + 
  1.1875 + 
  1.1876 +-# as_fn_error ERROR [LINENO LOG_FD]
  1.1877 +-# ---------------------------------
  1.1878 ++# as_fn_error STATUS ERROR [LINENO LOG_FD]
  1.1879 ++# ----------------------------------------
  1.1880 + # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
  1.1881 + # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
  1.1882 +-# script with status $?, using 1 if that was 0.
  1.1883 ++# script with STATUS, using 1 if that was 0.
  1.1884 + as_fn_error ()
  1.1885 + {
  1.1886 +-  as_status=$?; test $as_status -eq 0 && as_status=1
  1.1887 +-  if test "$3"; then
  1.1888 +-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  1.1889 +-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
  1.1890 ++  as_status=$1; test $as_status -eq 0 && as_status=1
  1.1891 ++  if test "$4"; then
  1.1892 ++    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  1.1893 ++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
  1.1894 +   fi
  1.1895 +-  $as_echo "$as_me: error: $1" >&2
  1.1896 ++  $as_echo "$as_me: error: $2" >&2
  1.1897 +   as_fn_exit $as_status
  1.1898 + } # as_fn_error
  1.1899 + 
  1.1900 + if expr a : '\(a\)' >/dev/null 2>&1 &&
  1.1901 +    test "X`expr 00001 : '.*\(...\)'`" = X001; then
  1.1902 +   as_expr=expr
  1.1903 + else
  1.1904 +   as_expr=false
  1.1905 +@@ -528,17 +536,17 @@
  1.1906 + # Sed expression to map a string onto a valid variable name.
  1.1907 + as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  1.1908 + 
  1.1909 + 
  1.1910 + test -n "$DJDIR" || exec 7<&0 </dev/null
  1.1911 + exec 6>&1
  1.1912 + 
  1.1913 + # Name of the host.
  1.1914 +-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
  1.1915 ++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
  1.1916 + # so uname gets run too.
  1.1917 + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
  1.1918 + 
  1.1919 + #
  1.1920 + # Initializations.
  1.1921 + #
  1.1922 + ac_default_prefix=/usr/local
  1.1923 + ac_clean_files=
  1.1924 +@@ -627,16 +635,17 @@
  1.1925 + am__fastdepCCAS_FALSE
  1.1926 + am__fastdepCCAS_TRUE
  1.1927 + CCASDEPMODE
  1.1928 + CCASFLAGS
  1.1929 + CCAS
  1.1930 + am__fastdepCC_FALSE
  1.1931 + am__fastdepCC_TRUE
  1.1932 + CCDEPMODE
  1.1933 ++am__nodep
  1.1934 + AMDEPBACKSLASH
  1.1935 + AMDEP_FALSE
  1.1936 + AMDEP_TRUE
  1.1937 + am__quote
  1.1938 + am__include
  1.1939 + DEPDIR
  1.1940 + OBJEXT
  1.1941 + EXEEXT
  1.1942 +@@ -794,18 +803,19 @@
  1.1943 +   # If the previous option needs an argument, assign it.
  1.1944 +   if test -n "$ac_prev"; then
  1.1945 +     eval $ac_prev=\$ac_option
  1.1946 +     ac_prev=
  1.1947 +     continue
  1.1948 +   fi
  1.1949 + 
  1.1950 +   case $ac_option in
  1.1951 +-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
  1.1952 +-  *)	ac_optarg=yes ;;
  1.1953 ++  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
  1.1954 ++  *=)   ac_optarg= ;;
  1.1955 ++  *)    ac_optarg=yes ;;
  1.1956 +   esac
  1.1957 + 
  1.1958 +   # Accept the important Cygnus configure options, so we can diagnose typos.
  1.1959 + 
  1.1960 +   case $ac_dashdash$ac_option in
  1.1961 +   --)
  1.1962 +     ac_dashdash=yes ;;
  1.1963 + 
  1.1964 +@@ -840,17 +850,17 @@
  1.1965 +   -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
  1.1966 +   | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
  1.1967 +     datarootdir=$ac_optarg ;;
  1.1968 + 
  1.1969 +   -disable-* | --disable-*)
  1.1970 +     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
  1.1971 +     # Reject names that are not valid shell variable names.
  1.1972 +     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
  1.1973 +-      as_fn_error "invalid feature name: $ac_useropt"
  1.1974 ++      as_fn_error $? "invalid feature name: $ac_useropt"
  1.1975 +     ac_useropt_orig=$ac_useropt
  1.1976 +     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
  1.1977 +     case $ac_user_opts in
  1.1978 +       *"
  1.1979 + "enable_$ac_useropt"
  1.1980 + "*) ;;
  1.1981 +       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
  1.1982 + 	 ac_unrecognized_sep=', ';;
  1.1983 +@@ -866,17 +876,17 @@
  1.1984 +     ac_prev=dvidir ;;
  1.1985 +   -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
  1.1986 +     dvidir=$ac_optarg ;;
  1.1987 + 
  1.1988 +   -enable-* | --enable-*)
  1.1989 +     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
  1.1990 +     # Reject names that are not valid shell variable names.
  1.1991 +     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
  1.1992 +-      as_fn_error "invalid feature name: $ac_useropt"
  1.1993 ++      as_fn_error $? "invalid feature name: $ac_useropt"
  1.1994 +     ac_useropt_orig=$ac_useropt
  1.1995 +     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
  1.1996 +     case $ac_user_opts in
  1.1997 +       *"
  1.1998 + "enable_$ac_useropt"
  1.1999 + "*) ;;
  1.2000 +       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
  1.2001 + 	 ac_unrecognized_sep=', ';;
  1.2002 +@@ -1070,33 +1080,33 @@
  1.2003 + 
  1.2004 +   -version | --version | --versio | --versi | --vers | -V)
  1.2005 +     ac_init_version=: ;;
  1.2006 + 
  1.2007 +   -with-* | --with-*)
  1.2008 +     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
  1.2009 +     # Reject names that are not valid shell variable names.
  1.2010 +     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
  1.2011 +-      as_fn_error "invalid package name: $ac_useropt"
  1.2012 ++      as_fn_error $? "invalid package name: $ac_useropt"
  1.2013 +     ac_useropt_orig=$ac_useropt
  1.2014 +     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
  1.2015 +     case $ac_user_opts in
  1.2016 +       *"
  1.2017 + "with_$ac_useropt"
  1.2018 + "*) ;;
  1.2019 +       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
  1.2020 + 	 ac_unrecognized_sep=', ';;
  1.2021 +     esac
  1.2022 +     eval with_$ac_useropt=\$ac_optarg ;;
  1.2023 + 
  1.2024 +   -without-* | --without-*)
  1.2025 +     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
  1.2026 +     # Reject names that are not valid shell variable names.
  1.2027 +     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
  1.2028 +-      as_fn_error "invalid package name: $ac_useropt"
  1.2029 ++      as_fn_error $? "invalid package name: $ac_useropt"
  1.2030 +     ac_useropt_orig=$ac_useropt
  1.2031 +     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
  1.2032 +     case $ac_user_opts in
  1.2033 +       *"
  1.2034 + "with_$ac_useropt"
  1.2035 + "*) ;;
  1.2036 +       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
  1.2037 + 	 ac_unrecognized_sep=', ';;
  1.2038 +@@ -1116,50 +1126,50 @@
  1.2039 + 
  1.2040 +   -x-libraries | --x-libraries | --x-librarie | --x-librari \
  1.2041 +   | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
  1.2042 +     ac_prev=x_libraries ;;
  1.2043 +   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
  1.2044 +   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
  1.2045 +     x_libraries=$ac_optarg ;;
  1.2046 + 
  1.2047 +-  -*) as_fn_error "unrecognized option: \`$ac_option'
  1.2048 +-Try \`$0 --help' for more information."
  1.2049 ++  -*) as_fn_error $? "unrecognized option: \`$ac_option'
  1.2050 ++Try \`$0 --help' for more information"
  1.2051 +     ;;
  1.2052 + 
  1.2053 +   *=*)
  1.2054 +     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
  1.2055 +     # Reject names that are not valid shell variable names.
  1.2056 +     case $ac_envvar in #(
  1.2057 +       '' | [0-9]* | *[!_$as_cr_alnum]* )
  1.2058 +-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
  1.2059 ++      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
  1.2060 +     esac
  1.2061 +     eval $ac_envvar=\$ac_optarg
  1.2062 +     export $ac_envvar ;;
  1.2063 + 
  1.2064 +   *)
  1.2065 +     # FIXME: should be removed in autoconf 3.0.
  1.2066 +     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
  1.2067 +     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
  1.2068 +       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
  1.2069 +-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
  1.2070 ++    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
  1.2071 +     ;;
  1.2072 + 
  1.2073 +   esac
  1.2074 + done
  1.2075 + 
  1.2076 + if test -n "$ac_prev"; then
  1.2077 +   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
  1.2078 +-  as_fn_error "missing argument to $ac_option"
  1.2079 ++  as_fn_error $? "missing argument to $ac_option"
  1.2080 + fi
  1.2081 + 
  1.2082 + if test -n "$ac_unrecognized_opts"; then
  1.2083 +   case $enable_option_checking in
  1.2084 +     no) ;;
  1.2085 +-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
  1.2086 ++    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
  1.2087 +     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
  1.2088 +   esac
  1.2089 + fi
  1.2090 + 
  1.2091 + # Check all directory arguments for consistency.
  1.2092 + for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
  1.2093 + 		datadir sysconfdir sharedstatedir localstatedir includedir \
  1.2094 + 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
  1.2095 +@@ -1172,49 +1182,49 @@
  1.2096 +       ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
  1.2097 +       eval $ac_var=\$ac_val;;
  1.2098 +   esac
  1.2099 +   # Be sure to have absolute directory names.
  1.2100 +   case $ac_val in
  1.2101 +     [\\/$]* | ?:[\\/]* )  continue;;
  1.2102 +     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
  1.2103 +   esac
  1.2104 +-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
  1.2105 ++  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
  1.2106 + done
  1.2107 + 
  1.2108 + # There might be people who depend on the old broken behavior: `$host'
  1.2109 + # used to hold the argument of --host etc.
  1.2110 + # FIXME: To remove some day.
  1.2111 + build=$build_alias
  1.2112 + host=$host_alias
  1.2113 + target=$target_alias
  1.2114 + 
  1.2115 + # FIXME: To remove some day.
  1.2116 + if test "x$host_alias" != x; then
  1.2117 +   if test "x$build_alias" = x; then
  1.2118 +     cross_compiling=maybe
  1.2119 +-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
  1.2120 +-    If a cross compiler is detected then cross compile mode will be used." >&2
  1.2121 ++    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
  1.2122 ++    If a cross compiler is detected then cross compile mode will be used" >&2
  1.2123 +   elif test "x$build_alias" != "x$host_alias"; then
  1.2124 +     cross_compiling=yes
  1.2125 +   fi
  1.2126 + fi
  1.2127 + 
  1.2128 + ac_tool_prefix=
  1.2129 + test -n "$host_alias" && ac_tool_prefix=$host_alias-
  1.2130 + 
  1.2131 + test "$silent" = yes && exec 6>/dev/null
  1.2132 + 
  1.2133 + 
  1.2134 + ac_pwd=`pwd` && test -n "$ac_pwd" &&
  1.2135 + ac_ls_di=`ls -di .` &&
  1.2136 + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
  1.2137 +-  as_fn_error "working directory cannot be determined"
  1.2138 ++  as_fn_error $? "working directory cannot be determined"
  1.2139 + test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
  1.2140 +-  as_fn_error "pwd does not report name of working directory"
  1.2141 ++  as_fn_error $? "pwd does not report name of working directory"
  1.2142 + 
  1.2143 + 
  1.2144 + # Find the source files, if location was not specified.
  1.2145 + if test -z "$srcdir"; then
  1.2146 +   ac_srcdir_defaulted=yes
  1.2147 +   # Try the directory containing this script, then the parent directory.
  1.2148 +   ac_confdir=`$as_dirname -- "$as_myself" ||
  1.2149 + $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  1.2150 +@@ -1243,21 +1253,21 @@
  1.2151 +   if test ! -r "$srcdir/$ac_unique_file"; then
  1.2152 +     srcdir=..
  1.2153 +   fi
  1.2154 + else
  1.2155 +   ac_srcdir_defaulted=no
  1.2156 + fi
  1.2157 + if test ! -r "$srcdir/$ac_unique_file"; then
  1.2158 +   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
  1.2159 +-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
  1.2160 ++  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
  1.2161 + fi
  1.2162 + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
  1.2163 + ac_abs_confdir=`(
  1.2164 +-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
  1.2165 ++	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
  1.2166 + 	pwd)`
  1.2167 + # When building in place, set srcdir=.
  1.2168 + if test "$ac_abs_confdir" = "$ac_pwd"; then
  1.2169 +   srcdir=.
  1.2170 + fi
  1.2171 + # Remove unnecessary trailing slashes from srcdir.
  1.2172 + # Double slashes in file names in object file debugging info
  1.2173 + # mess up M-x gdb in Emacs.
  1.2174 +@@ -1287,17 +1297,17 @@
  1.2175 + 
  1.2176 + Defaults for the options are specified in brackets.
  1.2177 + 
  1.2178 + Configuration:
  1.2179 +   -h, --help              display this help and exit
  1.2180 +       --help=short        display options specific to this package
  1.2181 +       --help=recursive    display the short help of all the included packages
  1.2182 +   -V, --version           display version information and exit
  1.2183 +-  -q, --quiet, --silent   do not print \`checking...' messages
  1.2184 ++  -q, --quiet, --silent   do not print \`checking ...' messages
  1.2185 +       --cache-file=FILE   cache test results in FILE [disabled]
  1.2186 +   -C, --config-cache      alias for \`--cache-file=config.cache'
  1.2187 +   -n, --no-create         do not create output files
  1.2188 +       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
  1.2189 + 
  1.2190 + Installation directories:
  1.2191 +   --prefix=PREFIX         install architecture-independent files in PREFIX
  1.2192 +                           [$ac_default_prefix]
  1.2193 +@@ -1440,19 +1450,19 @@
  1.2194 +     cd "$ac_pwd" || { ac_status=$?; break; }
  1.2195 +   done
  1.2196 + fi
  1.2197 + 
  1.2198 + test -n "$ac_init_help" && exit $ac_status
  1.2199 + if $ac_init_version; then
  1.2200 +   cat <<\_ACEOF
  1.2201 + breakpad configure 0.1
  1.2202 +-generated by GNU Autoconf 2.65
  1.2203 +-
  1.2204 +-Copyright (C) 2009 Free Software Foundation, Inc.
  1.2205 ++generated by GNU Autoconf 2.68
  1.2206 ++
  1.2207 ++Copyright (C) 2010 Free Software Foundation, Inc.
  1.2208 + This configure script is free software; the Free Software Foundation
  1.2209 + gives unlimited permission to copy, distribute and modify it.
  1.2210 + _ACEOF
  1.2211 +   exit
  1.2212 + fi
  1.2213 + 
  1.2214 + ## ------------------------ ##
  1.2215 + ## Autoconf initialization. ##
  1.2216 +@@ -1486,17 +1496,17 @@
  1.2217 +        } && test -s conftest.$ac_objext; then :
  1.2218 +   ac_retval=0
  1.2219 + else
  1.2220 +   $as_echo "$as_me: failed program was:" >&5
  1.2221 + sed 's/^/| /' conftest.$ac_ext >&5
  1.2222 + 
  1.2223 + 	ac_retval=1
  1.2224 + fi
  1.2225 +-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  1.2226 ++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  1.2227 +   as_fn_set_status $ac_retval
  1.2228 + 
  1.2229 + } # ac_fn_c_try_compile
  1.2230 + 
  1.2231 + # ac_fn_c_try_cpp LINENO
  1.2232 + # ----------------------
  1.2233 + # Try to preprocess conftest.$ac_ext, and return whether this succeeded.
  1.2234 + ac_fn_c_try_cpp ()
  1.2235 +@@ -1512,28 +1522,28 @@
  1.2236 +   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
  1.2237 +   ac_status=$?
  1.2238 +   if test -s conftest.err; then
  1.2239 +     grep -v '^ *+' conftest.err >conftest.er1
  1.2240 +     cat conftest.er1 >&5
  1.2241 +     mv -f conftest.er1 conftest.err
  1.2242 +   fi
  1.2243 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  1.2244 +-  test $ac_status = 0; } >/dev/null && {
  1.2245 ++  test $ac_status = 0; } > conftest.i && {
  1.2246 + 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  1.2247 + 	 test ! -s conftest.err
  1.2248 +        }; then :
  1.2249 +   ac_retval=0
  1.2250 + else
  1.2251 +   $as_echo "$as_me: failed program was:" >&5
  1.2252 + sed 's/^/| /' conftest.$ac_ext >&5
  1.2253 + 
  1.2254 +     ac_retval=1
  1.2255 + fi
  1.2256 +-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  1.2257 ++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  1.2258 +   as_fn_set_status $ac_retval
  1.2259 + 
  1.2260 + } # ac_fn_c_try_cpp
  1.2261 + 
  1.2262 + # ac_fn_cxx_try_compile LINENO
  1.2263 + # ----------------------------
  1.2264 + # Try to compile conftest.$ac_ext, and return whether this succeeded.
  1.2265 + ac_fn_cxx_try_compile ()
  1.2266 +@@ -1561,17 +1571,17 @@
  1.2267 +        } && test -s conftest.$ac_objext; then :
  1.2268 +   ac_retval=0
  1.2269 + else
  1.2270 +   $as_echo "$as_me: failed program was:" >&5
  1.2271 + sed 's/^/| /' conftest.$ac_ext >&5
  1.2272 + 
  1.2273 + 	ac_retval=1
  1.2274 + fi
  1.2275 +-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  1.2276 ++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  1.2277 +   as_fn_set_status $ac_retval
  1.2278 + 
  1.2279 + } # ac_fn_cxx_try_compile
  1.2280 + 
  1.2281 + # ac_fn_c_try_run LINENO
  1.2282 + # ----------------------
  1.2283 + # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
  1.2284 + # that executables *can* be run.
  1.2285 +@@ -1603,17 +1613,17 @@
  1.2286 + else
  1.2287 +   $as_echo "$as_me: program exited with status $ac_status" >&5
  1.2288 +        $as_echo "$as_me: failed program was:" >&5
  1.2289 + sed 's/^/| /' conftest.$ac_ext >&5
  1.2290 + 
  1.2291 +        ac_retval=$ac_status
  1.2292 + fi
  1.2293 +   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
  1.2294 +-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  1.2295 ++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  1.2296 +   as_fn_set_status $ac_retval
  1.2297 + 
  1.2298 + } # ac_fn_c_try_run
  1.2299 + 
  1.2300 + # ac_fn_c_try_link LINENO
  1.2301 + # -----------------------
  1.2302 + # Try to link conftest.$ac_ext, and return whether this succeeded.
  1.2303 + ac_fn_c_try_link ()
  1.2304 +@@ -1649,33 +1659,33 @@
  1.2305 + 
  1.2306 + 	ac_retval=1
  1.2307 + fi
  1.2308 +   # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
  1.2309 +   # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
  1.2310 +   # interfere with the next link command; also delete a directory that is
  1.2311 +   # left behind by Apple's compiler.  We do this before executing the actions.
  1.2312 +   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
  1.2313 +-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  1.2314 ++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  1.2315 +   as_fn_set_status $ac_retval
  1.2316 + 
  1.2317 + } # ac_fn_c_try_link
  1.2318 + 
  1.2319 + # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
  1.2320 + # -------------------------------------------------------
  1.2321 + # Tests whether HEADER exists, giving a warning if it cannot be compiled using
  1.2322 + # the include files in INCLUDES and setting the cache variable VAR
  1.2323 + # accordingly.
  1.2324 + ac_fn_c_check_header_mongrel ()
  1.2325 + {
  1.2326 +   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  1.2327 +-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  1.2328 ++  if eval \${$3+:} false; then :
  1.2329 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  1.2330 + $as_echo_n "checking for $2... " >&6; }
  1.2331 +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  1.2332 ++if eval \${$3+:} false; then :
  1.2333 +   $as_echo_n "(cached) " >&6
  1.2334 + fi
  1.2335 + eval ac_res=\$$3
  1.2336 + 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  1.2337 + $as_echo "$ac_res" >&6; }
  1.2338 + else
  1.2339 +   # Is the header compilable?
  1.2340 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
  1.2341 +@@ -1701,17 +1711,17 @@
  1.2342 + /* end confdefs.h.  */
  1.2343 + #include <$2>
  1.2344 + _ACEOF
  1.2345 + if ac_fn_c_try_cpp "$LINENO"; then :
  1.2346 +   ac_header_preproc=yes
  1.2347 + else
  1.2348 +   ac_header_preproc=no
  1.2349 + fi
  1.2350 +-rm -f conftest.err conftest.$ac_ext
  1.2351 ++rm -f conftest.err conftest.i conftest.$ac_ext
  1.2352 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
  1.2353 + $as_echo "$ac_header_preproc" >&6; }
  1.2354 + 
  1.2355 + # So?  What about this header?
  1.2356 + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
  1.2357 +   yes:no: )
  1.2358 +     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
  1.2359 + $as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
  1.2360 +@@ -1724,49 +1734,47 @@
  1.2361 +     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
  1.2362 + $as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
  1.2363 +     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
  1.2364 + $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
  1.2365 +     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
  1.2366 + $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
  1.2367 +     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
  1.2368 + $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
  1.2369 +-( cat <<\_ASBOX
  1.2370 +-## --------------------------------------------------- ##
  1.2371 ++( $as_echo "## --------------------------------------------------- ##
  1.2372 + ## Report this to google-breakpad-dev@googlegroups.com ##
  1.2373 +-## --------------------------------------------------- ##
  1.2374 +-_ASBOX
  1.2375 ++## --------------------------------------------------- ##"
  1.2376 +      ) | sed "s/^/$as_me: WARNING:     /" >&2
  1.2377 +     ;;
  1.2378 + esac
  1.2379 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  1.2380 + $as_echo_n "checking for $2... " >&6; }
  1.2381 +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  1.2382 ++if eval \${$3+:} false; then :
  1.2383 +   $as_echo_n "(cached) " >&6
  1.2384 + else
  1.2385 +   eval "$3=\$ac_header_compiler"
  1.2386 + fi
  1.2387 + eval ac_res=\$$3
  1.2388 + 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  1.2389 + $as_echo "$ac_res" >&6; }
  1.2390 + fi
  1.2391 +-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  1.2392 ++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  1.2393 + 
  1.2394 + } # ac_fn_c_check_header_mongrel
  1.2395 + 
  1.2396 + # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
  1.2397 + # -------------------------------------------------------
  1.2398 + # Tests whether HEADER exists and can be compiled using the include files in
  1.2399 + # INCLUDES, setting the cache variable VAR accordingly.
  1.2400 + ac_fn_c_check_header_compile ()
  1.2401 + {
  1.2402 +   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  1.2403 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  1.2404 + $as_echo_n "checking for $2... " >&6; }
  1.2405 +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  1.2406 ++if eval \${$3+:} false; then :
  1.2407 +   $as_echo_n "(cached) " >&6
  1.2408 + else
  1.2409 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.2410 + /* end confdefs.h.  */
  1.2411 + $4
  1.2412 + #include <$2>
  1.2413 + _ACEOF
  1.2414 + if ac_fn_c_try_compile "$LINENO"; then :
  1.2415 +@@ -1774,25 +1782,25 @@
  1.2416 + else
  1.2417 +   eval "$3=no"
  1.2418 + fi
  1.2419 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  1.2420 + fi
  1.2421 + eval ac_res=\$$3
  1.2422 + 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  1.2423 + $as_echo "$ac_res" >&6; }
  1.2424 +-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  1.2425 ++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  1.2426 + 
  1.2427 + } # ac_fn_c_check_header_compile
  1.2428 + cat >config.log <<_ACEOF
  1.2429 + This file contains any messages produced by compilers while
  1.2430 + running configure, to aid debugging if configure makes a mistake.
  1.2431 + 
  1.2432 + It was created by breakpad $as_me 0.1, which was
  1.2433 +-generated by GNU Autoconf 2.65.  Invocation command line was
  1.2434 ++generated by GNU Autoconf 2.68.  Invocation command line was
  1.2435 + 
  1.2436 +   $ $0 $@
  1.2437 + 
  1.2438 + _ACEOF
  1.2439 + exec 5>>config.log
  1.2440 + {
  1.2441 + cat <<_ASUNAME
  1.2442 + ## --------- ##
  1.2443 +@@ -1892,21 +1900,19 @@
  1.2444 + # would cause problems or look ugly.
  1.2445 + # WARNING: Use '\'' to represent an apostrophe within the trap.
  1.2446 + # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
  1.2447 + trap 'exit_status=$?
  1.2448 +   # Save into config.log some information that might help in debugging.
  1.2449 +   {
  1.2450 +     echo
  1.2451 + 
  1.2452 +-    cat <<\_ASBOX
  1.2453 +-## ---------------- ##
  1.2454 ++    $as_echo "## ---------------- ##
  1.2455 + ## Cache variables. ##
  1.2456 +-## ---------------- ##
  1.2457 +-_ASBOX
  1.2458 ++## ---------------- ##"
  1.2459 +     echo
  1.2460 +     # The following way of writing the cache mishandles newlines in values,
  1.2461 + (
  1.2462 +   for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
  1.2463 +     eval ac_val=\$$ac_var
  1.2464 +     case $ac_val in #(
  1.2465 +     *${as_nl}*)
  1.2466 +       case $ac_var in #(
  1.2467 +@@ -1930,56 +1936,50 @@
  1.2468 +     *)
  1.2469 +       sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
  1.2470 +       ;;
  1.2471 +     esac |
  1.2472 +     sort
  1.2473 + )
  1.2474 +     echo
  1.2475 + 
  1.2476 +-    cat <<\_ASBOX
  1.2477 +-## ----------------- ##
  1.2478 ++    $as_echo "## ----------------- ##
  1.2479 + ## Output variables. ##
  1.2480 +-## ----------------- ##
  1.2481 +-_ASBOX
  1.2482 ++## ----------------- ##"
  1.2483 +     echo
  1.2484 +     for ac_var in $ac_subst_vars
  1.2485 +     do
  1.2486 +       eval ac_val=\$$ac_var
  1.2487 +       case $ac_val in
  1.2488 +       *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
  1.2489 +       esac
  1.2490 +       $as_echo "$ac_var='\''$ac_val'\''"
  1.2491 +     done | sort
  1.2492 +     echo
  1.2493 + 
  1.2494 +     if test -n "$ac_subst_files"; then
  1.2495 +-      cat <<\_ASBOX
  1.2496 +-## ------------------- ##
  1.2497 ++      $as_echo "## ------------------- ##
  1.2498 + ## File substitutions. ##
  1.2499 +-## ------------------- ##
  1.2500 +-_ASBOX
  1.2501 ++## ------------------- ##"
  1.2502 +       echo
  1.2503 +       for ac_var in $ac_subst_files
  1.2504 +       do
  1.2505 + 	eval ac_val=\$$ac_var
  1.2506 + 	case $ac_val in
  1.2507 + 	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
  1.2508 + 	esac
  1.2509 + 	$as_echo "$ac_var='\''$ac_val'\''"
  1.2510 +       done | sort
  1.2511 +       echo
  1.2512 +     fi
  1.2513 + 
  1.2514 +     if test -s confdefs.h; then
  1.2515 +-      cat <<\_ASBOX
  1.2516 +-## ----------- ##
  1.2517 ++      $as_echo "## ----------- ##
  1.2518 + ## confdefs.h. ##
  1.2519 +-## ----------- ##
  1.2520 +-_ASBOX
  1.2521 ++## ----------- ##"
  1.2522 +       echo
  1.2523 +       cat confdefs.h
  1.2524 +       echo
  1.2525 +     fi
  1.2526 +     test "$ac_signal" != 0 &&
  1.2527 +       $as_echo "$as_me: caught signal $ac_signal"
  1.2528 +     $as_echo "$as_me: exit $exit_status"
  1.2529 +   } >&5
  1.2530 +@@ -2024,32 +2024,41 @@
  1.2531 + _ACEOF
  1.2532 + 
  1.2533 + 
  1.2534 + # Let the site file select an alternate cache file if it wants to.
  1.2535 + # Prefer an explicitly selected file to automatically selected ones.
  1.2536 + ac_site_file1=NONE
  1.2537 + ac_site_file2=NONE
  1.2538 + if test -n "$CONFIG_SITE"; then
  1.2539 +-  ac_site_file1=$CONFIG_SITE
  1.2540 ++  # We do not want a PATH search for config.site.
  1.2541 ++  case $CONFIG_SITE in #((
  1.2542 ++    -*)  ac_site_file1=./$CONFIG_SITE;;
  1.2543 ++    */*) ac_site_file1=$CONFIG_SITE;;
  1.2544 ++    *)   ac_site_file1=./$CONFIG_SITE;;
  1.2545 ++  esac
  1.2546 + elif test "x$prefix" != xNONE; then
  1.2547 +   ac_site_file1=$prefix/share/config.site
  1.2548 +   ac_site_file2=$prefix/etc/config.site
  1.2549 + else
  1.2550 +   ac_site_file1=$ac_default_prefix/share/config.site
  1.2551 +   ac_site_file2=$ac_default_prefix/etc/config.site
  1.2552 + fi
  1.2553 + for ac_site_file in "$ac_site_file1" "$ac_site_file2"
  1.2554 + do
  1.2555 +   test "x$ac_site_file" = xNONE && continue
  1.2556 +   if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
  1.2557 +     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
  1.2558 + $as_echo "$as_me: loading site script $ac_site_file" >&6;}
  1.2559 +     sed 's/^/| /' "$ac_site_file" >&5
  1.2560 +-    . "$ac_site_file"
  1.2561 ++    . "$ac_site_file" \
  1.2562 ++      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.2563 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.2564 ++as_fn_error $? "failed to load site script $ac_site_file
  1.2565 ++See \`config.log' for more details" "$LINENO" 5; }
  1.2566 +   fi
  1.2567 + done
  1.2568 + 
  1.2569 + if test -r "$cache_file"; then
  1.2570 +   # Some versions of bash will fail to source /dev/null (special files
  1.2571 +   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
  1.2572 +   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
  1.2573 +     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
  1.2574 +@@ -2115,77 +2124,83 @@
  1.2575 +     esac
  1.2576 +   fi
  1.2577 + done
  1.2578 + if $ac_cache_corrupted; then
  1.2579 +   { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.2580 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.2581 +   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
  1.2582 + $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
  1.2583 +-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
  1.2584 ++  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
  1.2585 + fi
  1.2586 + ## -------------------- ##
  1.2587 + ## Main body of script. ##
  1.2588 + ## -------------------- ##
  1.2589 + 
  1.2590 + ac_ext=c
  1.2591 + ac_cpp='$CPP $CPPFLAGS'
  1.2592 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  1.2593 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  1.2594 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
  1.2595 + 
  1.2596 + 
  1.2597 + 
  1.2598 + ac_aux_dir=
  1.2599 + for ac_dir in autotools "$srcdir"/autotools; do
  1.2600 +-  for ac_t in install-sh install.sh shtool; do
  1.2601 +-    if test -f "$ac_dir/$ac_t"; then
  1.2602 +-      ac_aux_dir=$ac_dir
  1.2603 +-      ac_install_sh="$ac_aux_dir/$ac_t -c"
  1.2604 +-      break 2
  1.2605 +-    fi
  1.2606 +-  done
  1.2607 ++  if test -f "$ac_dir/install-sh"; then
  1.2608 ++    ac_aux_dir=$ac_dir
  1.2609 ++    ac_install_sh="$ac_aux_dir/install-sh -c"
  1.2610 ++    break
  1.2611 ++  elif test -f "$ac_dir/install.sh"; then
  1.2612 ++    ac_aux_dir=$ac_dir
  1.2613 ++    ac_install_sh="$ac_aux_dir/install.sh -c"
  1.2614 ++    break
  1.2615 ++  elif test -f "$ac_dir/shtool"; then
  1.2616 ++    ac_aux_dir=$ac_dir
  1.2617 ++    ac_install_sh="$ac_aux_dir/shtool install -c"
  1.2618 ++    break
  1.2619 ++  fi
  1.2620 + done
  1.2621 + if test -z "$ac_aux_dir"; then
  1.2622 +-  as_fn_error "cannot find install-sh, install.sh, or shtool in autotools \"$srcdir\"/autotools" "$LINENO" 5
  1.2623 ++  as_fn_error $? "cannot find install-sh, install.sh, or shtool in autotools \"$srcdir\"/autotools" "$LINENO" 5
  1.2624 + fi
  1.2625 + 
  1.2626 + # These three variables are undocumented and unsupported,
  1.2627 + # and are intended to be withdrawn in a future Autoconf release.
  1.2628 + # They can cause serious problems if a builder's source tree is in a directory
  1.2629 + # whose full name contains unusual characters.
  1.2630 + ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
  1.2631 + ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
  1.2632 + ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
  1.2633 + 
  1.2634 + 
  1.2635 + 
  1.2636 + # Make sure we can run config.sub.
  1.2637 + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
  1.2638 +-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
  1.2639 ++  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
  1.2640 + 
  1.2641 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
  1.2642 + $as_echo_n "checking build system type... " >&6; }
  1.2643 +-if test "${ac_cv_build+set}" = set; then :
  1.2644 ++if ${ac_cv_build+:} false; then :
  1.2645 +   $as_echo_n "(cached) " >&6
  1.2646 + else
  1.2647 +   ac_build_alias=$build_alias
  1.2648 + test "x$ac_build_alias" = x &&
  1.2649 +   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
  1.2650 + test "x$ac_build_alias" = x &&
  1.2651 +-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
  1.2652 ++  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
  1.2653 + ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
  1.2654 +-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
  1.2655 ++  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
  1.2656 + 
  1.2657 + fi
  1.2658 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
  1.2659 + $as_echo "$ac_cv_build" >&6; }
  1.2660 + case $ac_cv_build in
  1.2661 + *-*-*) ;;
  1.2662 +-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
  1.2663 ++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
  1.2664 + esac
  1.2665 + build=$ac_cv_build
  1.2666 + ac_save_IFS=$IFS; IFS='-'
  1.2667 + set x $ac_cv_build
  1.2668 + shift
  1.2669 + build_cpu=$1
  1.2670 + build_vendor=$2
  1.2671 + shift; shift
  1.2672 +@@ -2193,32 +2208,32 @@
  1.2673 + # except with old shells:
  1.2674 + build_os=$*
  1.2675 + IFS=$ac_save_IFS
  1.2676 + case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
  1.2677 + 
  1.2678 + 
  1.2679 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
  1.2680 + $as_echo_n "checking host system type... " >&6; }
  1.2681 +-if test "${ac_cv_host+set}" = set; then :
  1.2682 ++if ${ac_cv_host+:} false; then :
  1.2683 +   $as_echo_n "(cached) " >&6
  1.2684 + else
  1.2685 +   if test "x$host_alias" = x; then
  1.2686 +   ac_cv_host=$ac_cv_build
  1.2687 + else
  1.2688 +   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
  1.2689 +-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
  1.2690 ++    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
  1.2691 + fi
  1.2692 + 
  1.2693 + fi
  1.2694 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
  1.2695 + $as_echo "$ac_cv_host" >&6; }
  1.2696 + case $ac_cv_host in
  1.2697 + *-*-*) ;;
  1.2698 +-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
  1.2699 ++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
  1.2700 + esac
  1.2701 + host=$ac_cv_host
  1.2702 + ac_save_IFS=$IFS; IFS='-'
  1.2703 + set x $ac_cv_host
  1.2704 + shift
  1.2705 + host_cpu=$1
  1.2706 + host_vendor=$2
  1.2707 + shift; shift
  1.2708 +@@ -2244,17 +2259,17 @@
  1.2709 + # AFS /usr/afsws/bin/install, which mishandles nonexistent args
  1.2710 + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  1.2711 + # OS/2's system install, which has a completely different semantic
  1.2712 + # ./install, which can be erroneously created by make from ./install.sh.
  1.2713 + # Reject install programs that cannot install multiple files.
  1.2714 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
  1.2715 + $as_echo_n "checking for a BSD-compatible install... " >&6; }
  1.2716 + if test -z "$INSTALL"; then
  1.2717 +-if test "${ac_cv_path_install+set}" = set; then :
  1.2718 ++if ${ac_cv_path_install+:} false; then :
  1.2719 +   $as_echo_n "(cached) " >&6
  1.2720 + else
  1.2721 +   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.2722 + for as_dir in $PATH
  1.2723 + do
  1.2724 +   IFS=$as_save_IFS
  1.2725 +   test -z "$as_dir" && as_dir=.
  1.2726 +     # Account for people who put trailing slashes in PATH elements.
  1.2727 +@@ -2331,21 +2346,21 @@
  1.2728 + sleep 1
  1.2729 + echo timestamp > conftest.file
  1.2730 + # Reject unsafe characters in $srcdir or the absolute working directory
  1.2731 + # name.  Accept space and tab only in the latter.
  1.2732 + am_lf='
  1.2733 + '
  1.2734 + case `pwd` in
  1.2735 +   *[\\\"\#\$\&\'\`$am_lf]*)
  1.2736 +-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
  1.2737 ++    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
  1.2738 + esac
  1.2739 + case $srcdir in
  1.2740 +   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
  1.2741 +-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
  1.2742 ++    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
  1.2743 + esac
  1.2744 + 
  1.2745 + # Do `set' in a subshell so we don't clobber the current shell's
  1.2746 + # arguments.  Must try -L first in case configure is actually a
  1.2747 + # symlink; some systems play weird games with the mod time of symlinks
  1.2748 + # (eg FreeBSD returns the mod time of the symlink's containing
  1.2749 + # directory).
  1.2750 + if (
  1.2751 +@@ -2357,27 +2372,27 @@
  1.2752 +    rm -f conftest.file
  1.2753 +    if test "$*" != "X $srcdir/configure conftest.file" \
  1.2754 +       && test "$*" != "X conftest.file $srcdir/configure"; then
  1.2755 + 
  1.2756 +       # If neither matched, then we have a broken ls.  This can happen
  1.2757 +       # if, for instance, CONFIG_SHELL is bash and it inherits a
  1.2758 +       # broken ls alias from the environment.  This has actually
  1.2759 +       # happened.  Such a system could not be considered "sane".
  1.2760 +-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
  1.2761 ++      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
  1.2762 + alias in your environment" "$LINENO" 5
  1.2763 +    fi
  1.2764 + 
  1.2765 +    test "$2" = conftest.file
  1.2766 +    )
  1.2767 + then
  1.2768 +    # Ok.
  1.2769 +    :
  1.2770 + else
  1.2771 +-   as_fn_error "newly created file is older than distributed files!
  1.2772 ++   as_fn_error $? "newly created file is older than distributed files!
  1.2773 + Check your system clock" "$LINENO" 5
  1.2774 + fi
  1.2775 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  1.2776 + $as_echo "yes" >&6; }
  1.2777 + test "$program_prefix" != NONE &&
  1.2778 +   program_transform_name="s&^&$program_prefix&;$program_transform_name"
  1.2779 + # Use a double $ so make ignores it.
  1.2780 + test "$program_suffix" != NONE &&
  1.2781 +@@ -2421,17 +2436,17 @@
  1.2782 + # tool to use in cross-compilation environments, therefore Automake
  1.2783 + # will honor the `STRIP' environment variable to overrule this program.
  1.2784 + if test "$cross_compiling" != no; then
  1.2785 +   if test -n "$ac_tool_prefix"; then
  1.2786 +   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  1.2787 + set dummy ${ac_tool_prefix}strip; ac_word=$2
  1.2788 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.2789 + $as_echo_n "checking for $ac_word... " >&6; }
  1.2790 +-if test "${ac_cv_prog_STRIP+set}" = set; then :
  1.2791 ++if ${ac_cv_prog_STRIP+:} false; then :
  1.2792 +   $as_echo_n "(cached) " >&6
  1.2793 + else
  1.2794 +   if test -n "$STRIP"; then
  1.2795 +   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
  1.2796 + else
  1.2797 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.2798 + for as_dir in $PATH
  1.2799 + do
  1.2800 +@@ -2461,17 +2476,17 @@
  1.2801 + 
  1.2802 + fi
  1.2803 + if test -z "$ac_cv_prog_STRIP"; then
  1.2804 +   ac_ct_STRIP=$STRIP
  1.2805 +   # Extract the first word of "strip", so it can be a program name with args.
  1.2806 + set dummy strip; ac_word=$2
  1.2807 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.2808 + $as_echo_n "checking for $ac_word... " >&6; }
  1.2809 +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
  1.2810 ++if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
  1.2811 +   $as_echo_n "(cached) " >&6
  1.2812 + else
  1.2813 +   if test -n "$ac_ct_STRIP"; then
  1.2814 +   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
  1.2815 + else
  1.2816 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.2817 + for as_dir in $PATH
  1.2818 + do
  1.2819 +@@ -2514,17 +2529,17 @@
  1.2820 + fi
  1.2821 + 
  1.2822 + fi
  1.2823 + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
  1.2824 + 
  1.2825 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
  1.2826 + $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
  1.2827 + if test -z "$MKDIR_P"; then
  1.2828 +-  if test "${ac_cv_path_mkdir+set}" = set; then :
  1.2829 ++  if ${ac_cv_path_mkdir+:} false; then :
  1.2830 +   $as_echo_n "(cached) " >&6
  1.2831 + else
  1.2832 +   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.2833 + for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
  1.2834 + do
  1.2835 +   IFS=$as_save_IFS
  1.2836 +   test -z "$as_dir" && as_dir=.
  1.2837 +     for ac_prog in mkdir gmkdir; do
  1.2838 +@@ -2565,17 +2580,17 @@
  1.2839 + esac
  1.2840 + 
  1.2841 + for ac_prog in gawk mawk nawk awk
  1.2842 + do
  1.2843 +   # Extract the first word of "$ac_prog", so it can be a program name with args.
  1.2844 + set dummy $ac_prog; ac_word=$2
  1.2845 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.2846 + $as_echo_n "checking for $ac_word... " >&6; }
  1.2847 +-if test "${ac_cv_prog_AWK+set}" = set; then :
  1.2848 ++if ${ac_cv_prog_AWK+:} false; then :
  1.2849 +   $as_echo_n "(cached) " >&6
  1.2850 + else
  1.2851 +   if test -n "$AWK"; then
  1.2852 +   ac_cv_prog_AWK="$AWK" # Let the user override the test.
  1.2853 + else
  1.2854 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.2855 + for as_dir in $PATH
  1.2856 + do
  1.2857 +@@ -2605,25 +2620,25 @@
  1.2858 + 
  1.2859 +   test -n "$AWK" && break
  1.2860 + done
  1.2861 + 
  1.2862 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
  1.2863 + $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
  1.2864 + set x ${MAKE-make}
  1.2865 + ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
  1.2866 +-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
  1.2867 ++if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
  1.2868 +   $as_echo_n "(cached) " >&6
  1.2869 + else
  1.2870 +   cat >conftest.make <<\_ACEOF
  1.2871 + SHELL = /bin/sh
  1.2872 + all:
  1.2873 + 	@echo '@@@%%%=$(MAKE)=@@@%%%'
  1.2874 + _ACEOF
  1.2875 +-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  1.2876 ++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
  1.2877 + case `${MAKE-make} -f conftest.make 2>/dev/null` in
  1.2878 +   *@@@%%%=?*=@@@%%%*)
  1.2879 +     eval ac_cv_prog_make_${ac_make}_set=yes;;
  1.2880 +   *)
  1.2881 +     eval ac_cv_prog_make_${ac_make}_set=no;;
  1.2882 + esac
  1.2883 + rm -f conftest.make
  1.2884 + fi
  1.2885 +@@ -2647,17 +2662,17 @@
  1.2886 + rmdir .tst 2>/dev/null
  1.2887 + 
  1.2888 + if test "`cd $srcdir && pwd`" != "`pwd`"; then
  1.2889 +   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
  1.2890 +   # is not polluted with repeated "-I."
  1.2891 +   am__isrc=' -I$(srcdir)'
  1.2892 +   # test to see if srcdir already configured
  1.2893 +   if test -f $srcdir/config.status; then
  1.2894 +-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
  1.2895 ++    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
  1.2896 +   fi
  1.2897 + fi
  1.2898 + 
  1.2899 + # test whether we have cygpath
  1.2900 + if test -z "$CYGPATH_W"; then
  1.2901 +   if (cygpath --version) >/dev/null 2>/dev/null; then
  1.2902 +     CYGPATH_W='cygpath -w'
  1.2903 +   else
  1.2904 +@@ -2693,19 +2708,19 @@
  1.2905 + 
  1.2906 + AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
  1.2907 + 
  1.2908 + 
  1.2909 + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
  1.2910 + 
  1.2911 + # We need awk for the "check" target.  The system "awk" is bad on
  1.2912 + # some platforms.
  1.2913 +-# Always define AMTAR for backward compatibility.
  1.2914 +-
  1.2915 +-AMTAR=${AMTAR-"${am_missing_run}tar"}
  1.2916 ++# Always define AMTAR for backward compatibility.  Yes, it's still used
  1.2917 ++# in the wild :-(  We should find a proper way to deprecate it ...
  1.2918 ++AMTAR='$${TAR-tar}'
  1.2919 + 
  1.2920 + 
  1.2921 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
  1.2922 + $as_echo_n "checking how to create a ustar tar archive... " >&6; }
  1.2923 + # Loop over all known methods to create a tar archive until one works.
  1.2924 + _am_tools='gnutar plaintar pax cpio none'
  1.2925 + _am_tools=${am_cv_prog_tar_ustar-$_am_tools}
  1.2926 + # Do not fold the above two line into one, because Tru64 sh and
  1.2927 +@@ -2771,17 +2786,17 @@
  1.2928 +    ac_status=$?
  1.2929 +    echo "$as_me:$LINENO: \$? = $ac_status" >&5
  1.2930 +    (exit $ac_status); }
  1.2931 +     grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
  1.2932 +   fi
  1.2933 + done
  1.2934 + rm -rf conftest.dir
  1.2935 + 
  1.2936 +-if test "${am_cv_prog_tar_ustar+set}" = set; then :
  1.2937 ++if ${am_cv_prog_tar_ustar+:} false; then :
  1.2938 +   $as_echo_n "(cached) " >&6
  1.2939 + else
  1.2940 +   am_cv_prog_tar_ustar=$_am_tool
  1.2941 + fi
  1.2942 + 
  1.2943 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
  1.2944 + $as_echo "$am_cv_prog_tar_ustar" >&6; }
  1.2945 + 
  1.2946 +@@ -2839,16 +2854,17 @@
  1.2947 + # Check whether --enable-dependency-tracking was given.
  1.2948 + if test "${enable_dependency_tracking+set}" = set; then :
  1.2949 +   enableval=$enable_dependency_tracking;
  1.2950 + fi
  1.2951 + 
  1.2952 + if test "x$enable_dependency_tracking" != xno; then
  1.2953 +   am_depcomp="$ac_aux_dir/depcomp"
  1.2954 +   AMDEPBACKSLASH='\'
  1.2955 ++  am__nodep='_no'
  1.2956 + fi
  1.2957 +  if test "x$enable_dependency_tracking" != xno; then
  1.2958 +   AMDEP_TRUE=
  1.2959 +   AMDEP_FALSE='#'
  1.2960 + else
  1.2961 +   AMDEP_TRUE='#'
  1.2962 +   AMDEP_FALSE=
  1.2963 + fi
  1.2964 +@@ -2859,17 +2875,17 @@
  1.2965 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  1.2966 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  1.2967 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
  1.2968 + if test -n "$ac_tool_prefix"; then
  1.2969 +   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  1.2970 + set dummy ${ac_tool_prefix}gcc; ac_word=$2
  1.2971 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.2972 + $as_echo_n "checking for $ac_word... " >&6; }
  1.2973 +-if test "${ac_cv_prog_CC+set}" = set; then :
  1.2974 ++if ${ac_cv_prog_CC+:} false; then :
  1.2975 +   $as_echo_n "(cached) " >&6
  1.2976 + else
  1.2977 +   if test -n "$CC"; then
  1.2978 +   ac_cv_prog_CC="$CC" # Let the user override the test.
  1.2979 + else
  1.2980 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.2981 + for as_dir in $PATH
  1.2982 + do
  1.2983 +@@ -2899,17 +2915,17 @@
  1.2984 + 
  1.2985 + fi
  1.2986 + if test -z "$ac_cv_prog_CC"; then
  1.2987 +   ac_ct_CC=$CC
  1.2988 +   # Extract the first word of "gcc", so it can be a program name with args.
  1.2989 + set dummy gcc; ac_word=$2
  1.2990 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.2991 + $as_echo_n "checking for $ac_word... " >&6; }
  1.2992 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
  1.2993 ++if ${ac_cv_prog_ac_ct_CC+:} false; then :
  1.2994 +   $as_echo_n "(cached) " >&6
  1.2995 + else
  1.2996 +   if test -n "$ac_ct_CC"; then
  1.2997 +   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
  1.2998 + else
  1.2999 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.3000 + for as_dir in $PATH
  1.3001 + do
  1.3002 +@@ -2952,17 +2968,17 @@
  1.3003 + fi
  1.3004 + 
  1.3005 + if test -z "$CC"; then
  1.3006 +           if test -n "$ac_tool_prefix"; then
  1.3007 +     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  1.3008 + set dummy ${ac_tool_prefix}cc; ac_word=$2
  1.3009 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.3010 + $as_echo_n "checking for $ac_word... " >&6; }
  1.3011 +-if test "${ac_cv_prog_CC+set}" = set; then :
  1.3012 ++if ${ac_cv_prog_CC+:} false; then :
  1.3013 +   $as_echo_n "(cached) " >&6
  1.3014 + else
  1.3015 +   if test -n "$CC"; then
  1.3016 +   ac_cv_prog_CC="$CC" # Let the user override the test.
  1.3017 + else
  1.3018 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.3019 + for as_dir in $PATH
  1.3020 + do
  1.3021 +@@ -2992,17 +3008,17 @@
  1.3022 + 
  1.3023 +   fi
  1.3024 + fi
  1.3025 + if test -z "$CC"; then
  1.3026 +   # Extract the first word of "cc", so it can be a program name with args.
  1.3027 + set dummy cc; ac_word=$2
  1.3028 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.3029 + $as_echo_n "checking for $ac_word... " >&6; }
  1.3030 +-if test "${ac_cv_prog_CC+set}" = set; then :
  1.3031 ++if ${ac_cv_prog_CC+:} false; then :
  1.3032 +   $as_echo_n "(cached) " >&6
  1.3033 + else
  1.3034 +   if test -n "$CC"; then
  1.3035 +   ac_cv_prog_CC="$CC" # Let the user override the test.
  1.3036 + else
  1.3037 +   ac_prog_rejected=no
  1.3038 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.3039 + for as_dir in $PATH
  1.3040 +@@ -3051,17 +3067,17 @@
  1.3041 + if test -z "$CC"; then
  1.3042 +   if test -n "$ac_tool_prefix"; then
  1.3043 +   for ac_prog in cl.exe
  1.3044 +   do
  1.3045 +     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  1.3046 + set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  1.3047 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.3048 + $as_echo_n "checking for $ac_word... " >&6; }
  1.3049 +-if test "${ac_cv_prog_CC+set}" = set; then :
  1.3050 ++if ${ac_cv_prog_CC+:} false; then :
  1.3051 +   $as_echo_n "(cached) " >&6
  1.3052 + else
  1.3053 +   if test -n "$CC"; then
  1.3054 +   ac_cv_prog_CC="$CC" # Let the user override the test.
  1.3055 + else
  1.3056 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.3057 + for as_dir in $PATH
  1.3058 + do
  1.3059 +@@ -3095,17 +3111,17 @@
  1.3060 + if test -z "$CC"; then
  1.3061 +   ac_ct_CC=$CC
  1.3062 +   for ac_prog in cl.exe
  1.3063 + do
  1.3064 +   # Extract the first word of "$ac_prog", so it can be a program name with args.
  1.3065 + set dummy $ac_prog; ac_word=$2
  1.3066 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.3067 + $as_echo_n "checking for $ac_word... " >&6; }
  1.3068 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
  1.3069 ++if ${ac_cv_prog_ac_ct_CC+:} false; then :
  1.3070 +   $as_echo_n "(cached) " >&6
  1.3071 + else
  1.3072 +   if test -n "$ac_ct_CC"; then
  1.3073 +   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
  1.3074 + else
  1.3075 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.3076 + for as_dir in $PATH
  1.3077 + do
  1.3078 +@@ -3149,18 +3165,18 @@
  1.3079 +   fi
  1.3080 + fi
  1.3081 + 
  1.3082 + fi
  1.3083 + 
  1.3084 + 
  1.3085 + test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.3086 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.3087 +-as_fn_error "no acceptable C compiler found in \$PATH
  1.3088 +-See \`config.log' for more details." "$LINENO" 5; }
  1.3089 ++as_fn_error $? "no acceptable C compiler found in \$PATH
  1.3090 ++See \`config.log' for more details" "$LINENO" 5; }
  1.3091 + 
  1.3092 + # Provide some information about the compiler.
  1.3093 + $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
  1.3094 + set X $ac_compile
  1.3095 + ac_compiler=$2
  1.3096 + for ac_option in --version -v -V -qversion; do
  1.3097 +   { { ac_try="$ac_compiler $ac_option >&5"
  1.3098 + case "(($ac_try" in
  1.3099 +@@ -3264,19 +3280,18 @@
  1.3100 + if test -z "$ac_file"; then :
  1.3101 +   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  1.3102 + $as_echo "no" >&6; }
  1.3103 + $as_echo "$as_me: failed program was:" >&5
  1.3104 + sed 's/^/| /' conftest.$ac_ext >&5
  1.3105 + 
  1.3106 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.3107 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.3108 +-{ as_fn_set_status 77
  1.3109 +-as_fn_error "C compiler cannot create executables
  1.3110 +-See \`config.log' for more details." "$LINENO" 5; }; }
  1.3111 ++as_fn_error 77 "C compiler cannot create executables
  1.3112 ++See \`config.log' for more details" "$LINENO" 5; }
  1.3113 + else
  1.3114 +   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  1.3115 + $as_echo "yes" >&6; }
  1.3116 + fi
  1.3117 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
  1.3118 + $as_echo_n "checking for C compiler default output file name... " >&6; }
  1.3119 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
  1.3120 + $as_echo "$ac_file" >&6; }
  1.3121 +@@ -3308,18 +3323,18 @@
  1.3122 +     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  1.3123 + 	  break;;
  1.3124 +     * ) break;;
  1.3125 +   esac
  1.3126 + done
  1.3127 + else
  1.3128 +   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.3129 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.3130 +-as_fn_error "cannot compute suffix of executables: cannot compile and link
  1.3131 +-See \`config.log' for more details." "$LINENO" 5; }
  1.3132 ++as_fn_error $? "cannot compute suffix of executables: cannot compile and link
  1.3133 ++See \`config.log' for more details" "$LINENO" 5; }
  1.3134 + fi
  1.3135 + rm -f conftest conftest$ac_cv_exeext
  1.3136 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
  1.3137 + $as_echo "$ac_cv_exeext" >&6; }
  1.3138 + 
  1.3139 + rm -f conftest.$ac_ext
  1.3140 + EXEEXT=$ac_cv_exeext
  1.3141 + ac_exeext=$EXEEXT
  1.3142 +@@ -3366,30 +3381,30 @@
  1.3143 +   test $ac_status = 0; }; }; then
  1.3144 +     cross_compiling=no
  1.3145 +   else
  1.3146 +     if test "$cross_compiling" = maybe; then
  1.3147 + 	cross_compiling=yes
  1.3148 +     else
  1.3149 + 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.3150 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.3151 +-as_fn_error "cannot run C compiled programs.
  1.3152 ++as_fn_error $? "cannot run C compiled programs.
  1.3153 + If you meant to cross compile, use \`--host'.
  1.3154 +-See \`config.log' for more details." "$LINENO" 5; }
  1.3155 ++See \`config.log' for more details" "$LINENO" 5; }
  1.3156 +     fi
  1.3157 +   fi
  1.3158 + fi
  1.3159 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
  1.3160 + $as_echo "$cross_compiling" >&6; }
  1.3161 + 
  1.3162 + rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
  1.3163 + ac_clean_files=$ac_clean_files_save
  1.3164 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
  1.3165 + $as_echo_n "checking for suffix of object files... " >&6; }
  1.3166 +-if test "${ac_cv_objext+set}" = set; then :
  1.3167 ++if ${ac_cv_objext+:} false; then :
  1.3168 +   $as_echo_n "(cached) " >&6
  1.3169 + else
  1.3170 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.3171 + /* end confdefs.h.  */
  1.3172 + 
  1.3173 + int
  1.3174 + main ()
  1.3175 + {
  1.3176 +@@ -3419,28 +3434,28 @@
  1.3177 +   esac
  1.3178 + done
  1.3179 + else
  1.3180 +   $as_echo "$as_me: failed program was:" >&5
  1.3181 + sed 's/^/| /' conftest.$ac_ext >&5
  1.3182 + 
  1.3183 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.3184 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.3185 +-as_fn_error "cannot compute suffix of object files: cannot compile
  1.3186 +-See \`config.log' for more details." "$LINENO" 5; }
  1.3187 ++as_fn_error $? "cannot compute suffix of object files: cannot compile
  1.3188 ++See \`config.log' for more details" "$LINENO" 5; }
  1.3189 + fi
  1.3190 + rm -f conftest.$ac_cv_objext conftest.$ac_ext
  1.3191 + fi
  1.3192 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
  1.3193 + $as_echo "$ac_cv_objext" >&6; }
  1.3194 + OBJEXT=$ac_cv_objext
  1.3195 + ac_objext=$OBJEXT
  1.3196 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
  1.3197 + $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
  1.3198 +-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
  1.3199 ++if ${ac_cv_c_compiler_gnu+:} false; then :
  1.3200 +   $as_echo_n "(cached) " >&6
  1.3201 + else
  1.3202 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.3203 + /* end confdefs.h.  */
  1.3204 + 
  1.3205 + int
  1.3206 + main ()
  1.3207 + {
  1.3208 +@@ -3467,17 +3482,17 @@
  1.3209 +   GCC=yes
  1.3210 + else
  1.3211 +   GCC=
  1.3212 + fi
  1.3213 + ac_test_CFLAGS=${CFLAGS+set}
  1.3214 + ac_save_CFLAGS=$CFLAGS
  1.3215 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
  1.3216 + $as_echo_n "checking whether $CC accepts -g... " >&6; }
  1.3217 +-if test "${ac_cv_prog_cc_g+set}" = set; then :
  1.3218 ++if ${ac_cv_prog_cc_g+:} false; then :
  1.3219 +   $as_echo_n "(cached) " >&6
  1.3220 + else
  1.3221 +   ac_save_c_werror_flag=$ac_c_werror_flag
  1.3222 +    ac_c_werror_flag=yes
  1.3223 +    ac_cv_prog_cc_g=no
  1.3224 +    CFLAGS="-g"
  1.3225 +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.3226 + /* end confdefs.h.  */
  1.3227 +@@ -3545,17 +3560,17 @@
  1.3228 +   if test "$GCC" = yes; then
  1.3229 +     CFLAGS="-O2"
  1.3230 +   else
  1.3231 +     CFLAGS=
  1.3232 +   fi
  1.3233 + fi
  1.3234 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
  1.3235 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
  1.3236 +-if test "${ac_cv_prog_cc_c89+set}" = set; then :
  1.3237 ++if ${ac_cv_prog_cc_c89+:} false; then :
  1.3238 +   $as_echo_n "(cached) " >&6
  1.3239 + else
  1.3240 +   ac_cv_prog_cc_c89=no
  1.3241 + ac_save_CC=$CC
  1.3242 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.3243 + /* end confdefs.h.  */
  1.3244 + #include <stdarg.h>
  1.3245 + #include <stdio.h>
  1.3246 +@@ -3644,25 +3659,26 @@
  1.3247 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  1.3248 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  1.3249 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
  1.3250 + 
  1.3251 + depcc="$CC"   am_compiler_list=
  1.3252 + 
  1.3253 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
  1.3254 + $as_echo_n "checking dependency style of $depcc... " >&6; }
  1.3255 +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
  1.3256 ++if ${am_cv_CC_dependencies_compiler_type+:} false; then :
  1.3257 +   $as_echo_n "(cached) " >&6
  1.3258 + else
  1.3259 +   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
  1.3260 +   # We make a subdir and do the tests there.  Otherwise we can end up
  1.3261 +   # making bogus files that we don't know about and never remove.  For
  1.3262 +   # instance it was reported that on HP-UX the gcc test will end up
  1.3263 +   # making a dummy file named `D' -- because `-MD' means `put the output
  1.3264 +   # in D'.
  1.3265 ++  rm -rf conftest.dir
  1.3266 +   mkdir conftest.dir
  1.3267 +   # Copy depcomp to subdir because otherwise we won't find it if we're
  1.3268 +   # using a relative directory.
  1.3269 +   cp "$am_depcomp" conftest.dir
  1.3270 +   cd conftest.dir
  1.3271 +   # We will build objects and dependencies in a subdirectory because
  1.3272 +   # it helps to detect inapplicable dependency modes.  For instance
  1.3273 +   # both Tru64's cc and ICC support -MD to output dependencies as a
  1.3274 +@@ -3712,17 +3728,17 @@
  1.3275 +       # after this tag, mechanisms are not by side-effect, so they'll
  1.3276 +       # only be used when explicitly requested
  1.3277 +       if test "x$enable_dependency_tracking" = xyes; then
  1.3278 + 	continue
  1.3279 +       else
  1.3280 + 	break
  1.3281 +       fi
  1.3282 +       ;;
  1.3283 +-    msvisualcpp | msvcmsys)
  1.3284 ++    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
  1.3285 +       # This compiler won't grok `-c -o', but also, the minuso test has
  1.3286 +       # not run yet.  These depmodes are late enough in the game, and
  1.3287 +       # so weak that their functioning should not be impacted.
  1.3288 +       am__obj=conftest.${OBJEXT-o}
  1.3289 +       am__minus_obj=
  1.3290 +       ;;
  1.3291 +     none) break ;;
  1.3292 +     esac
  1.3293 +@@ -3778,25 +3794,26 @@
  1.3294 + test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
  1.3295 + 
  1.3296 + 
  1.3297 + 
  1.3298 + depcc="$CCAS"   am_compiler_list=
  1.3299 + 
  1.3300 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
  1.3301 + $as_echo_n "checking dependency style of $depcc... " >&6; }
  1.3302 +-if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then :
  1.3303 ++if ${am_cv_CCAS_dependencies_compiler_type+:} false; then :
  1.3304 +   $as_echo_n "(cached) " >&6
  1.3305 + else
  1.3306 +   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
  1.3307 +   # We make a subdir and do the tests there.  Otherwise we can end up
  1.3308 +   # making bogus files that we don't know about and never remove.  For
  1.3309 +   # instance it was reported that on HP-UX the gcc test will end up
  1.3310 +   # making a dummy file named `D' -- because `-MD' means `put the output
  1.3311 +   # in D'.
  1.3312 ++  rm -rf conftest.dir
  1.3313 +   mkdir conftest.dir
  1.3314 +   # Copy depcomp to subdir because otherwise we won't find it if we're
  1.3315 +   # using a relative directory.
  1.3316 +   cp "$am_depcomp" conftest.dir
  1.3317 +   cd conftest.dir
  1.3318 +   # We will build objects and dependencies in a subdirectory because
  1.3319 +   # it helps to detect inapplicable dependency modes.  For instance
  1.3320 +   # both Tru64's cc and ICC support -MD to output dependencies as a
  1.3321 +@@ -3844,17 +3861,17 @@
  1.3322 +       # after this tag, mechanisms are not by side-effect, so they'll
  1.3323 +       # only be used when explicitly requested
  1.3324 +       if test "x$enable_dependency_tracking" = xyes; then
  1.3325 + 	continue
  1.3326 +       else
  1.3327 + 	break
  1.3328 +       fi
  1.3329 +       ;;
  1.3330 +-    msvisualcpp | msvcmsys)
  1.3331 ++    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
  1.3332 +       # This compiler won't grok `-c -o', but also, the minuso test has
  1.3333 +       # not run yet.  These depmodes are late enough in the game, and
  1.3334 +       # so weak that their functioning should not be impacted.
  1.3335 +       am__obj=conftest.${OBJEXT-o}
  1.3336 +       am__minus_obj=
  1.3337 +       ;;
  1.3338 +     none) break ;;
  1.3339 +     esac
  1.3340 +@@ -3909,17 +3926,17 @@
  1.3341 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  1.3342 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  1.3343 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
  1.3344 + if test -n "$ac_tool_prefix"; then
  1.3345 +   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  1.3346 + set dummy ${ac_tool_prefix}gcc; ac_word=$2
  1.3347 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.3348 + $as_echo_n "checking for $ac_word... " >&6; }
  1.3349 +-if test "${ac_cv_prog_CC+set}" = set; then :
  1.3350 ++if ${ac_cv_prog_CC+:} false; then :
  1.3351 +   $as_echo_n "(cached) " >&6
  1.3352 + else
  1.3353 +   if test -n "$CC"; then
  1.3354 +   ac_cv_prog_CC="$CC" # Let the user override the test.
  1.3355 + else
  1.3356 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.3357 + for as_dir in $PATH
  1.3358 + do
  1.3359 +@@ -3949,17 +3966,17 @@
  1.3360 + 
  1.3361 + fi
  1.3362 + if test -z "$ac_cv_prog_CC"; then
  1.3363 +   ac_ct_CC=$CC
  1.3364 +   # Extract the first word of "gcc", so it can be a program name with args.
  1.3365 + set dummy gcc; ac_word=$2
  1.3366 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.3367 + $as_echo_n "checking for $ac_word... " >&6; }
  1.3368 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
  1.3369 ++if ${ac_cv_prog_ac_ct_CC+:} false; then :
  1.3370 +   $as_echo_n "(cached) " >&6
  1.3371 + else
  1.3372 +   if test -n "$ac_ct_CC"; then
  1.3373 +   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
  1.3374 + else
  1.3375 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.3376 + for as_dir in $PATH
  1.3377 + do
  1.3378 +@@ -4002,17 +4019,17 @@
  1.3379 + fi
  1.3380 + 
  1.3381 + if test -z "$CC"; then
  1.3382 +           if test -n "$ac_tool_prefix"; then
  1.3383 +     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  1.3384 + set dummy ${ac_tool_prefix}cc; ac_word=$2
  1.3385 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.3386 + $as_echo_n "checking for $ac_word... " >&6; }
  1.3387 +-if test "${ac_cv_prog_CC+set}" = set; then :
  1.3388 ++if ${ac_cv_prog_CC+:} false; then :
  1.3389 +   $as_echo_n "(cached) " >&6
  1.3390 + else
  1.3391 +   if test -n "$CC"; then
  1.3392 +   ac_cv_prog_CC="$CC" # Let the user override the test.
  1.3393 + else
  1.3394 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.3395 + for as_dir in $PATH
  1.3396 + do
  1.3397 +@@ -4042,17 +4059,17 @@
  1.3398 + 
  1.3399 +   fi
  1.3400 + fi
  1.3401 + if test -z "$CC"; then
  1.3402 +   # Extract the first word of "cc", so it can be a program name with args.
  1.3403 + set dummy cc; ac_word=$2
  1.3404 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.3405 + $as_echo_n "checking for $ac_word... " >&6; }
  1.3406 +-if test "${ac_cv_prog_CC+set}" = set; then :
  1.3407 ++if ${ac_cv_prog_CC+:} false; then :
  1.3408 +   $as_echo_n "(cached) " >&6
  1.3409 + else
  1.3410 +   if test -n "$CC"; then
  1.3411 +   ac_cv_prog_CC="$CC" # Let the user override the test.
  1.3412 + else
  1.3413 +   ac_prog_rejected=no
  1.3414 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.3415 + for as_dir in $PATH
  1.3416 +@@ -4101,17 +4118,17 @@
  1.3417 + if test -z "$CC"; then
  1.3418 +   if test -n "$ac_tool_prefix"; then
  1.3419 +   for ac_prog in cl.exe
  1.3420 +   do
  1.3421 +     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  1.3422 + set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  1.3423 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.3424 + $as_echo_n "checking for $ac_word... " >&6; }
  1.3425 +-if test "${ac_cv_prog_CC+set}" = set; then :
  1.3426 ++if ${ac_cv_prog_CC+:} false; then :
  1.3427 +   $as_echo_n "(cached) " >&6
  1.3428 + else
  1.3429 +   if test -n "$CC"; then
  1.3430 +   ac_cv_prog_CC="$CC" # Let the user override the test.
  1.3431 + else
  1.3432 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.3433 + for as_dir in $PATH
  1.3434 + do
  1.3435 +@@ -4145,17 +4162,17 @@
  1.3436 + if test -z "$CC"; then
  1.3437 +   ac_ct_CC=$CC
  1.3438 +   for ac_prog in cl.exe
  1.3439 + do
  1.3440 +   # Extract the first word of "$ac_prog", so it can be a program name with args.
  1.3441 + set dummy $ac_prog; ac_word=$2
  1.3442 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.3443 + $as_echo_n "checking for $ac_word... " >&6; }
  1.3444 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
  1.3445 ++if ${ac_cv_prog_ac_ct_CC+:} false; then :
  1.3446 +   $as_echo_n "(cached) " >&6
  1.3447 + else
  1.3448 +   if test -n "$ac_ct_CC"; then
  1.3449 +   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
  1.3450 + else
  1.3451 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.3452 + for as_dir in $PATH
  1.3453 + do
  1.3454 +@@ -4199,18 +4216,18 @@
  1.3455 +   fi
  1.3456 + fi
  1.3457 + 
  1.3458 + fi
  1.3459 + 
  1.3460 + 
  1.3461 + test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.3462 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.3463 +-as_fn_error "no acceptable C compiler found in \$PATH
  1.3464 +-See \`config.log' for more details." "$LINENO" 5; }
  1.3465 ++as_fn_error $? "no acceptable C compiler found in \$PATH
  1.3466 ++See \`config.log' for more details" "$LINENO" 5; }
  1.3467 + 
  1.3468 + # Provide some information about the compiler.
  1.3469 + $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
  1.3470 + set X $ac_compile
  1.3471 + ac_compiler=$2
  1.3472 + for ac_option in --version -v -V -qversion; do
  1.3473 +   { { ac_try="$ac_compiler $ac_option >&5"
  1.3474 + case "(($ac_try" in
  1.3475 +@@ -4229,17 +4246,17 @@
  1.3476 +   fi
  1.3477 +   rm -f conftest.er1 conftest.err
  1.3478 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  1.3479 +   test $ac_status = 0; }
  1.3480 + done
  1.3481 + 
  1.3482 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
  1.3483 + $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
  1.3484 +-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
  1.3485 ++if ${ac_cv_c_compiler_gnu+:} false; then :
  1.3486 +   $as_echo_n "(cached) " >&6
  1.3487 + else
  1.3488 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.3489 + /* end confdefs.h.  */
  1.3490 + 
  1.3491 + int
  1.3492 + main ()
  1.3493 + {
  1.3494 +@@ -4266,17 +4283,17 @@
  1.3495 +   GCC=yes
  1.3496 + else
  1.3497 +   GCC=
  1.3498 + fi
  1.3499 + ac_test_CFLAGS=${CFLAGS+set}
  1.3500 + ac_save_CFLAGS=$CFLAGS
  1.3501 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
  1.3502 + $as_echo_n "checking whether $CC accepts -g... " >&6; }
  1.3503 +-if test "${ac_cv_prog_cc_g+set}" = set; then :
  1.3504 ++if ${ac_cv_prog_cc_g+:} false; then :
  1.3505 +   $as_echo_n "(cached) " >&6
  1.3506 + else
  1.3507 +   ac_save_c_werror_flag=$ac_c_werror_flag
  1.3508 +    ac_c_werror_flag=yes
  1.3509 +    ac_cv_prog_cc_g=no
  1.3510 +    CFLAGS="-g"
  1.3511 +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.3512 + /* end confdefs.h.  */
  1.3513 +@@ -4344,17 +4361,17 @@
  1.3514 +   if test "$GCC" = yes; then
  1.3515 +     CFLAGS="-O2"
  1.3516 +   else
  1.3517 +     CFLAGS=
  1.3518 +   fi
  1.3519 + fi
  1.3520 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
  1.3521 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
  1.3522 +-if test "${ac_cv_prog_cc_c89+set}" = set; then :
  1.3523 ++if ${ac_cv_prog_cc_c89+:} false; then :
  1.3524 +   $as_echo_n "(cached) " >&6
  1.3525 + else
  1.3526 +   ac_cv_prog_cc_c89=no
  1.3527 + ac_save_CC=$CC
  1.3528 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.3529 + /* end confdefs.h.  */
  1.3530 + #include <stdarg.h>
  1.3531 + #include <stdio.h>
  1.3532 +@@ -4443,25 +4460,26 @@
  1.3533 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  1.3534 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  1.3535 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
  1.3536 + 
  1.3537 + depcc="$CC"   am_compiler_list=
  1.3538 + 
  1.3539 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
  1.3540 + $as_echo_n "checking dependency style of $depcc... " >&6; }
  1.3541 +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
  1.3542 ++if ${am_cv_CC_dependencies_compiler_type+:} false; then :
  1.3543 +   $as_echo_n "(cached) " >&6
  1.3544 + else
  1.3545 +   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
  1.3546 +   # We make a subdir and do the tests there.  Otherwise we can end up
  1.3547 +   # making bogus files that we don't know about and never remove.  For
  1.3548 +   # instance it was reported that on HP-UX the gcc test will end up
  1.3549 +   # making a dummy file named `D' -- because `-MD' means `put the output
  1.3550 +   # in D'.
  1.3551 ++  rm -rf conftest.dir
  1.3552 +   mkdir conftest.dir
  1.3553 +   # Copy depcomp to subdir because otherwise we won't find it if we're
  1.3554 +   # using a relative directory.
  1.3555 +   cp "$am_depcomp" conftest.dir
  1.3556 +   cd conftest.dir
  1.3557 +   # We will build objects and dependencies in a subdirectory because
  1.3558 +   # it helps to detect inapplicable dependency modes.  For instance
  1.3559 +   # both Tru64's cc and ICC support -MD to output dependencies as a
  1.3560 +@@ -4511,17 +4529,17 @@
  1.3561 +       # after this tag, mechanisms are not by side-effect, so they'll
  1.3562 +       # only be used when explicitly requested
  1.3563 +       if test "x$enable_dependency_tracking" = xyes; then
  1.3564 + 	continue
  1.3565 +       else
  1.3566 + 	break
  1.3567 +       fi
  1.3568 +       ;;
  1.3569 +-    msvisualcpp | msvcmsys)
  1.3570 ++    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
  1.3571 +       # This compiler won't grok `-c -o', but also, the minuso test has
  1.3572 +       # not run yet.  These depmodes are late enough in the game, and
  1.3573 +       # so weak that their functioning should not be impacted.
  1.3574 +       am__obj=conftest.${OBJEXT-o}
  1.3575 +       am__minus_obj=
  1.3576 +       ;;
  1.3577 +     none) break ;;
  1.3578 +     esac
  1.3579 +@@ -4575,17 +4593,17 @@
  1.3580 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
  1.3581 + $as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
  1.3582 + else
  1.3583 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
  1.3584 + $as_echo_n "checking whether cc understands -c and -o together... " >&6; }
  1.3585 + fi
  1.3586 + set dummy $CC; ac_cc=`$as_echo "$2" |
  1.3587 + 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
  1.3588 +-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
  1.3589 ++if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
  1.3590 +   $as_echo_n "(cached) " >&6
  1.3591 + else
  1.3592 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.3593 + /* end confdefs.h.  */
  1.3594 + 
  1.3595 + int
  1.3596 + main ()
  1.3597 + {
  1.3598 +@@ -4704,17 +4722,17 @@
  1.3599 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
  1.3600 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
  1.3601 + $as_echo_n "checking how to run the C preprocessor... " >&6; }
  1.3602 + # On Suns, sometimes $CPP names a directory.
  1.3603 + if test -n "$CPP" && test -d "$CPP"; then
  1.3604 +   CPP=
  1.3605 + fi
  1.3606 + if test -z "$CPP"; then
  1.3607 +-  if test "${ac_cv_prog_CPP+set}" = set; then :
  1.3608 ++  if ${ac_cv_prog_CPP+:} false; then :
  1.3609 +   $as_echo_n "(cached) " >&6
  1.3610 + else
  1.3611 +       # Double quotes because CPP needs to be expanded
  1.3612 +     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
  1.3613 +     do
  1.3614 +       ac_preproc_ok=false
  1.3615 + for ac_c_preproc_warn_flag in '' yes
  1.3616 + do
  1.3617 +@@ -4734,37 +4752,37 @@
  1.3618 + 		     Syntax error
  1.3619 + _ACEOF
  1.3620 + if ac_fn_c_try_cpp "$LINENO"; then :
  1.3621 + 
  1.3622 + else
  1.3623 +   # Broken: fails on valid input.
  1.3624 + continue
  1.3625 + fi
  1.3626 +-rm -f conftest.err conftest.$ac_ext
  1.3627 ++rm -f conftest.err conftest.i conftest.$ac_ext
  1.3628 + 
  1.3629 +   # OK, works on sane cases.  Now check whether nonexistent headers
  1.3630 +   # can be detected and how.
  1.3631 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.3632 + /* end confdefs.h.  */
  1.3633 + #include <ac_nonexistent.h>
  1.3634 + _ACEOF
  1.3635 + if ac_fn_c_try_cpp "$LINENO"; then :
  1.3636 +   # Broken: success on invalid input.
  1.3637 + continue
  1.3638 + else
  1.3639 +   # Passes both tests.
  1.3640 + ac_preproc_ok=:
  1.3641 + break
  1.3642 + fi
  1.3643 +-rm -f conftest.err conftest.$ac_ext
  1.3644 ++rm -f conftest.err conftest.i conftest.$ac_ext
  1.3645 + 
  1.3646 + done
  1.3647 + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  1.3648 +-rm -f conftest.err conftest.$ac_ext
  1.3649 ++rm -f conftest.i conftest.err conftest.$ac_ext
  1.3650 + if $ac_preproc_ok; then :
  1.3651 +   break
  1.3652 + fi
  1.3653 + 
  1.3654 +     done
  1.3655 +     ac_cv_prog_CPP=$CPP
  1.3656 + 
  1.3657 + fi
  1.3658 +@@ -4793,44 +4811,44 @@
  1.3659 + 		     Syntax error
  1.3660 + _ACEOF
  1.3661 + if ac_fn_c_try_cpp "$LINENO"; then :
  1.3662 + 
  1.3663 + else
  1.3664 +   # Broken: fails on valid input.
  1.3665 + continue
  1.3666 + fi
  1.3667 +-rm -f conftest.err conftest.$ac_ext
  1.3668 ++rm -f conftest.err conftest.i conftest.$ac_ext
  1.3669 + 
  1.3670 +   # OK, works on sane cases.  Now check whether nonexistent headers
  1.3671 +   # can be detected and how.
  1.3672 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.3673 + /* end confdefs.h.  */
  1.3674 + #include <ac_nonexistent.h>
  1.3675 + _ACEOF
  1.3676 + if ac_fn_c_try_cpp "$LINENO"; then :
  1.3677 +   # Broken: success on invalid input.
  1.3678 + continue
  1.3679 + else
  1.3680 +   # Passes both tests.
  1.3681 + ac_preproc_ok=:
  1.3682 + break
  1.3683 + fi
  1.3684 +-rm -f conftest.err conftest.$ac_ext
  1.3685 ++rm -f conftest.err conftest.i conftest.$ac_ext
  1.3686 + 
  1.3687 + done
  1.3688 + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  1.3689 +-rm -f conftest.err conftest.$ac_ext
  1.3690 ++rm -f conftest.i conftest.err conftest.$ac_ext
  1.3691 + if $ac_preproc_ok; then :
  1.3692 + 
  1.3693 + else
  1.3694 +   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.3695 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.3696 +-as_fn_error "C preprocessor \"$CPP\" fails sanity check
  1.3697 +-See \`config.log' for more details." "$LINENO" 5; }
  1.3698 ++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
  1.3699 ++See \`config.log' for more details" "$LINENO" 5; }
  1.3700 + fi
  1.3701 + 
  1.3702 + ac_ext=c
  1.3703 + ac_cpp='$CPP $CPPFLAGS'
  1.3704 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  1.3705 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  1.3706 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
  1.3707 + 
  1.3708 +@@ -4845,17 +4863,17 @@
  1.3709 +   else
  1.3710 +     if test -n "$ac_tool_prefix"; then
  1.3711 +   for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
  1.3712 +   do
  1.3713 +     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  1.3714 + set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  1.3715 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.3716 + $as_echo_n "checking for $ac_word... " >&6; }
  1.3717 +-if test "${ac_cv_prog_CXX+set}" = set; then :
  1.3718 ++if ${ac_cv_prog_CXX+:} false; then :
  1.3719 +   $as_echo_n "(cached) " >&6
  1.3720 + else
  1.3721 +   if test -n "$CXX"; then
  1.3722 +   ac_cv_prog_CXX="$CXX" # Let the user override the test.
  1.3723 + else
  1.3724 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.3725 + for as_dir in $PATH
  1.3726 + do
  1.3727 +@@ -4889,17 +4907,17 @@
  1.3728 + if test -z "$CXX"; then
  1.3729 +   ac_ct_CXX=$CXX
  1.3730 +   for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
  1.3731 + do
  1.3732 +   # Extract the first word of "$ac_prog", so it can be a program name with args.
  1.3733 + set dummy $ac_prog; ac_word=$2
  1.3734 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.3735 + $as_echo_n "checking for $ac_word... " >&6; }
  1.3736 +-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
  1.3737 ++if ${ac_cv_prog_ac_ct_CXX+:} false; then :
  1.3738 +   $as_echo_n "(cached) " >&6
  1.3739 + else
  1.3740 +   if test -n "$ac_ct_CXX"; then
  1.3741 +   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
  1.3742 + else
  1.3743 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.3744 + for as_dir in $PATH
  1.3745 + do
  1.3746 +@@ -4967,17 +4985,17 @@
  1.3747 +   fi
  1.3748 +   rm -f conftest.er1 conftest.err
  1.3749 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  1.3750 +   test $ac_status = 0; }
  1.3751 + done
  1.3752 + 
  1.3753 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
  1.3754 + $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
  1.3755 +-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
  1.3756 ++if ${ac_cv_cxx_compiler_gnu+:} false; then :
  1.3757 +   $as_echo_n "(cached) " >&6
  1.3758 + else
  1.3759 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.3760 + /* end confdefs.h.  */
  1.3761 + 
  1.3762 + int
  1.3763 + main ()
  1.3764 + {
  1.3765 +@@ -5004,17 +5022,17 @@
  1.3766 +   GXX=yes
  1.3767 + else
  1.3768 +   GXX=
  1.3769 + fi
  1.3770 + ac_test_CXXFLAGS=${CXXFLAGS+set}
  1.3771 + ac_save_CXXFLAGS=$CXXFLAGS
  1.3772 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
  1.3773 + $as_echo_n "checking whether $CXX accepts -g... " >&6; }
  1.3774 +-if test "${ac_cv_prog_cxx_g+set}" = set; then :
  1.3775 ++if ${ac_cv_prog_cxx_g+:} false; then :
  1.3776 +   $as_echo_n "(cached) " >&6
  1.3777 + else
  1.3778 +   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
  1.3779 +    ac_cxx_werror_flag=yes
  1.3780 +    ac_cv_prog_cxx_g=no
  1.3781 +    CXXFLAGS="-g"
  1.3782 +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.3783 + /* end confdefs.h.  */
  1.3784 +@@ -5090,25 +5108,26 @@
  1.3785 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  1.3786 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  1.3787 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
  1.3788 + 
  1.3789 + depcc="$CXX"  am_compiler_list=
  1.3790 + 
  1.3791 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
  1.3792 + $as_echo_n "checking dependency style of $depcc... " >&6; }
  1.3793 +-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
  1.3794 ++if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
  1.3795 +   $as_echo_n "(cached) " >&6
  1.3796 + else
  1.3797 +   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
  1.3798 +   # We make a subdir and do the tests there.  Otherwise we can end up
  1.3799 +   # making bogus files that we don't know about and never remove.  For
  1.3800 +   # instance it was reported that on HP-UX the gcc test will end up
  1.3801 +   # making a dummy file named `D' -- because `-MD' means `put the output
  1.3802 +   # in D'.
  1.3803 ++  rm -rf conftest.dir
  1.3804 +   mkdir conftest.dir
  1.3805 +   # Copy depcomp to subdir because otherwise we won't find it if we're
  1.3806 +   # using a relative directory.
  1.3807 +   cp "$am_depcomp" conftest.dir
  1.3808 +   cd conftest.dir
  1.3809 +   # We will build objects and dependencies in a subdirectory because
  1.3810 +   # it helps to detect inapplicable dependency modes.  For instance
  1.3811 +   # both Tru64's cc and ICC support -MD to output dependencies as a
  1.3812 +@@ -5158,17 +5177,17 @@
  1.3813 +       # after this tag, mechanisms are not by side-effect, so they'll
  1.3814 +       # only be used when explicitly requested
  1.3815 +       if test "x$enable_dependency_tracking" = xyes; then
  1.3816 + 	continue
  1.3817 +       else
  1.3818 + 	break
  1.3819 +       fi
  1.3820 +       ;;
  1.3821 +-    msvisualcpp | msvcmsys)
  1.3822 ++    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
  1.3823 +       # This compiler won't grok `-c -o', but also, the minuso test has
  1.3824 +       # not run yet.  These depmodes are late enough in the game, and
  1.3825 +       # so weak that their functioning should not be impacted.
  1.3826 +       am__obj=conftest.${OBJEXT-o}
  1.3827 +       am__minus_obj=
  1.3828 +       ;;
  1.3829 +     none) break ;;
  1.3830 +     esac
  1.3831 +@@ -5218,17 +5237,17 @@
  1.3832 + fi
  1.3833 + 
  1.3834 + 
  1.3835 + if test -n "$ac_tool_prefix"; then
  1.3836 +   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  1.3837 + set dummy ${ac_tool_prefix}ranlib; ac_word=$2
  1.3838 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.3839 + $as_echo_n "checking for $ac_word... " >&6; }
  1.3840 +-if test "${ac_cv_prog_RANLIB+set}" = set; then :
  1.3841 ++if ${ac_cv_prog_RANLIB+:} false; then :
  1.3842 +   $as_echo_n "(cached) " >&6
  1.3843 + else
  1.3844 +   if test -n "$RANLIB"; then
  1.3845 +   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
  1.3846 + else
  1.3847 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.3848 + for as_dir in $PATH
  1.3849 + do
  1.3850 +@@ -5258,17 +5277,17 @@
  1.3851 + 
  1.3852 + fi
  1.3853 + if test -z "$ac_cv_prog_RANLIB"; then
  1.3854 +   ac_ct_RANLIB=$RANLIB
  1.3855 +   # Extract the first word of "ranlib", so it can be a program name with args.
  1.3856 + set dummy ranlib; ac_word=$2
  1.3857 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.3858 + $as_echo_n "checking for $ac_word... " >&6; }
  1.3859 +-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
  1.3860 ++if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
  1.3861 +   $as_echo_n "(cached) " >&6
  1.3862 + else
  1.3863 +   if test -n "$ac_ct_RANLIB"; then
  1.3864 +   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
  1.3865 + else
  1.3866 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.3867 + for as_dir in $PATH
  1.3868 + do
  1.3869 +@@ -5318,17 +5337,17 @@
  1.3870 +   GCC_FALSE=
  1.3871 + fi
  1.3872 +    # let the Makefile know if we're gcc
  1.3873 + 
  1.3874 + 
  1.3875 + 
  1.3876 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
  1.3877 + $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
  1.3878 +-if test "${ac_cv_path_GREP+set}" = set; then :
  1.3879 ++if ${ac_cv_path_GREP+:} false; then :
  1.3880 +   $as_echo_n "(cached) " >&6
  1.3881 + else
  1.3882 +   if test -z "$GREP"; then
  1.3883 +   ac_path_GREP_found=false
  1.3884 +   # Loop through the user's path and test for each of PROGNAME-LIST
  1.3885 +   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.3886 + for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  1.3887 + do
  1.3888 +@@ -5367,31 +5386,31 @@
  1.3889 + esac
  1.3890 + 
  1.3891 +       $ac_path_GREP_found && break 3
  1.3892 +     done
  1.3893 +   done
  1.3894 +   done
  1.3895 + IFS=$as_save_IFS
  1.3896 +   if test -z "$ac_cv_path_GREP"; then
  1.3897 +-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  1.3898 ++    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  1.3899 +   fi
  1.3900 + else
  1.3901 +   ac_cv_path_GREP=$GREP
  1.3902 + fi
  1.3903 + 
  1.3904 + fi
  1.3905 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
  1.3906 + $as_echo "$ac_cv_path_GREP" >&6; }
  1.3907 +  GREP="$ac_cv_path_GREP"
  1.3908 + 
  1.3909 + 
  1.3910 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
  1.3911 + $as_echo_n "checking for egrep... " >&6; }
  1.3912 +-if test "${ac_cv_path_EGREP+set}" = set; then :
  1.3913 ++if ${ac_cv_path_EGREP+:} false; then :
  1.3914 +   $as_echo_n "(cached) " >&6
  1.3915 + else
  1.3916 +   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
  1.3917 +    then ac_cv_path_EGREP="$GREP -E"
  1.3918 +    else
  1.3919 +      if test -z "$EGREP"; then
  1.3920 +   ac_path_EGREP_found=false
  1.3921 +   # Loop through the user's path and test for each of PROGNAME-LIST
  1.3922 +@@ -5433,32 +5452,32 @@
  1.3923 + esac
  1.3924 + 
  1.3925 +       $ac_path_EGREP_found && break 3
  1.3926 +     done
  1.3927 +   done
  1.3928 +   done
  1.3929 + IFS=$as_save_IFS
  1.3930 +   if test -z "$ac_cv_path_EGREP"; then
  1.3931 +-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  1.3932 ++    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  1.3933 +   fi
  1.3934 + else
  1.3935 +   ac_cv_path_EGREP=$EGREP
  1.3936 + fi
  1.3937 + 
  1.3938 +    fi
  1.3939 + fi
  1.3940 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
  1.3941 + $as_echo "$ac_cv_path_EGREP" >&6; }
  1.3942 +  EGREP="$ac_cv_path_EGREP"
  1.3943 + 
  1.3944 + 
  1.3945 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
  1.3946 + $as_echo_n "checking for ANSI C header files... " >&6; }
  1.3947 +-if test "${ac_cv_header_stdc+set}" = set; then :
  1.3948 ++if ${ac_cv_header_stdc+:} false; then :
  1.3949 +   $as_echo_n "(cached) " >&6
  1.3950 + else
  1.3951 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.3952 + /* end confdefs.h.  */
  1.3953 + #include <stdlib.h>
  1.3954 + #include <stdarg.h>
  1.3955 + #include <string.h>
  1.3956 + #include <float.h>
  1.3957 +@@ -5785,17 +5804,17 @@
  1.3958 +                 PTHREAD_CFLAGS="$flag"
  1.3959 +                 ;;
  1.3960 + 
  1.3961 + 		pthread-config)
  1.3962 + 		# Extract the first word of "pthread-config", so it can be a program name with args.
  1.3963 + set dummy pthread-config; ac_word=$2
  1.3964 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.3965 + $as_echo_n "checking for $ac_word... " >&6; }
  1.3966 +-if test "${ac_cv_prog_ax_pthread_config+set}" = set; then :
  1.3967 ++if ${ac_cv_prog_ax_pthread_config+:} false; then :
  1.3968 +   $as_echo_n "(cached) " >&6
  1.3969 + else
  1.3970 +   if test -n "$ax_pthread_config"; then
  1.3971 +   ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test.
  1.3972 + else
  1.3973 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.3974 + for as_dir in $PATH
  1.3975 + do
  1.3976 +@@ -5946,17 +5965,17 @@
  1.3977 +         # More AIX lossage: must compile with xlc_r or cc_r
  1.3978 + 	if test x"$GCC" != xyes; then
  1.3979 +           for ac_prog in xlc_r cc_r
  1.3980 + do
  1.3981 +   # Extract the first word of "$ac_prog", so it can be a program name with args.
  1.3982 + set dummy $ac_prog; ac_word=$2
  1.3983 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.3984 + $as_echo_n "checking for $ac_word... " >&6; }
  1.3985 +-if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then :
  1.3986 ++if ${ac_cv_prog_PTHREAD_CC+:} false; then :
  1.3987 +   $as_echo_n "(cached) " >&6
  1.3988 + else
  1.3989 +   if test -n "$PTHREAD_CC"; then
  1.3990 +   ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.
  1.3991 + else
  1.3992 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.3993 + for as_dir in $PATH
  1.3994 + do
  1.3995 +@@ -6018,31 +6037,30 @@
  1.3996 + 
  1.3997 + # On IRIX 5.3, sys/types and inttypes.h are conflicting.
  1.3998 + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
  1.3999 + 		  inttypes.h stdint.h unistd.h
  1.4000 + do :
  1.4001 +   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  1.4002 + ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
  1.4003 + "
  1.4004 +-eval as_val=\$$as_ac_Header
  1.4005 +-   if test "x$as_val" = x""yes; then :
  1.4006 ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
  1.4007 +   cat >>confdefs.h <<_ACEOF
  1.4008 + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  1.4009 + _ACEOF
  1.4010 + 
  1.4011 + fi
  1.4012 + 
  1.4013 + done
  1.4014 + 
  1.4015 + 
  1.4016 + for ac_header in a.out.h
  1.4017 + do :
  1.4018 +   ac_fn_c_check_header_mongrel "$LINENO" "a.out.h" "ac_cv_header_a_out_h" "$ac_includes_default"
  1.4019 +-if test "x$ac_cv_header_a_out_h" = x""yes; then :
  1.4020 ++if test "x$ac_cv_header_a_out_h" = xyes; then :
  1.4021 +   cat >>confdefs.h <<_ACEOF
  1.4022 + #define HAVE_A_OUT_H 1
  1.4023 + _ACEOF
  1.4024 + 
  1.4025 + fi
  1.4026 + 
  1.4027 + done
  1.4028 + 
  1.4029 +@@ -6084,17 +6102,17 @@
  1.4030 +                    CFLAGS="${CFLAGS} -m32"
  1.4031 +                    CXXFLAGS="${CXXFLAGS} -m32"
  1.4032 +                    usem32=true
  1.4033 +                    ;;
  1.4034 +                  no)
  1.4035 +                    usem32=false
  1.4036 +                    ;;
  1.4037 +                  *)
  1.4038 +-                   as_fn_error "bad value ${enableval} for --enable-m32" "$LINENO" 5
  1.4039 ++                   as_fn_error $? "bad value ${enableval} for --enable-m32" "$LINENO" 5
  1.4040 +                    ;;
  1.4041 +                esac
  1.4042 + else
  1.4043 +   usem32=false
  1.4044 + fi
  1.4045 + 
  1.4046 + 
  1.4047 + # Check whether --enable-processor was given.
  1.4048 +@@ -6102,17 +6120,17 @@
  1.4049 +   enableval=$enable_processor; case "${enableval}" in
  1.4050 +                  yes)
  1.4051 +                    disable_processor=false
  1.4052 +                    ;;
  1.4053 +                  no)
  1.4054 +                    disable_processor=true
  1.4055 +                    ;;
  1.4056 +                  *)
  1.4057 +-                   as_fn_error "bad value ${enableval} for --disable-processor" "$LINENO" 5
  1.4058 ++                   as_fn_error $? "bad value ${enableval} for --disable-processor" "$LINENO" 5
  1.4059 +                    ;;
  1.4060 +                esac
  1.4061 + else
  1.4062 +   disable_processor=false
  1.4063 + fi
  1.4064 + 
  1.4065 +  if test x$disable_processor = xtrue; then
  1.4066 +   DISABLE_PROCESSOR_TRUE=
  1.4067 +@@ -6128,47 +6146,47 @@
  1.4068 +   enableval=$enable_tools; case "${enableval}" in
  1.4069 +                  yes)
  1.4070 +                    disable_tools=false
  1.4071 +                    ;;
  1.4072 +                  no)
  1.4073 +                    disable_tools=true
  1.4074 +                    ;;
  1.4075 +                  *)
  1.4076 +-                   as_fn_error "bad value ${enableval} for --disable-tools" "$LINENO" 5
  1.4077 ++                   as_fn_error $? "bad value ${enableval} for --disable-tools" "$LINENO" 5
  1.4078 +                    ;;
  1.4079 +                esac
  1.4080 + else
  1.4081 +   disable_tools=false
  1.4082 + fi
  1.4083 + 
  1.4084 +  if test x$disable_tools = xtrue; then
  1.4085 +   DISABLE_TOOLS_TRUE=
  1.4086 +   DISABLE_TOOLS_FALSE='#'
  1.4087 + else
  1.4088 +   DISABLE_TOOLS_TRUE='#'
  1.4089 +   DISABLE_TOOLS_FALSE=
  1.4090 + fi
  1.4091 + 
  1.4092 + 
  1.4093 + if test x$LINUX_HOST = xfalse -a x$disable_processor = xtrue -a x$disable_tools = xtrue; then
  1.4094 +-   as_fn_error "--disable-processor and --disable-tools were specified, and not building for Linux. Nothing to build!" "$LINENO" 5
  1.4095 ++   as_fn_error $? "--disable-processor and --disable-tools were specified, and not building for Linux. Nothing to build!" "$LINENO" 5
  1.4096 + fi
  1.4097 + 
  1.4098 + # Check whether --enable-selftest was given.
  1.4099 + if test "${enable_selftest+set}" = set; then :
  1.4100 +   enableval=$enable_selftest; case "${enableval}" in
  1.4101 +                  yes)
  1.4102 +                    selftest=true
  1.4103 +                    ;;
  1.4104 +                  no)
  1.4105 +                    selftest=false
  1.4106 +                    ;;
  1.4107 +                  *)
  1.4108 +-                   as_fn_error "bad value ${enableval} for --enable-selftest" "$LINENO" 5
  1.4109 ++                   as_fn_error $? "bad value ${enableval} for --enable-selftest" "$LINENO" 5
  1.4110 +                    ;;
  1.4111 +                esac
  1.4112 + else
  1.4113 +   selftest=false
  1.4114 + fi
  1.4115 + 
  1.4116 +  if test x$selftest = xtrue; then
  1.4117 +   SELFTEST_TRUE=
  1.4118 +@@ -6240,35 +6258,47 @@
  1.4119 +      t clear
  1.4120 +      :clear
  1.4121 +      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
  1.4122 +      t end
  1.4123 +      s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
  1.4124 +      :end' >>confcache
  1.4125 + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
  1.4126 +   if test -w "$cache_file"; then
  1.4127 +-    test "x$cache_file" != "x/dev/null" &&
  1.4128 ++    if test "x$cache_file" != "x/dev/null"; then
  1.4129 +       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
  1.4130 + $as_echo "$as_me: updating cache $cache_file" >&6;}
  1.4131 +-    cat confcache >$cache_file
  1.4132 ++      if test ! -f "$cache_file" || test -h "$cache_file"; then
  1.4133 ++	cat confcache >"$cache_file"
  1.4134 ++      else
  1.4135 ++        case $cache_file in #(
  1.4136 ++        */* | ?:*)
  1.4137 ++	  mv -f confcache "$cache_file"$$ &&
  1.4138 ++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
  1.4139 ++        *)
  1.4140 ++	  mv -f confcache "$cache_file" ;;
  1.4141 ++	esac
  1.4142 ++      fi
  1.4143 ++    fi
  1.4144 +   else
  1.4145 +     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
  1.4146 + $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
  1.4147 +   fi
  1.4148 + fi
  1.4149 + rm -f confcache
  1.4150 + 
  1.4151 + test "x$prefix" = xNONE && prefix=$ac_default_prefix
  1.4152 + # Let make expand exec_prefix.
  1.4153 + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  1.4154 + 
  1.4155 + DEFS=-DHAVE_CONFIG_H
  1.4156 + 
  1.4157 + ac_libobjs=
  1.4158 + ac_ltlibobjs=
  1.4159 ++U=
  1.4160 + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
  1.4161 +   # 1. Remove the extension, and $U if already installed.
  1.4162 +   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
  1.4163 +   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
  1.4164 +   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
  1.4165 +   #    will be set to the directory where LIBOBJS objects are built.
  1.4166 +   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
  1.4167 +   as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
  1.4168 +@@ -6282,61 +6312,61 @@
  1.4169 +   am__EXEEXT_TRUE=
  1.4170 +   am__EXEEXT_FALSE='#'
  1.4171 + else
  1.4172 +   am__EXEEXT_TRUE='#'
  1.4173 +   am__EXEEXT_FALSE=
  1.4174 + fi
  1.4175 + 
  1.4176 + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
  1.4177 +-  as_fn_error "conditional \"AMDEP\" was never defined.
  1.4178 ++  as_fn_error $? "conditional \"AMDEP\" was never defined.
  1.4179 + Usually this means the macro was only invoked conditionally." "$LINENO" 5
  1.4180 + fi
  1.4181 + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
  1.4182 +-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
  1.4183 ++  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
  1.4184 + Usually this means the macro was only invoked conditionally." "$LINENO" 5
  1.4185 + fi
  1.4186 + if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
  1.4187 +-  as_fn_error "conditional \"am__fastdepCCAS\" was never defined.
  1.4188 ++  as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
  1.4189 + Usually this means the macro was only invoked conditionally." "$LINENO" 5
  1.4190 + fi
  1.4191 + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
  1.4192 +-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
  1.4193 ++  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
  1.4194 + Usually this means the macro was only invoked conditionally." "$LINENO" 5
  1.4195 + fi
  1.4196 + if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
  1.4197 +-  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
  1.4198 ++  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
  1.4199 + Usually this means the macro was only invoked conditionally." "$LINENO" 5
  1.4200 + fi
  1.4201 + if test -z "${GCC_TRUE}" && test -z "${GCC_FALSE}"; then
  1.4202 +-  as_fn_error "conditional \"GCC\" was never defined.
  1.4203 ++  as_fn_error $? "conditional \"GCC\" was never defined.
  1.4204 + Usually this means the macro was only invoked conditionally." "$LINENO" 5
  1.4205 + fi
  1.4206 + if test -z "${LINUX_HOST_TRUE}" && test -z "${LINUX_HOST_FALSE}"; then
  1.4207 +-  as_fn_error "conditional \"LINUX_HOST\" was never defined.
  1.4208 ++  as_fn_error $? "conditional \"LINUX_HOST\" was never defined.
  1.4209 + Usually this means the macro was only invoked conditionally." "$LINENO" 5
  1.4210 + fi
  1.4211 + if test -z "${ANDROID_HOST_TRUE}" && test -z "${ANDROID_HOST_FALSE}"; then
  1.4212 +-  as_fn_error "conditional \"ANDROID_HOST\" was never defined.
  1.4213 ++  as_fn_error $? "conditional \"ANDROID_HOST\" was never defined.
  1.4214 + Usually this means the macro was only invoked conditionally." "$LINENO" 5
  1.4215 + fi
  1.4216 + if test -z "${DISABLE_PROCESSOR_TRUE}" && test -z "${DISABLE_PROCESSOR_FALSE}"; then
  1.4217 +-  as_fn_error "conditional \"DISABLE_PROCESSOR\" was never defined.
  1.4218 ++  as_fn_error $? "conditional \"DISABLE_PROCESSOR\" was never defined.
  1.4219 + Usually this means the macro was only invoked conditionally." "$LINENO" 5
  1.4220 + fi
  1.4221 + if test -z "${DISABLE_TOOLS_TRUE}" && test -z "${DISABLE_TOOLS_FALSE}"; then
  1.4222 +-  as_fn_error "conditional \"DISABLE_TOOLS\" was never defined.
  1.4223 ++  as_fn_error $? "conditional \"DISABLE_TOOLS\" was never defined.
  1.4224 + Usually this means the macro was only invoked conditionally." "$LINENO" 5
  1.4225 + fi
  1.4226 + if test -z "${SELFTEST_TRUE}" && test -z "${SELFTEST_FALSE}"; then
  1.4227 +-  as_fn_error "conditional \"SELFTEST\" was never defined.
  1.4228 ++  as_fn_error $? "conditional \"SELFTEST\" was never defined.
  1.4229 + Usually this means the macro was only invoked conditionally." "$LINENO" 5
  1.4230 + fi
  1.4231 + 
  1.4232 +-: ${CONFIG_STATUS=./config.status}
  1.4233 ++: "${CONFIG_STATUS=./config.status}"
  1.4234 + ac_write_fail=0
  1.4235 + ac_clean_files_save=$ac_clean_files
  1.4236 + ac_clean_files="$ac_clean_files $CONFIG_STATUS"
  1.4237 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
  1.4238 + $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
  1.4239 + as_write_fail=0
  1.4240 + cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
  1.4241 + #! $SHELL
  1.4242 +@@ -6427,16 +6457,17 @@
  1.4243 + # IFS
  1.4244 + # We need space, tab and new line, in precisely that order.  Quoting is
  1.4245 + # there to prevent editors from complaining about space-tab.
  1.4246 + # (If _AS_PATH_WALK were called with IFS unset, it would disable word
  1.4247 + # splitting by setting IFS to empty value.)
  1.4248 + IFS=" ""	$as_nl"
  1.4249 + 
  1.4250 + # Find who we are.  Look in the path if we contain no directory separator.
  1.4251 ++as_myself=
  1.4252 + case $0 in #((
  1.4253 +   *[\\/]* ) as_myself=$0 ;;
  1.4254 +   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.4255 + for as_dir in $PATH
  1.4256 + do
  1.4257 +   IFS=$as_save_IFS
  1.4258 +   test -z "$as_dir" && as_dir=.
  1.4259 +     test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
  1.4260 +@@ -6472,29 +6503,29 @@
  1.4261 + export LC_ALL
  1.4262 + LANGUAGE=C
  1.4263 + export LANGUAGE
  1.4264 + 
  1.4265 + # CDPATH.
  1.4266 + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  1.4267 + 
  1.4268 + 
  1.4269 +-# as_fn_error ERROR [LINENO LOG_FD]
  1.4270 +-# ---------------------------------
  1.4271 ++# as_fn_error STATUS ERROR [LINENO LOG_FD]
  1.4272 ++# ----------------------------------------
  1.4273 + # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
  1.4274 + # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
  1.4275 +-# script with status $?, using 1 if that was 0.
  1.4276 ++# script with STATUS, using 1 if that was 0.
  1.4277 + as_fn_error ()
  1.4278 + {
  1.4279 +-  as_status=$?; test $as_status -eq 0 && as_status=1
  1.4280 +-  if test "$3"; then
  1.4281 +-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  1.4282 +-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
  1.4283 ++  as_status=$1; test $as_status -eq 0 && as_status=1
  1.4284 ++  if test "$4"; then
  1.4285 ++    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  1.4286 ++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
  1.4287 +   fi
  1.4288 +-  $as_echo "$as_me: error: $1" >&2
  1.4289 ++  $as_echo "$as_me: error: $2" >&2
  1.4290 +   as_fn_exit $as_status
  1.4291 + } # as_fn_error
  1.4292 + 
  1.4293 + 
  1.4294 + # as_fn_set_status STATUS
  1.4295 + # -----------------------
  1.4296 + # Set $? to STATUS, without forking.
  1.4297 + as_fn_set_status ()
  1.4298 +@@ -6680,17 +6711,17 @@
  1.4299 + 	  /^X\(\/\).*/{
  1.4300 + 	    s//\1/
  1.4301 + 	    q
  1.4302 + 	  }
  1.4303 + 	  s/.*/./; q'`
  1.4304 +       test -d "$as_dir" && break
  1.4305 +     done
  1.4306 +     test -z "$as_dirs" || eval "mkdir $as_dirs"
  1.4307 +-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
  1.4308 ++  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
  1.4309 + 
  1.4310 + 
  1.4311 + } # as_fn_mkdir_p
  1.4312 + if mkdir -p . 2>/dev/null; then
  1.4313 +   as_mkdir_p='mkdir -p "$as_dir"'
  1.4314 + else
  1.4315 +   test -d ./-p && rmdir ./-p
  1.4316 +   as_mkdir_p=false
  1.4317 +@@ -6734,17 +6765,17 @@
  1.4318 + test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
  1.4319 + 
  1.4320 + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  1.4321 + # Save the log message, to keep $0 and so on meaningful, and to
  1.4322 + # report actual input values of CONFIG_FILES etc. instead of their
  1.4323 + # values after options handling.
  1.4324 + ac_log="
  1.4325 + This file was extended by breakpad $as_me 0.1, which was
  1.4326 +-generated by GNU Autoconf 2.65.  Invocation command line was
  1.4327 ++generated by GNU Autoconf 2.68.  Invocation command line was
  1.4328 + 
  1.4329 +   CONFIG_FILES    = $CONFIG_FILES
  1.4330 +   CONFIG_HEADERS  = $CONFIG_HEADERS
  1.4331 +   CONFIG_LINKS    = $CONFIG_LINKS
  1.4332 +   CONFIG_COMMANDS = $CONFIG_COMMANDS
  1.4333 +   $ $0 $@
  1.4334 + 
  1.4335 + on `(hostname || uname -n) 2>/dev/null | sed 1q`
  1.4336 +@@ -6800,20 +6831,20 @@
  1.4337 + 
  1.4338 + Report bugs to <google-breakpad-dev@googlegroups.com>."
  1.4339 + 
  1.4340 + _ACEOF
  1.4341 + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  1.4342 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  1.4343 + ac_cs_version="\\
  1.4344 + breakpad config.status 0.1
  1.4345 +-configured by $0, generated by GNU Autoconf 2.65,
  1.4346 ++configured by $0, generated by GNU Autoconf 2.68,
  1.4347 +   with options \\"\$ac_cs_config\\"
  1.4348 + 
  1.4349 +-Copyright (C) 2009 Free Software Foundation, Inc.
  1.4350 ++Copyright (C) 2010 Free Software Foundation, Inc.
  1.4351 + This config.status script is free software; the Free Software Foundation
  1.4352 + gives unlimited permission to copy, distribute and modify it."
  1.4353 + 
  1.4354 + ac_pwd='$ac_pwd'
  1.4355 + srcdir='$srcdir'
  1.4356 + INSTALL='$INSTALL'
  1.4357 + MKDIR_P='$MKDIR_P'
  1.4358 + AWK='$AWK'
  1.4359 +@@ -6821,21 +6852,26 @@
  1.4360 + _ACEOF
  1.4361 + 
  1.4362 + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  1.4363 + # The default lists apply if the user does not specify any file.
  1.4364 + ac_need_defaults=:
  1.4365 + while test $# != 0
  1.4366 + do
  1.4367 +   case $1 in
  1.4368 +-  --*=*)
  1.4369 ++  --*=?*)
  1.4370 +     ac_option=`expr "X$1" : 'X\([^=]*\)='`
  1.4371 +     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
  1.4372 +     ac_shift=:
  1.4373 +     ;;
  1.4374 ++  --*=)
  1.4375 ++    ac_option=`expr "X$1" : 'X\([^=]*\)='`
  1.4376 ++    ac_optarg=
  1.4377 ++    ac_shift=:
  1.4378 ++    ;;
  1.4379 +   *)
  1.4380 +     ac_option=$1
  1.4381 +     ac_optarg=$2
  1.4382 +     ac_shift=shift
  1.4383 +     ;;
  1.4384 +   esac
  1.4385 + 
  1.4386 +   case $ac_option in
  1.4387 +@@ -6847,38 +6883,39 @@
  1.4388 +   --config | --confi | --conf | --con | --co | --c )
  1.4389 +     $as_echo "$ac_cs_config"; exit ;;
  1.4390 +   --debug | --debu | --deb | --de | --d | -d )
  1.4391 +     debug=: ;;
  1.4392 +   --file | --fil | --fi | --f )
  1.4393 +     $ac_shift
  1.4394 +     case $ac_optarg in
  1.4395 +     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
  1.4396 ++    '') as_fn_error $? "missing file argument" ;;
  1.4397 +     esac
  1.4398 +     as_fn_append CONFIG_FILES " '$ac_optarg'"
  1.4399 +     ac_need_defaults=false;;
  1.4400 +   --header | --heade | --head | --hea )
  1.4401 +     $ac_shift
  1.4402 +     case $ac_optarg in
  1.4403 +     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
  1.4404 +     esac
  1.4405 +     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
  1.4406 +     ac_need_defaults=false;;
  1.4407 +   --he | --h)
  1.4408 +     # Conflict between --help and --header
  1.4409 +-    as_fn_error "ambiguous option: \`$1'
  1.4410 ++    as_fn_error $? "ambiguous option: \`$1'
  1.4411 + Try \`$0 --help' for more information.";;
  1.4412 +   --help | --hel | -h )
  1.4413 +     $as_echo "$ac_cs_usage"; exit ;;
  1.4414 +   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
  1.4415 +   | -silent | --silent | --silen | --sile | --sil | --si | --s)
  1.4416 +     ac_cs_silent=: ;;
  1.4417 + 
  1.4418 +   # This is an error.
  1.4419 +-  -*) as_fn_error "unrecognized option: \`$1'
  1.4420 ++  -*) as_fn_error $? "unrecognized option: \`$1'
  1.4421 + Try \`$0 --help' for more information." ;;
  1.4422 + 
  1.4423 +   *) as_fn_append ac_config_targets " $1"
  1.4424 +      ac_need_defaults=false ;;
  1.4425 + 
  1.4426 +   esac
  1.4427 +   shift
  1.4428 + done
  1.4429 +@@ -6926,17 +6963,17 @@
  1.4430 + # Handling of arguments.
  1.4431 + for ac_config_target in $ac_config_targets
  1.4432 + do
  1.4433 +   case $ac_config_target in
  1.4434 +     "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
  1.4435 +     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
  1.4436 +     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
  1.4437 + 
  1.4438 +-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  1.4439 ++  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  1.4440 +   esac
  1.4441 + done
  1.4442 + 
  1.4443 + 
  1.4444 + # If the user did not use the arguments to specify the items to instantiate,
  1.4445 + # then the envvar interface is used.  Set only those that are not.
  1.4446 + # We use the long form for the default assignment because of an extremely
  1.4447 + # bizarre bug on SunOS 4.1.3.
  1.4448 +@@ -6949,82 +6986,84 @@
  1.4449 + # Have a temporary directory for convenience.  Make it in the build tree
  1.4450 + # simply because there is no reason against having it here, and in addition,
  1.4451 + # creating and moving files from /tmp can sometimes cause problems.
  1.4452 + # Hook for its removal unless debugging.
  1.4453 + # Note that there is a small window in which the directory will not be cleaned:
  1.4454 + # after its creation but before its name has been assigned to `$tmp'.
  1.4455 + $debug ||
  1.4456 + {
  1.4457 +-  tmp=
  1.4458 ++  tmp= ac_tmp=
  1.4459 +   trap 'exit_status=$?
  1.4460 +-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  1.4461 ++  : "${ac_tmp:=$tmp}"
  1.4462 ++  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
  1.4463 + ' 0
  1.4464 +   trap 'as_fn_exit 1' 1 2 13 15
  1.4465 + }
  1.4466 + # Create a (secure) tmp directory for tmp files.
  1.4467 + 
  1.4468 + {
  1.4469 +   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
  1.4470 +-  test -n "$tmp" && test -d "$tmp"
  1.4471 ++  test -d "$tmp"
  1.4472 + }  ||
  1.4473 + {
  1.4474 +   tmp=./conf$$-$RANDOM
  1.4475 +   (umask 077 && mkdir "$tmp")
  1.4476 +-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
  1.4477 ++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
  1.4478 ++ac_tmp=$tmp
  1.4479 + 
  1.4480 + # Set up the scripts for CONFIG_FILES section.
  1.4481 + # No need to generate them if there are no CONFIG_FILES.
  1.4482 + # This happens for instance with `./config.status config.h'.
  1.4483 + if test -n "$CONFIG_FILES"; then
  1.4484 + 
  1.4485 + 
  1.4486 + ac_cr=`echo X | tr X '\015'`
  1.4487 + # On cygwin, bash can eat \r inside `` if the user requested igncr.
  1.4488 + # But we know of no other shell where ac_cr would be empty at this
  1.4489 + # point, so we can use a bashism as a fallback.
  1.4490 + if test "x$ac_cr" = x; then
  1.4491 +   eval ac_cr=\$\'\\r\'
  1.4492 + fi
  1.4493 + ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
  1.4494 + if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
  1.4495 +-  ac_cs_awk_cr='\r'
  1.4496 ++  ac_cs_awk_cr='\\r'
  1.4497 + else
  1.4498 +   ac_cs_awk_cr=$ac_cr
  1.4499 + fi
  1.4500 + 
  1.4501 +-echo 'BEGIN {' >"$tmp/subs1.awk" &&
  1.4502 ++echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
  1.4503 + _ACEOF
  1.4504 + 
  1.4505 + 
  1.4506 + {
  1.4507 +   echo "cat >conf$$subs.awk <<_ACEOF" &&
  1.4508 +   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
  1.4509 +   echo "_ACEOF"
  1.4510 + } >conf$$subs.sh ||
  1.4511 +-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
  1.4512 +-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
  1.4513 ++  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
  1.4514 ++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
  1.4515 + ac_delim='%!_!# '
  1.4516 + for ac_last_try in false false false false false :; do
  1.4517 +   . ./conf$$subs.sh ||
  1.4518 +-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
  1.4519 ++    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
  1.4520 + 
  1.4521 +   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
  1.4522 +   if test $ac_delim_n = $ac_delim_num; then
  1.4523 +     break
  1.4524 +   elif $ac_last_try; then
  1.4525 +-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
  1.4526 ++    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
  1.4527 +   else
  1.4528 +     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
  1.4529 +   fi
  1.4530 + done
  1.4531 + rm -f conf$$subs.sh
  1.4532 + 
  1.4533 + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  1.4534 +-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
  1.4535 ++cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
  1.4536 + _ACEOF
  1.4537 + sed -n '
  1.4538 + h
  1.4539 + s/^/S["/; s/!.*/"]=/
  1.4540 + p
  1.4541 + g
  1.4542 + s/^[^!]*!//
  1.4543 + :repl
  1.4544 +@@ -7062,17 +7101,17 @@
  1.4545 + /^[^""]/{
  1.4546 +   N
  1.4547 +   s/\n//
  1.4548 + }
  1.4549 + ' >>$CONFIG_STATUS || ac_write_fail=1
  1.4550 + rm -f conf$$subs.awk
  1.4551 + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  1.4552 + _ACAWK
  1.4553 +-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
  1.4554 ++cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
  1.4555 +   for (key in S) S_is_set[key] = 1
  1.4556 +   FS = ""
  1.4557 + 
  1.4558 + }
  1.4559 + {
  1.4560 +   line = $ 0
  1.4561 +   nfields = split(line, field, "@")
  1.4562 +   substed = 0
  1.4563 +@@ -7094,59 +7133,67 @@
  1.4564 + 
  1.4565 + _ACAWK
  1.4566 + _ACEOF
  1.4567 + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  1.4568 + if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
  1.4569 +   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
  1.4570 + else
  1.4571 +   cat
  1.4572 +-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
  1.4573 +-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
  1.4574 ++fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
  1.4575 ++  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
  1.4576 + _ACEOF
  1.4577 + 
  1.4578 +-# VPATH may cause trouble with some makes, so we remove $(srcdir),
  1.4579 +-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
  1.4580 ++# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
  1.4581 ++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
  1.4582 + # trailing colons and then remove the whole line if VPATH becomes empty
  1.4583 + # (actually we leave an empty line to preserve line numbers).
  1.4584 + if test "x$srcdir" = x.; then
  1.4585 +-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
  1.4586 +-s/:*\$(srcdir):*/:/
  1.4587 +-s/:*\${srcdir}:*/:/
  1.4588 +-s/:*@srcdir@:*/:/
  1.4589 +-s/^\([^=]*=[	 ]*\):*/\1/
  1.4590 ++  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
  1.4591 ++h
  1.4592 ++s///
  1.4593 ++s/^/:/
  1.4594 ++s/[	 ]*$/:/
  1.4595 ++s/:\$(srcdir):/:/g
  1.4596 ++s/:\${srcdir}:/:/g
  1.4597 ++s/:@srcdir@:/:/g
  1.4598 ++s/^:*//
  1.4599 + s/:*$//
  1.4600 ++x
  1.4601 ++s/\(=[	 ]*\).*/\1/
  1.4602 ++G
  1.4603 ++s/\n//
  1.4604 + s/^[^=]*=[	 ]*$//
  1.4605 + }'
  1.4606 + fi
  1.4607 + 
  1.4608 + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  1.4609 + fi # test -n "$CONFIG_FILES"
  1.4610 + 
  1.4611 + # Set up the scripts for CONFIG_HEADERS section.
  1.4612 + # No need to generate them if there are no CONFIG_HEADERS.
  1.4613 + # This happens for instance with `./config.status Makefile'.
  1.4614 + if test -n "$CONFIG_HEADERS"; then
  1.4615 +-cat >"$tmp/defines.awk" <<\_ACAWK ||
  1.4616 ++cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
  1.4617 + BEGIN {
  1.4618 + _ACEOF
  1.4619 + 
  1.4620 + # Transform confdefs.h into an awk script `defines.awk', embedded as
  1.4621 + # here-document in config.status, that substitutes the proper values into
  1.4622 + # config.h.in to produce config.h.
  1.4623 + 
  1.4624 + # Create a delimiter string that does not exist in confdefs.h, to ease
  1.4625 + # handling of long lines.
  1.4626 + ac_delim='%!_!# '
  1.4627 + for ac_last_try in false false :; do
  1.4628 +-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
  1.4629 +-  if test -z "$ac_t"; then
  1.4630 ++  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
  1.4631 ++  if test -z "$ac_tt"; then
  1.4632 +     break
  1.4633 +   elif $ac_last_try; then
  1.4634 +-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
  1.4635 ++    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
  1.4636 +   else
  1.4637 +     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
  1.4638 +   fi
  1.4639 + done
  1.4640 + 
  1.4641 + # For the awk script, D is an array of macro values keyed by name,
  1.4642 + # likewise P contains macro parameters if any.  Preserve backslash
  1.4643 + # newline sequences.
  1.4644 +@@ -7221,30 +7268,30 @@
  1.4645 +       next
  1.4646 +     }
  1.4647 +   }
  1.4648 + }
  1.4649 + { print }
  1.4650 + _ACAWK
  1.4651 + _ACEOF
  1.4652 + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  1.4653 +-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
  1.4654 ++  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
  1.4655 + fi # test -n "$CONFIG_HEADERS"
  1.4656 + 
  1.4657 + 
  1.4658 + eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
  1.4659 + shift
  1.4660 + for ac_tag
  1.4661 + do
  1.4662 +   case $ac_tag in
  1.4663 +   :[FHLC]) ac_mode=$ac_tag; continue;;
  1.4664 +   esac
  1.4665 +   case $ac_mode$ac_tag in
  1.4666 +   :[FHL]*:*);;
  1.4667 +-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
  1.4668 ++  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
  1.4669 +   :[FH]-) ac_tag=-:-;;
  1.4670 +   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
  1.4671 +   esac
  1.4672 +   ac_save_IFS=$IFS
  1.4673 +   IFS=:
  1.4674 +   set x $ac_tag
  1.4675 +   IFS=$ac_save_IFS
  1.4676 +   shift
  1.4677 +@@ -7253,26 +7300,26 @@
  1.4678 + 
  1.4679 +   case $ac_mode in
  1.4680 +   :L) ac_source=$1;;
  1.4681 +   :[FH])
  1.4682 +     ac_file_inputs=
  1.4683 +     for ac_f
  1.4684 +     do
  1.4685 +       case $ac_f in
  1.4686 +-      -) ac_f="$tmp/stdin";;
  1.4687 ++      -) ac_f="$ac_tmp/stdin";;
  1.4688 +       *) # Look for the file first in the build tree, then in the source tree
  1.4689 + 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
  1.4690 + 	 # because $ac_f cannot contain `:'.
  1.4691 + 	 test -f "$ac_f" ||
  1.4692 + 	   case $ac_f in
  1.4693 + 	   [\\/$]*) false;;
  1.4694 + 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  1.4695 + 	   esac ||
  1.4696 +-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
  1.4697 ++	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
  1.4698 +       esac
  1.4699 +       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
  1.4700 +       as_fn_append ac_file_inputs " '$ac_f'"
  1.4701 +     done
  1.4702 + 
  1.4703 +     # Let's still pretend it is `configure' which instantiates (i.e., don't
  1.4704 +     # use $as_me), people would be surprised to read:
  1.4705 +     #    /* config.h.  Generated by config.status.  */
  1.4706 +@@ -7288,18 +7335,18 @@
  1.4707 +     case $configure_input in #(
  1.4708 +     *\&* | *\|* | *\\* )
  1.4709 +        ac_sed_conf_input=`$as_echo "$configure_input" |
  1.4710 +        sed 's/[\\\\&|]/\\\\&/g'`;; #(
  1.4711 +     *) ac_sed_conf_input=$configure_input;;
  1.4712 +     esac
  1.4713 + 
  1.4714 +     case $ac_tag in
  1.4715 +-    *:-:* | *:-) cat >"$tmp/stdin" \
  1.4716 +-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
  1.4717 ++    *:-:* | *:-) cat >"$ac_tmp/stdin" \
  1.4718 ++      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
  1.4719 +     esac
  1.4720 +     ;;
  1.4721 +   esac
  1.4722 + 
  1.4723 +   ac_dir=`$as_dirname -- "$ac_file" ||
  1.4724 + $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  1.4725 + 	 X"$ac_file" : 'X\(//\)[^/]' \| \
  1.4726 + 	 X"$ac_file" : 'X\(//\)$' \| \
  1.4727 +@@ -7425,56 +7472,57 @@
  1.4728 + s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
  1.4729 + s&@builddir@&$ac_builddir&;t t
  1.4730 + s&@abs_builddir@&$ac_abs_builddir&;t t
  1.4731 + s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
  1.4732 + s&@INSTALL@&$ac_INSTALL&;t t
  1.4733 + s&@MKDIR_P@&$ac_MKDIR_P&;t t
  1.4734 + $ac_datarootdir_hack
  1.4735 + "
  1.4736 +-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
  1.4737 +-  || as_fn_error "could not create $ac_file" "$LINENO" 5
  1.4738 ++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
  1.4739 ++  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  1.4740 + 
  1.4741 + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
  1.4742 +-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
  1.4743 +-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
  1.4744 ++  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
  1.4745 ++  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
  1.4746 ++      "$ac_tmp/out"`; test -z "$ac_out"; } &&
  1.4747 +   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  1.4748 +-which seems to be undefined.  Please make sure it is defined." >&5
  1.4749 ++which seems to be undefined.  Please make sure it is defined" >&5
  1.4750 + $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  1.4751 +-which seems to be undefined.  Please make sure it is defined." >&2;}
  1.4752 +-
  1.4753 +-  rm -f "$tmp/stdin"
  1.4754 ++which seems to be undefined.  Please make sure it is defined" >&2;}
  1.4755 ++
  1.4756 ++  rm -f "$ac_tmp/stdin"
  1.4757 +   case $ac_file in
  1.4758 +-  -) cat "$tmp/out" && rm -f "$tmp/out";;
  1.4759 +-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
  1.4760 ++  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
  1.4761 ++  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
  1.4762 +   esac \
  1.4763 +-  || as_fn_error "could not create $ac_file" "$LINENO" 5
  1.4764 ++  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  1.4765 +  ;;
  1.4766 +   :H)
  1.4767 +   #
  1.4768 +   # CONFIG_HEADER
  1.4769 +   #
  1.4770 +   if test x"$ac_file" != x-; then
  1.4771 +     {
  1.4772 +       $as_echo "/* $configure_input  */" \
  1.4773 +-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
  1.4774 +-    } >"$tmp/config.h" \
  1.4775 +-      || as_fn_error "could not create $ac_file" "$LINENO" 5
  1.4776 +-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
  1.4777 ++      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
  1.4778 ++    } >"$ac_tmp/config.h" \
  1.4779 ++      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  1.4780 ++    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
  1.4781 +       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
  1.4782 + $as_echo "$as_me: $ac_file is unchanged" >&6;}
  1.4783 +     else
  1.4784 +       rm -f "$ac_file"
  1.4785 +-      mv "$tmp/config.h" "$ac_file" \
  1.4786 +-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
  1.4787 ++      mv "$ac_tmp/config.h" "$ac_file" \
  1.4788 ++	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
  1.4789 +     fi
  1.4790 +   else
  1.4791 +     $as_echo "/* $configure_input  */" \
  1.4792 +-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
  1.4793 +-      || as_fn_error "could not create -" "$LINENO" 5
  1.4794 ++      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
  1.4795 ++      || as_fn_error $? "could not create -" "$LINENO" 5
  1.4796 +   fi
  1.4797 + # Compute "$ac_file"'s index in $config_headers.
  1.4798 + _am_arg="$ac_file"
  1.4799 + _am_stamp_count=1
  1.4800 + for _am_header in $config_headers :; do
  1.4801 +   case $_am_header in
  1.4802 +     $_am_arg | $_am_arg:* )
  1.4803 +       break ;;
  1.4804 +@@ -7614,17 +7662,17 @@
  1.4805 + done # for ac_tag
  1.4806 + 
  1.4807 + 
  1.4808 + as_fn_exit 0
  1.4809 + _ACEOF
  1.4810 + ac_clean_files=$ac_clean_files_save
  1.4811 + 
  1.4812 + test $ac_write_fail = 0 ||
  1.4813 +-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
  1.4814 ++  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
  1.4815 + 
  1.4816 + 
  1.4817 + # configure is writing to config.log, and then calls config.status.
  1.4818 + # config.status does its own redirection, appending to config.log.
  1.4819 + # Unfortunately, on DOS this fails, as config.log is still kept open
  1.4820 + # by configure, so config.status won't be able to write to it; its
  1.4821 + # output is simply discarded.  So we exec the FD to /dev/null,
  1.4822 + # effectively closing config.log, so it can be properly (re)opened and
  1.4823 +@@ -7635,15 +7683,15 @@
  1.4824 +   ac_config_status_args=
  1.4825 +   test "$silent" = yes &&
  1.4826 +     ac_config_status_args="$ac_config_status_args --quiet"
  1.4827 +   exec 5>/dev/null
  1.4828 +   $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
  1.4829 +   exec 5>>config.log
  1.4830 +   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
  1.4831 +   # would make configure fail if this is the last instruction.
  1.4832 +-  $ac_cs_success || as_fn_exit $?
  1.4833 ++  $ac_cs_success || as_fn_exit 1
  1.4834 + fi
  1.4835 + if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
  1.4836 +   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
  1.4837 + $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  1.4838 + fi
  1.4839 + 
  1.4840 +diff --git a/src/common/dwarf_cfi_to_module.cc b/src/common/dwarf_cfi_to_module.cc
  1.4841 +--- a/src/common/dwarf_cfi_to_module.cc
  1.4842 ++++ b/src/common/dwarf_cfi_to_module.cc
  1.4843 +@@ -122,17 +122,18 @@
  1.4844 +   return_address_ = return_address;
  1.4845 + 
  1.4846 +   // Breakpad STACK CFI records must provide a .ra rule, but DWARF CFI
  1.4847 +   // may not establish any rule for .ra if the return address column
  1.4848 +   // is an ordinary register, and that register holds the return
  1.4849 +   // address on entry to the function. So establish an initial .ra
  1.4850 +   // rule citing the return address register.
  1.4851 +   if (return_address_ < register_names_.size())
  1.4852 +-    entry_->initial_rules[ra_name_] = register_names_[return_address_];
  1.4853 ++    entry_->initial_rules[ra_name_]
  1.4854 ++      = Module::Expr(register_names_[return_address_], 0, false);
  1.4855 + 
  1.4856 +   return true;
  1.4857 + }
  1.4858 + 
  1.4859 + string DwarfCFIToModule::RegisterName(int i) {
  1.4860 +   assert(entry_);
  1.4861 +   if (i < 0) {
  1.4862 +     assert(i == kCFARegister);
  1.4863 +@@ -148,69 +149,65 @@
  1.4864 + 
  1.4865 +   reporter_->UnnamedRegister(entry_offset_, reg);
  1.4866 +   char buf[30];
  1.4867 +   sprintf(buf, "unnamed_register%u", reg);
  1.4868 +   return buf;
  1.4869 + }
  1.4870 + 
  1.4871 + void DwarfCFIToModule::Record(Module::Address address, int reg,
  1.4872 +-                              const string &rule) {
  1.4873 ++                              const Module::Expr &rule) {
  1.4874 +   assert(entry_);
  1.4875 + 
  1.4876 +-  // Place the name in our global set of strings, and then use the string
  1.4877 +-  // from the set. Even though the assignment looks like a copy, all the
  1.4878 +-  // major std::string implementations use reference counting internally,
  1.4879 +-  // so the effect is to have all our data structures share copies of rules
  1.4880 +-  // whenever possible. Since register names are drawn from a
  1.4881 +-  // vector<string>, register names are already shared.
  1.4882 +-  string shared_rule = *common_strings_.insert(rule).first;
  1.4883 +-
  1.4884 +   // Is this one of this entry's initial rules?
  1.4885 +   if (address == entry_->address)
  1.4886 +-    entry_->initial_rules[RegisterName(reg)] = shared_rule;
  1.4887 ++    entry_->initial_rules[RegisterName(reg)] = rule;
  1.4888 +   // File it under the appropriate address.
  1.4889 +   else
  1.4890 +-    entry_->rule_changes[address][RegisterName(reg)] = shared_rule;
  1.4891 ++    entry_->rule_changes[address][RegisterName(reg)] = rule;
  1.4892 + }
  1.4893 + 
  1.4894 + bool DwarfCFIToModule::UndefinedRule(uint64 address, int reg) {
  1.4895 +   reporter_->UndefinedNotSupported(entry_offset_, RegisterName(reg));
  1.4896 +   // Treat this as a non-fatal error.
  1.4897 +   return true;
  1.4898 + }
  1.4899 + 
  1.4900 + bool DwarfCFIToModule::SameValueRule(uint64 address, int reg) {
  1.4901 +-  ostringstream s;
  1.4902 +-  s << RegisterName(reg);
  1.4903 +-  Record(address, reg, s.str());
  1.4904 ++  // reg + 0
  1.4905 ++  Module::Expr rule
  1.4906 ++    = Module::Expr(RegisterName(reg), 0, false);
  1.4907 ++  Record(address, reg, rule);
  1.4908 +   return true;
  1.4909 + }
  1.4910 + 
  1.4911 + bool DwarfCFIToModule::OffsetRule(uint64 address, int reg,
  1.4912 +                                   int base_register, long offset) {
  1.4913 +-  ostringstream s;
  1.4914 +-  s << RegisterName(base_register) << " " << offset << " + ^";
  1.4915 +-  Record(address, reg, s.str());
  1.4916 ++  // *(base_register + offset)
  1.4917 ++  Module::Expr rule
  1.4918 ++    = Module::Expr(RegisterName(base_register), offset, true);
  1.4919 ++  Record(address, reg, rule);
  1.4920 +   return true;
  1.4921 + }
  1.4922 + 
  1.4923 + bool DwarfCFIToModule::ValOffsetRule(uint64 address, int reg,
  1.4924 +                                      int base_register, long offset) {
  1.4925 +-  ostringstream s;
  1.4926 +-  s << RegisterName(base_register) << " " << offset << " +";
  1.4927 +-  Record(address, reg, s.str());
  1.4928 ++  // base_register + offset
  1.4929 ++  Module::Expr rule
  1.4930 ++    = Module::Expr(RegisterName(base_register), offset, false);
  1.4931 ++  Record(address, reg, rule);
  1.4932 +   return true;
  1.4933 + }
  1.4934 + 
  1.4935 + bool DwarfCFIToModule::RegisterRule(uint64 address, int reg,
  1.4936 +                                     int base_register) {
  1.4937 +-  ostringstream s;
  1.4938 +-  s << RegisterName(base_register);
  1.4939 +-  Record(address, reg, s.str());
  1.4940 ++  // base_register + 0
  1.4941 ++  Module::Expr rule
  1.4942 ++    = Module::Expr(RegisterName(base_register), 0, false);
  1.4943 ++  Record(address, reg, rule);
  1.4944 +   return true;
  1.4945 + }
  1.4946 + 
  1.4947 + bool DwarfCFIToModule::ExpressionRule(uint64 address, int reg,
  1.4948 +                                       const string &expression) {
  1.4949 +   reporter_->ExpressionsNotSupported(entry_offset_, RegisterName(reg));
  1.4950 +   // Treat this as a non-fatal error.
  1.4951 +   return true;
  1.4952 +diff --git a/src/common/dwarf_cfi_to_module.h b/src/common/dwarf_cfi_to_module.h
  1.4953 +--- a/src/common/dwarf_cfi_to_module.h
  1.4954 ++++ b/src/common/dwarf_cfi_to_module.h
  1.4955 +@@ -147,17 +147,17 @@
  1.4956 +                                  const string &expression);
  1.4957 +   virtual bool End();
  1.4958 + 
  1.4959 +  private:
  1.4960 +   // Return the name to use for register REG.
  1.4961 +   string RegisterName(int i);
  1.4962 + 
  1.4963 +   // Record RULE for register REG at ADDRESS.
  1.4964 +-  void Record(Module::Address address, int reg, const string &rule);
  1.4965 ++  void Record(Module::Address address, int reg, const Module::Expr &rule);
  1.4966 + 
  1.4967 +   // The module to which we should add entries.
  1.4968 +   Module *module_;
  1.4969 + 
  1.4970 +   // Map from register numbers to register names.
  1.4971 +   const vector<string> &register_names_;
  1.4972 + 
  1.4973 +   // The reporter to use to report problems.
  1.4974 +diff --git a/src/common/dwarf_cfi_to_module_unittest.cc b/src/common/dwarf_cfi_to_module_unittest.cc
  1.4975 +--- a/src/common/dwarf_cfi_to_module_unittest.cc
  1.4976 ++++ b/src/common/dwarf_cfi_to_module_unittest.cc
  1.4977 +@@ -153,69 +153,71 @@
  1.4978 + }
  1.4979 + 
  1.4980 + TEST_F(Rule, SameValueRule) {
  1.4981 +   StartEntry();
  1.4982 +   ASSERT_TRUE(handler.SameValueRule(entry_address, 6));
  1.4983 +   ASSERT_TRUE(handler.End());
  1.4984 +   CheckEntry();
  1.4985 +   Module::RuleMap expected_initial;
  1.4986 +-  expected_initial["reg6"] = "reg6";
  1.4987 ++  expected_initial["reg6"] = Module::Expr("reg6", 0, false);
  1.4988 +   EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial));
  1.4989 +   EXPECT_EQ(0U, entries[0]->rule_changes.size());
  1.4990 + }
  1.4991 + 
  1.4992 + TEST_F(Rule, OffsetRule) {
  1.4993 +   StartEntry();
  1.4994 +   ASSERT_TRUE(handler.OffsetRule(entry_address + 1, return_reg,
  1.4995 +                                  DwarfCFIToModule::kCFARegister,
  1.4996 +                                  16927065));
  1.4997 +   ASSERT_TRUE(handler.End());
  1.4998 +   CheckEntry();
  1.4999 +   EXPECT_EQ(0U, entries[0]->initial_rules.size());
  1.5000 +   Module::RuleChangeMap expected_changes;
  1.5001 +-  expected_changes[entry_address + 1][".ra"] = ".cfa 16927065 + ^";
  1.5002 ++  expected_changes[entry_address + 1][".ra"] =
  1.5003 ++      Module::Expr(".cfa", 16927065, true);
  1.5004 +   EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes));
  1.5005 + }
  1.5006 + 
  1.5007 + TEST_F(Rule, OffsetRuleNegative) {
  1.5008 +   StartEntry();
  1.5009 +   ASSERT_TRUE(handler.OffsetRule(entry_address + 1,
  1.5010 +                                  DwarfCFIToModule::kCFARegister, 4, -34530721));
  1.5011 +   ASSERT_TRUE(handler.End());
  1.5012 +   CheckEntry();
  1.5013 +   EXPECT_EQ(0U, entries[0]->initial_rules.size());
  1.5014 +   Module::RuleChangeMap expected_changes;
  1.5015 +-  expected_changes[entry_address + 1][".cfa"] = "reg4 -34530721 + ^";
  1.5016 ++  expected_changes[entry_address + 1][".cfa"] =
  1.5017 ++      Module::Expr("reg4", -34530721, true);
  1.5018 +   EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes));
  1.5019 + }
  1.5020 + 
  1.5021 + TEST_F(Rule, ValOffsetRule) {
  1.5022 +   // Use an unnamed register number, to exercise that branch of RegisterName.
  1.5023 +   EXPECT_CALL(reporter, UnnamedRegister(_, 11));
  1.5024 +   StartEntry();
  1.5025 +   ASSERT_TRUE(handler.ValOffsetRule(entry_address + 0x5ab7,
  1.5026 +                                     DwarfCFIToModule::kCFARegister,
  1.5027 +                                     11, 61812979));
  1.5028 +   ASSERT_TRUE(handler.End());
  1.5029 +   CheckEntry();
  1.5030 +   EXPECT_EQ(0U, entries[0]->initial_rules.size());
  1.5031 +   Module::RuleChangeMap expected_changes;
  1.5032 +   expected_changes[entry_address + 0x5ab7][".cfa"] =
  1.5033 +-      "unnamed_register11 61812979 +";
  1.5034 ++      Module::Expr("unnamed_register11", 61812979, false);
  1.5035 +   EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes));
  1.5036 + }
  1.5037 + 
  1.5038 + TEST_F(Rule, RegisterRule) {
  1.5039 +   StartEntry();
  1.5040 +   ASSERT_TRUE(handler.RegisterRule(entry_address, return_reg, 3));
  1.5041 +   ASSERT_TRUE(handler.End());
  1.5042 +   CheckEntry();
  1.5043 +   Module::RuleMap expected_initial;
  1.5044 +-  expected_initial[".ra"] = "reg3";
  1.5045 ++  expected_initial[".ra"] = Module::Expr("reg3", 0, false);
  1.5046 +   EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial));
  1.5047 +   EXPECT_EQ(0U, entries[0]->rule_changes.size());
  1.5048 + }
  1.5049 + 
  1.5050 + TEST_F(Rule, ExpressionRule) {
  1.5051 +   EXPECT_CALL(reporter, ExpressionsNotSupported(_, "reg2"));
  1.5052 +   StartEntry();
  1.5053 +   ASSERT_TRUE(handler.ExpressionRule(entry_address + 0xf326, 2,
  1.5054 +@@ -239,45 +241,46 @@
  1.5055 + 
  1.5056 + TEST_F(Rule, DefaultReturnAddressRule) {
  1.5057 +   return_reg = 2;
  1.5058 +   StartEntry();
  1.5059 +   ASSERT_TRUE(handler.RegisterRule(entry_address, 0, 1));
  1.5060 +   ASSERT_TRUE(handler.End());
  1.5061 +   CheckEntry();
  1.5062 +   Module::RuleMap expected_initial;
  1.5063 +-  expected_initial[".ra"] = "reg2";
  1.5064 +-  expected_initial["reg0"] = "reg1";
  1.5065 ++  expected_initial[".ra"] = Module::Expr("reg2", 0, false);
  1.5066 ++  expected_initial["reg0"] = Module::Expr("reg1", 0, false);
  1.5067 +   EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial));
  1.5068 +   EXPECT_EQ(0U, entries[0]->rule_changes.size());
  1.5069 + }
  1.5070 + 
  1.5071 + TEST_F(Rule, DefaultReturnAddressRuleOverride) {
  1.5072 +   return_reg = 2;
  1.5073 +   StartEntry();
  1.5074 +   ASSERT_TRUE(handler.RegisterRule(entry_address, return_reg, 1));
  1.5075 +   ASSERT_TRUE(handler.End());
  1.5076 +   CheckEntry();
  1.5077 +   Module::RuleMap expected_initial;
  1.5078 +-  expected_initial[".ra"] = "reg1";
  1.5079 ++  expected_initial[".ra"] = Module::Expr("reg1", 0, false);
  1.5080 +   EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial));
  1.5081 +   EXPECT_EQ(0U, entries[0]->rule_changes.size());
  1.5082 + }
  1.5083 + 
  1.5084 + TEST_F(Rule, DefaultReturnAddressRuleLater) {
  1.5085 +   return_reg = 2;
  1.5086 +   StartEntry();
  1.5087 +   ASSERT_TRUE(handler.RegisterRule(entry_address + 1, return_reg, 1));
  1.5088 +   ASSERT_TRUE(handler.End());
  1.5089 +   CheckEntry();
  1.5090 +   Module::RuleMap expected_initial;
  1.5091 +-  expected_initial[".ra"] = "reg2";
  1.5092 ++  expected_initial[".ra"] = Module::Expr("reg2", 0, false);
  1.5093 +   EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial));
  1.5094 +   Module::RuleChangeMap expected_changes;
  1.5095 +-  expected_changes[entry_address + 1][".ra"] = "reg1";
  1.5096 ++  expected_changes[entry_address + 1][".ra"] =
  1.5097 ++      Module::Expr("reg1", 0, false);
  1.5098 +   EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes));
  1.5099 + }
  1.5100 + 
  1.5101 + TEST(RegisterNames, I386) {
  1.5102 +   vector<string> names = DwarfCFIToModule::RegisterNames::I386();
  1.5103 + 
  1.5104 +   EXPECT_EQ("$eax", names[0]);
  1.5105 +   EXPECT_EQ("$ecx", names[1]);
  1.5106 +diff --git a/src/common/module.cc b/src/common/module.cc
  1.5107 +--- a/src/common/module.cc
  1.5108 ++++ b/src/common/module.cc
  1.5109 +@@ -251,16 +251,34 @@
  1.5110 + }
  1.5111 + 
  1.5112 + bool Module::ReportError() {
  1.5113 +   fprintf(stderr, "error writing symbol file: %s\n",
  1.5114 +           strerror(errno));
  1.5115 +   return false;
  1.5116 + }
  1.5117 + 
  1.5118 ++std::ostream& operator<<(std::ostream& stream, const Module::Expr& expr) {
  1.5119 ++  assert(!expr.invalid());
  1.5120 ++  switch (expr.how_) {
  1.5121 ++    case Module::kExprSimple:
  1.5122 ++      stream << expr.ident_ << " " << expr.offset_ << " +";
  1.5123 ++      break;
  1.5124 ++    case Module::kExprSimpleMem:
  1.5125 ++      stream << expr.ident_ << " " << expr.offset_ << " + ^";
  1.5126 ++      break;
  1.5127 ++    case Module::kExprPostfix:
  1.5128 ++      stream << expr.postfix_; break;
  1.5129 ++    case Module::kExprInvalid:
  1.5130 ++    default:
  1.5131 ++      break;
  1.5132 ++  }
  1.5133 ++  return stream;
  1.5134 ++}
  1.5135 ++
  1.5136 + bool Module::WriteRuleMap(const RuleMap &rule_map, std::ostream &stream) {
  1.5137 +   for (RuleMap::const_iterator it = rule_map.begin();
  1.5138 +        it != rule_map.end(); ++it) {
  1.5139 +     if (it != rule_map.begin())
  1.5140 +       stream << ' ';
  1.5141 +     stream << it->first << ": " << it->second;
  1.5142 +   }
  1.5143 +   return stream.good();
  1.5144 +diff --git a/src/common/module.h b/src/common/module.h
  1.5145 +--- a/src/common/module.h
  1.5146 ++++ b/src/common/module.h
  1.5147 +@@ -119,21 +119,81 @@
  1.5148 +   };
  1.5149 + 
  1.5150 +   // An exported symbol.
  1.5151 +   struct Extern {
  1.5152 +     Address address;
  1.5153 +     string name;
  1.5154 +   };
  1.5155 + 
  1.5156 +-  // A map from register names to postfix expressions that recover
  1.5157 +-  // their their values. This can represent a complete set of rules to
  1.5158 ++  // Representation of an expression.  This can either be a postfix
  1.5159 ++  // expression, in which case it is stored as a string, or a simple
  1.5160 ++  // expression of the form (identifier + imm) or *(identifier + imm).
  1.5161 ++  // It can also be invalid (denoting "no value").
  1.5162 ++  enum ExprHow {
  1.5163 ++    kExprInvalid = 1,
  1.5164 ++    kExprPostfix,
  1.5165 ++    kExprSimple,
  1.5166 ++    kExprSimpleMem
  1.5167 ++  };
  1.5168 ++  struct Expr {
  1.5169 ++    // Construct a simple-form expression
  1.5170 ++    Expr(string ident, long offset, bool deref) {
  1.5171 ++      if (ident.empty()) {
  1.5172 ++        Expr();
  1.5173 ++      } else {
  1.5174 ++        postfix_ = "";
  1.5175 ++        ident_ = ident;
  1.5176 ++        offset_ = offset;
  1.5177 ++        how_ = deref ? kExprSimpleMem : kExprSimple;
  1.5178 ++      }
  1.5179 ++    }
  1.5180 ++    // Construct an expression from a postfix string
  1.5181 ++    Expr(string postfix) {
  1.5182 ++      if (postfix.empty()) {
  1.5183 ++        Expr();
  1.5184 ++      } else {
  1.5185 ++        postfix_ = postfix;
  1.5186 ++        ident_ = "";
  1.5187 ++        offset_ = 0;
  1.5188 ++        how_ = kExprPostfix;
  1.5189 ++      }
  1.5190 ++    }
  1.5191 ++    // Construct an invalid expression
  1.5192 ++    Expr() {
  1.5193 ++      postfix_ = "";
  1.5194 ++      ident_ = "";
  1.5195 ++      offset_ = 0;
  1.5196 ++      how_ = kExprInvalid;
  1.5197 ++    }
  1.5198 ++    bool invalid() const { return how_ == kExprInvalid; }
  1.5199 ++    bool operator==(const Expr& other) const {
  1.5200 ++      return how_ == other.how_ &&
  1.5201 ++          ident_ == other.ident_ &&
  1.5202 ++          offset_ == other.offset_ &&
  1.5203 ++          postfix_ == other.postfix_;
  1.5204 ++    }
  1.5205 ++
  1.5206 ++    // The identifier that gives the starting value for simple expressions.
  1.5207 ++    string  ident_;
  1.5208 ++    // The offset to add for simple expressions.
  1.5209 ++    long    offset_;
  1.5210 ++    // The Postfix expression string to evaluate for non-simple expressions.
  1.5211 ++    string  postfix_;
  1.5212 ++    // The operation expressed by this expression.
  1.5213 ++    ExprHow how_;
  1.5214 ++
  1.5215 ++    friend std::ostream& operator<<(std::ostream& stream, const Expr& expr);
  1.5216 ++  };
  1.5217 ++
  1.5218 ++  // A map from register names to expressions that recover
  1.5219 ++  // their values. This can represent a complete set of rules to
  1.5220 +   // follow at some address, or a set of changes to be applied to an
  1.5221 +   // extant set of rules.
  1.5222 +-  typedef map<string, string> RuleMap;
  1.5223 ++  typedef map<string, Expr> RuleMap;
  1.5224 + 
  1.5225 +   // A map from addresses to RuleMaps, representing changes that take
  1.5226 +   // effect at given addresses.
  1.5227 +   typedef map<Address, RuleMap> RuleChangeMap;
  1.5228 + 
  1.5229 +   // A range of 'STACK CFI' stack walking information. An instance of
  1.5230 +   // this structure corresponds to a 'STACK CFI INIT' record and the
  1.5231 +   // subsequent 'STACK CFI' records that fall within its range.
  1.5232 +diff --git a/src/common/module_unittest.cc b/src/common/module_unittest.cc
  1.5233 +--- a/src/common/module_unittest.cc
  1.5234 ++++ b/src/common/module_unittest.cc
  1.5235 +@@ -125,21 +125,21 @@
  1.5236 +   function->lines.push_back(line1);
  1.5237 + 
  1.5238 +   m.AddFunction(function);
  1.5239 + 
  1.5240 +   // Some stack information.
  1.5241 +   Module::StackFrameEntry *entry = new Module::StackFrameEntry();
  1.5242 +   entry->address = 0x30f9e5c83323973dULL;
  1.5243 +   entry->size = 0x49fc9ca7c7c13dc2ULL;
  1.5244 +-  entry->initial_rules[".cfa"] = "he was a handsome man";
  1.5245 +-  entry->initial_rules["and"] = "what i want to know is";
  1.5246 ++  entry->initial_rules[".cfa"] = Module::Expr("he was a handsome man");
  1.5247 ++  entry->initial_rules["and"] = Module::Expr("what i want to know is");
  1.5248 +   entry->rule_changes[0x30f9e5c83323973eULL]["how"] =
  1.5249 +-    "do you like your blueeyed boy";
  1.5250 +-  entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = "Death";
  1.5251 ++    Module::Expr("do you like your blueeyed boy");
  1.5252 ++  entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = Module::Expr("Death");
  1.5253 +   m.AddStackFrameEntry(entry);
  1.5254 + 
  1.5255 +   // Set the load address.  Doing this after adding all the data to
  1.5256 +   // the module must work fine.
  1.5257 +   m.SetLoadAddress(0x2ab698b0b6407073LL);
  1.5258 + 
  1.5259 +   m.Write(s, ALL_SYMBOL_DATA);
  1.5260 +   string contents = s.str();
  1.5261 +@@ -229,21 +229,21 @@
  1.5262 +   function->lines.push_back(line1);
  1.5263 + 
  1.5264 +   m.AddFunction(function);
  1.5265 + 
  1.5266 +   // Some stack information.
  1.5267 +   Module::StackFrameEntry *entry = new Module::StackFrameEntry();
  1.5268 +   entry->address = 0x30f9e5c83323973dULL;
  1.5269 +   entry->size = 0x49fc9ca7c7c13dc2ULL;
  1.5270 +-  entry->initial_rules[".cfa"] = "he was a handsome man";
  1.5271 +-  entry->initial_rules["and"] = "what i want to know is";
  1.5272 ++  entry->initial_rules[".cfa"] = Module::Expr("he was a handsome man");
  1.5273 ++  entry->initial_rules["and"] = Module::Expr("what i want to know is");
  1.5274 +   entry->rule_changes[0x30f9e5c83323973eULL]["how"] =
  1.5275 +-    "do you like your blueeyed boy";
  1.5276 +-  entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = "Death";
  1.5277 ++    Module::Expr("do you like your blueeyed boy");
  1.5278 ++  entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = Module::Expr("Death");
  1.5279 +   m.AddStackFrameEntry(entry);
  1.5280 + 
  1.5281 +   // Set the load address.  Doing this after adding all the data to
  1.5282 +   // the module must work fine.
  1.5283 +   m.SetLoadAddress(0x2ab698b0b6407073LL);
  1.5284 + 
  1.5285 +   m.Write(s, NO_CFI);
  1.5286 +   string contents = s.str();
  1.5287 +@@ -305,34 +305,34 @@
  1.5288 +   entry1->address = 0xddb5f41285aa7757ULL;
  1.5289 +   entry1->size = 0x1486493370dc5073ULL;
  1.5290 +   m.AddStackFrameEntry(entry1);
  1.5291 + 
  1.5292 +   // Second STACK CFI entry, with initial rules but no deltas.
  1.5293 +   Module::StackFrameEntry *entry2 = new Module::StackFrameEntry();
  1.5294 +   entry2->address = 0x8064f3af5e067e38ULL;
  1.5295 +   entry2->size = 0x0de2a5ee55509407ULL;
  1.5296 +-  entry2->initial_rules[".cfa"] = "I think that I shall never see";
  1.5297 +-  entry2->initial_rules["stromboli"] = "a poem lovely as a tree";
  1.5298 +-  entry2->initial_rules["cannoli"] = "a tree whose hungry mouth is prest";
  1.5299 ++  entry2->initial_rules[".cfa"] = Module::Expr("I think that I shall never see");
  1.5300 ++  entry2->initial_rules["stromboli"] = Module::Expr("a poem lovely as a tree");
  1.5301 ++  entry2->initial_rules["cannoli"] = Module::Expr("a tree whose hungry mouth is prest");
  1.5302 +   m.AddStackFrameEntry(entry2);
  1.5303 + 
  1.5304 +   // Third STACK CFI entry, with initial rules and deltas.
  1.5305 +   Module::StackFrameEntry *entry3 = new Module::StackFrameEntry();
  1.5306 +   entry3->address = 0x5e8d0db0a7075c6cULL;
  1.5307 +   entry3->size = 0x1c7edb12a7aea229ULL;
  1.5308 +-  entry3->initial_rules[".cfa"] = "Whose woods are these";
  1.5309 ++  entry3->initial_rules[".cfa"] = Module::Expr("Whose woods are these");
  1.5310 +   entry3->rule_changes[0x47ceb0f63c269d7fULL]["calzone"] =
  1.5311 +-    "the village though";
  1.5312 ++    Module::Expr("the village though");
  1.5313 +   entry3->rule_changes[0x47ceb0f63c269d7fULL]["cannoli"] =
  1.5314 +-    "he will not see me stopping here";
  1.5315 ++    Module::Expr("he will not see me stopping here");
  1.5316 +   entry3->rule_changes[0x36682fad3763ffffULL]["stromboli"] =
  1.5317 +-    "his house is in";
  1.5318 ++    Module::Expr("his house is in");
  1.5319 +   entry3->rule_changes[0x36682fad3763ffffULL][".cfa"] =
  1.5320 +-    "I think I know";
  1.5321 ++    Module::Expr("I think I know");
  1.5322 +   m.AddStackFrameEntry(entry3);
  1.5323 + 
  1.5324 +   // Check that Write writes STACK CFI records properly.
  1.5325 +   m.Write(s, ALL_SYMBOL_DATA);
  1.5326 +   string contents = s.str();
  1.5327 +   EXPECT_STREQ("MODULE os-name architecture id-string name with spaces\n"
  1.5328 +                "STACK CFI INIT 5e8d0db0a7075c6c 1c7edb12a7aea229"
  1.5329 +                " .cfa: Whose woods are these\n"
  1.5330 +@@ -352,33 +352,33 @@
  1.5331 +   // Check that GetStackFrameEntries works.
  1.5332 +   vector<Module::StackFrameEntry *> entries;
  1.5333 +   m.GetStackFrameEntries(&entries);
  1.5334 +   ASSERT_EQ(3U, entries.size());
  1.5335 +   // Check first entry.
  1.5336 +   EXPECT_EQ(0x5e8d0db0a7075c6cULL, entries[0]->address);
  1.5337 +   EXPECT_EQ(0x1c7edb12a7aea229ULL, entries[0]->size);
  1.5338 +   Module::RuleMap entry1_initial;
  1.5339 +-  entry1_initial[".cfa"] = "Whose woods are these";
  1.5340 ++  entry1_initial[".cfa"] = Module::Expr("Whose woods are these");
  1.5341 +   EXPECT_THAT(entries[0]->initial_rules, ContainerEq(entry1_initial));
  1.5342 +   Module::RuleChangeMap entry1_changes;
  1.5343 +-  entry1_changes[0x36682fad3763ffffULL][".cfa"] = "I think I know";
  1.5344 +-  entry1_changes[0x36682fad3763ffffULL]["stromboli"] = "his house is in";
  1.5345 +-  entry1_changes[0x47ceb0f63c269d7fULL]["calzone"] = "the village though";
  1.5346 ++  entry1_changes[0x36682fad3763ffffULL][".cfa"] = Module::Expr("I think I know");
  1.5347 ++  entry1_changes[0x36682fad3763ffffULL]["stromboli"] = Module::Expr("his house is in");
  1.5348 ++  entry1_changes[0x47ceb0f63c269d7fULL]["calzone"] = Module::Expr("the village though");
  1.5349 +   entry1_changes[0x47ceb0f63c269d7fULL]["cannoli"] =
  1.5350 +-    "he will not see me stopping here";
  1.5351 ++    Module::Expr("he will not see me stopping here");
  1.5352 +   EXPECT_THAT(entries[0]->rule_changes, ContainerEq(entry1_changes));
  1.5353 +   // Check second entry.
  1.5354 +   EXPECT_EQ(0x8064f3af5e067e38ULL, entries[1]->address);
  1.5355 +   EXPECT_EQ(0x0de2a5ee55509407ULL, entries[1]->size);
  1.5356 +   ASSERT_EQ(3U, entries[1]->initial_rules.size());
  1.5357 +   Module::RuleMap entry2_initial;
  1.5358 +-  entry2_initial[".cfa"] = "I think that I shall never see";
  1.5359 +-  entry2_initial["stromboli"] = "a poem lovely as a tree";
  1.5360 +-  entry2_initial["cannoli"] = "a tree whose hungry mouth is prest";
  1.5361 ++  entry2_initial[".cfa"] = Module::Expr("I think that I shall never see");
  1.5362 ++  entry2_initial["stromboli"] = Module::Expr("a poem lovely as a tree");
  1.5363 ++  entry2_initial["cannoli"] = Module::Expr("a tree whose hungry mouth is prest");
  1.5364 +   EXPECT_THAT(entries[1]->initial_rules, ContainerEq(entry2_initial));
  1.5365 +   ASSERT_EQ(0U, entries[1]->rule_changes.size());
  1.5366 +   // Check third entry.
  1.5367 +   EXPECT_EQ(0xddb5f41285aa7757ULL, entries[2]->address);
  1.5368 +   EXPECT_EQ(0x1486493370dc5073ULL, entries[2]->size);
  1.5369 +   ASSERT_EQ(0U, entries[2]->initial_rules.size());
  1.5370 +   ASSERT_EQ(0U, entries[2]->rule_changes.size());
  1.5371 + }
  1.5372 +@@ -585,34 +585,34 @@
  1.5373 +   entry1->address = 0x2000;
  1.5374 +   entry1->size = 0x900;
  1.5375 +   m.AddStackFrameEntry(entry1);
  1.5376 + 
  1.5377 +   // Second STACK CFI entry, with initial rules but no deltas.
  1.5378 +   Module::StackFrameEntry *entry2 = new Module::StackFrameEntry();
  1.5379 +   entry2->address = 0x3000;
  1.5380 +   entry2->size = 0x900;
  1.5381 +-  entry2->initial_rules[".cfa"] = "I think that I shall never see";
  1.5382 +-  entry2->initial_rules["stromboli"] = "a poem lovely as a tree";
  1.5383 +-  entry2->initial_rules["cannoli"] = "a tree whose hungry mouth is prest";
  1.5384 ++  entry2->initial_rules[".cfa"] = Module::Expr("I think that I shall never see");
  1.5385 ++  entry2->initial_rules["stromboli"] = Module::Expr("a poem lovely as a tree");
  1.5386 ++  entry2->initial_rules["cannoli"] = Module::Expr("a tree whose hungry mouth is prest");
  1.5387 +   m.AddStackFrameEntry(entry2);
  1.5388 + 
  1.5389 +   // Third STACK CFI entry, with initial rules and deltas.
  1.5390 +   Module::StackFrameEntry *entry3 = new Module::StackFrameEntry();
  1.5391 +   entry3->address = 0x1000;
  1.5392 +   entry3->size = 0x900;
  1.5393 +-  entry3->initial_rules[".cfa"] = "Whose woods are these";
  1.5394 ++  entry3->initial_rules[".cfa"] = Module::Expr("Whose woods are these");
  1.5395 +   entry3->rule_changes[0x47ceb0f63c269d7fULL]["calzone"] =
  1.5396 +-    "the village though";
  1.5397 ++    Module::Expr("the village though");
  1.5398 +   entry3->rule_changes[0x47ceb0f63c269d7fULL]["cannoli"] =
  1.5399 +-    "he will not see me stopping here";
  1.5400 ++    Module::Expr("he will not see me stopping here");
  1.5401 +   entry3->rule_changes[0x36682fad3763ffffULL]["stromboli"] =
  1.5402 +-    "his house is in";
  1.5403 ++    Module::Expr("his house is in");
  1.5404 +   entry3->rule_changes[0x36682fad3763ffffULL][".cfa"] =
  1.5405 +-    "I think I know";
  1.5406 ++    Module::Expr("I think I know");
  1.5407 +   m.AddStackFrameEntry(entry3);
  1.5408 + 
  1.5409 +   Module::StackFrameEntry* s = m.FindStackFrameEntryByAddress(0x1000);
  1.5410 +   EXPECT_EQ(entry3, s);
  1.5411 +   s = m.FindStackFrameEntryByAddress(0x18FF);
  1.5412 +   EXPECT_EQ(entry3, s);
  1.5413 + 
  1.5414 +   s = m.FindStackFrameEntryByAddress(0x1900);
  1.5415 +diff --git a/src/processor/cfi_frame_info.cc b/src/processor/cfi_frame_info.cc
  1.5416 +--- a/src/processor/cfi_frame_info.cc
  1.5417 ++++ b/src/processor/cfi_frame_info.cc
  1.5418 +@@ -48,17 +48,17 @@
  1.5419 + #endif
  1.5420 + 
  1.5421 + template<typename V>
  1.5422 + bool CFIFrameInfo::FindCallerRegs(const RegisterValueMap<V> &registers,
  1.5423 +                                   const MemoryRegion &memory,
  1.5424 +                                   RegisterValueMap<V> *caller_registers) const {
  1.5425 +   // If there are not rules for both .ra and .cfa in effect at this address,
  1.5426 +   // don't use this CFI data for stack walking.
  1.5427 +-  if (cfa_rule_.empty() || ra_rule_.empty())
  1.5428 ++  if (cfa_rule_.invalid() || ra_rule_.invalid())
  1.5429 +     return false;
  1.5430 + 
  1.5431 +   RegisterValueMap<V> working;
  1.5432 +   PostfixEvaluator<V> evaluator(&working, &memory);
  1.5433 + 
  1.5434 +   caller_registers->clear();
  1.5435 + 
  1.5436 +   // First, compute the CFA.
  1.5437 +@@ -99,20 +99,20 @@
  1.5438 + template bool CFIFrameInfo::FindCallerRegs<uint64_t>(
  1.5439 +     const RegisterValueMap<uint64_t> &registers,
  1.5440 +     const MemoryRegion &memory,
  1.5441 +     RegisterValueMap<uint64_t> *caller_registers) const;
  1.5442 + 
  1.5443 + string CFIFrameInfo::Serialize() const {
  1.5444 +   std::ostringstream stream;
  1.5445 + 
  1.5446 +-  if (!cfa_rule_.empty()) {
  1.5447 ++  if (!cfa_rule_.invalid()) {
  1.5448 +     stream << ".cfa: " << cfa_rule_;
  1.5449 +   }
  1.5450 +-  if (!ra_rule_.empty()) {
  1.5451 ++  if (!ra_rule_.invalid()) {
  1.5452 +     if (static_cast<std::streamoff>(stream.tellp()) != 0)
  1.5453 +       stream << " ";
  1.5454 +     stream << ".ra: " << ra_rule_;
  1.5455 +   }
  1.5456 +   for (RuleMap::const_iterator iter = register_rules_.begin();
  1.5457 +        iter != register_rules_.end();
  1.5458 +        ++iter) {
  1.5459 +     if (static_cast<std::streamoff>(stream.tellp()) != 0)
  1.5460 +@@ -166,21 +166,22 @@
  1.5461 +   if (name_.empty() || expression_.empty()) return false;
  1.5462 +   if (name_ == ".cfa") handler_->CFARule(expression_);
  1.5463 +   else if (name_ == ".ra") handler_->RARule(expression_);
  1.5464 +   else handler_->RegisterRule(name_, expression_);
  1.5465 +   return true;
  1.5466 + }
  1.5467 + 
  1.5468 + void CFIFrameInfoParseHandler::CFARule(const string &expression) {
  1.5469 +-  frame_info_->SetCFARule(expression);
  1.5470 ++  // 'expression' is a postfix expression string.
  1.5471 ++  frame_info_->SetCFARule(Module::Expr(expression));
  1.5472 + }
  1.5473 + 
  1.5474 + void CFIFrameInfoParseHandler::RARule(const string &expression) {
  1.5475 +-  frame_info_->SetRARule(expression);
  1.5476 ++  frame_info_->SetRARule(Module::Expr(expression));
  1.5477 + }
  1.5478 + 
  1.5479 + void CFIFrameInfoParseHandler::RegisterRule(const string &name,
  1.5480 +                                             const string &expression) {
  1.5481 +-  frame_info_->SetRegisterRule(name, expression);
  1.5482 ++  frame_info_->SetRegisterRule(name, Module::Expr(expression));
  1.5483 + }
  1.5484 + 
  1.5485 + } // namespace google_breakpad
  1.5486 +diff --git a/src/processor/cfi_frame_info.h b/src/processor/cfi_frame_info.h
  1.5487 +--- a/src/processor/cfi_frame_info.h
  1.5488 ++++ b/src/processor/cfi_frame_info.h
  1.5489 +@@ -38,16 +38,17 @@
  1.5490 + #ifndef PROCESSOR_CFI_FRAME_INFO_H_
  1.5491 + #define PROCESSOR_CFI_FRAME_INFO_H_
  1.5492 + 
  1.5493 + #include <map>
  1.5494 + #include <string>
  1.5495 + 
  1.5496 + #include "common/using_std_string.h"
  1.5497 + #include "google_breakpad/common/breakpad_types.h"
  1.5498 ++#include "common/module.h"
  1.5499 + 
  1.5500 + namespace google_breakpad {
  1.5501 + 
  1.5502 + using std::map;
  1.5503 + 
  1.5504 + class MemoryRegion;
  1.5505 + 
  1.5506 + // A set of rules for recovering the calling frame's registers'
  1.5507 +@@ -61,26 +62,27 @@
  1.5508 + // INIT' record that covers that instruction, and then apply the
  1.5509 + // changes given by the 'STACK CFI' records up to our instruction's
  1.5510 + // address. Then, use the FindCallerRegs member function to apply the
  1.5511 + // rules to the callee frame's register values, yielding the caller
  1.5512 + // frame's register values.
  1.5513 + class CFIFrameInfo {
  1.5514 +  public:
  1.5515 +   // A map from register names onto values.
  1.5516 +-  template<typename ValueType> class RegisterValueMap: 
  1.5517 ++  template<typename ValueType> class RegisterValueMap:
  1.5518 +     public map<string, ValueType> { };
  1.5519 + 
  1.5520 +   // Set the expression for computing a call frame address, return
  1.5521 +   // address, or register's value. At least the CFA rule and the RA
  1.5522 +   // rule must be set before calling FindCallerRegs.
  1.5523 +-  void SetCFARule(const string &expression) { cfa_rule_ = expression; }
  1.5524 +-  void SetRARule(const string &expression)  { ra_rule_ = expression; }
  1.5525 +-  void SetRegisterRule(const string &register_name, const string &expression) {
  1.5526 +-    register_rules_[register_name] = expression;
  1.5527 ++  void SetCFARule(const Module::Expr& rule) { cfa_rule_ = rule; }
  1.5528 ++  void SetRARule(const Module::Expr& rule)  { ra_rule_ = rule; }
  1.5529 ++  void SetRegisterRule(const string& register_name,
  1.5530 ++                       const Module::Expr& rule) {
  1.5531 ++    register_rules_[register_name] = rule;
  1.5532 +   }
  1.5533 + 
  1.5534 +   // Compute the values of the calling frame's registers, according to
  1.5535 +   // this rule set. Use ValueType in expression evaluation; this
  1.5536 +   // should be uint32_t on machines with 32-bit addresses, or
  1.5537 +   // uint64_t on machines with 64-bit addresses.
  1.5538 +   //
  1.5539 +   // Return true on success, false otherwise.
  1.5540 +@@ -101,37 +103,33 @@
  1.5541 +                       RegisterValueMap<ValueType> *caller_registers) const;
  1.5542 + 
  1.5543 +   // Serialize the rules in this object into a string in the format
  1.5544 +   // of STACK CFI records.
  1.5545 +   string Serialize() const;
  1.5546 + 
  1.5547 +  private:
  1.5548 + 
  1.5549 +-  // A map from register names onto evaluation rules. 
  1.5550 +-  typedef map<string, string> RuleMap;
  1.5551 ++  // A map from register names onto evaluation rules.
  1.5552 ++  typedef map<string, Module::Expr> RuleMap;
  1.5553 + 
  1.5554 +-  // In this type, a "postfix expression" is an expression of the sort
  1.5555 +-  // interpreted by google_breakpad::PostfixEvaluator.
  1.5556 +-
  1.5557 +-  // A postfix expression for computing the current frame's CFA (call
  1.5558 ++  // An expression for computing the current frame's CFA (call
  1.5559 +   // frame address). The CFA is a reference address for the frame that
  1.5560 +   // remains unchanged throughout the frame's lifetime. You should
  1.5561 +   // evaluate this expression with a dictionary initially populated
  1.5562 +   // with the values of the current frame's known registers.
  1.5563 +-  string cfa_rule_;
  1.5564 ++  Module::Expr cfa_rule_;
  1.5565 + 
  1.5566 +   // The following expressions should be evaluated with a dictionary
  1.5567 +   // initially populated with the values of the current frame's known
  1.5568 +   // registers, and with ".cfa" set to the result of evaluating the
  1.5569 +   // cfa_rule expression, above.
  1.5570 + 
  1.5571 +-  // A postfix expression for computing the current frame's return
  1.5572 +-  // address. 
  1.5573 +-  string ra_rule_;
  1.5574 ++  // An expression for computing the current frame's return address.
  1.5575 ++  Module::Expr ra_rule_;
  1.5576 + 
  1.5577 +   // For a register named REG, rules[REG] is a postfix expression
  1.5578 +   // which leaves the value of REG in the calling frame on the top of
  1.5579 +   // the stack. You should evaluate this expression
  1.5580 +   RuleMap register_rules_;
  1.5581 + };
  1.5582 + 
  1.5583 + // A parser for STACK CFI-style rule sets.
  1.5584 +diff --git a/src/processor/cfi_frame_info_unittest.cc b/src/processor/cfi_frame_info_unittest.cc
  1.5585 +--- a/src/processor/cfi_frame_info_unittest.cc
  1.5586 ++++ b/src/processor/cfi_frame_info_unittest.cc
  1.5587 +@@ -30,24 +30,26 @@
  1.5588 + // Original author: Jim Blandy <jimb@mozilla.com> <jimb@red-bean.com>
  1.5589 + 
  1.5590 + // cfi_frame_info_unittest.cc: Unit tests for CFIFrameInfo,
  1.5591 + // CFIRuleParser, CFIFrameInfoParseHandler, and SimpleCFIWalker.
  1.5592 + 
  1.5593 + #include <string.h>
  1.5594 + 
  1.5595 + #include "breakpad_googletest_includes.h"
  1.5596 ++#include "common/module.h"
  1.5597 + #include "common/using_std_string.h"
  1.5598 + #include "processor/cfi_frame_info.h"
  1.5599 + #include "google_breakpad/processor/memory_region.h"
  1.5600 + 
  1.5601 + using google_breakpad::CFIFrameInfo;
  1.5602 + using google_breakpad::CFIFrameInfoParseHandler;
  1.5603 + using google_breakpad::CFIRuleParser;
  1.5604 + using google_breakpad::MemoryRegion;
  1.5605 ++using google_breakpad::Module;
  1.5606 + using google_breakpad::SimpleCFIWalker;
  1.5607 + using testing::_;
  1.5608 + using testing::A;
  1.5609 + using testing::AtMost;
  1.5610 + using testing::DoAll;
  1.5611 + using testing::Return;
  1.5612 + using testing::SetArgumentPointee;
  1.5613 + using testing::Test;
  1.5614 +@@ -81,56 +83,56 @@
  1.5615 + };
  1.5616 + 
  1.5617 + class Simple: public CFIFixture, public Test { };
  1.5618 + 
  1.5619 + // FindCallerRegs should fail if no .cfa rule is provided.
  1.5620 + TEST_F(Simple, NoCFA) {
  1.5621 +   ExpectNoMemoryReferences();
  1.5622 + 
  1.5623 +-  cfi.SetRARule("0");
  1.5624 ++  cfi.SetRARule(Module::Expr("0"));
  1.5625 +   ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  1.5626 +                                              &caller_registers));
  1.5627 +   ASSERT_EQ(".ra: 0", cfi.Serialize());
  1.5628 + }
  1.5629 + 
  1.5630 + // FindCallerRegs should fail if no .ra rule is provided.
  1.5631 + TEST_F(Simple, NoRA) {
  1.5632 +   ExpectNoMemoryReferences();
  1.5633 + 
  1.5634 +-  cfi.SetCFARule("0");
  1.5635 ++  cfi.SetCFARule(Module::Expr("0"));
  1.5636 +   ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  1.5637 +                                              &caller_registers));
  1.5638 +   ASSERT_EQ(".cfa: 0", cfi.Serialize());
  1.5639 + }
  1.5640 + 
  1.5641 + TEST_F(Simple, SetCFAAndRARule) {
  1.5642 +   ExpectNoMemoryReferences();
  1.5643 + 
  1.5644 +-  cfi.SetCFARule("330903416631436410");
  1.5645 +-  cfi.SetRARule("5870666104170902211");
  1.5646 ++  cfi.SetCFARule(Module::Expr("330903416631436410"));
  1.5647 ++  cfi.SetRARule(Module::Expr("5870666104170902211"));
  1.5648 +   ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  1.5649 +                                             &caller_registers));
  1.5650 +   ASSERT_EQ(2U, caller_registers.size());
  1.5651 +   ASSERT_EQ(330903416631436410ULL, caller_registers[".cfa"]);
  1.5652 +   ASSERT_EQ(5870666104170902211ULL, caller_registers[".ra"]);
  1.5653 + 
  1.5654 +   ASSERT_EQ(".cfa: 330903416631436410 .ra: 5870666104170902211",
  1.5655 +             cfi.Serialize());
  1.5656 + }
  1.5657 + 
  1.5658 + TEST_F(Simple, SetManyRules) {
  1.5659 +   ExpectNoMemoryReferences();
  1.5660 + 
  1.5661 +-  cfi.SetCFARule("$temp1 68737028 = $temp2 61072337 = $temp1 $temp2 -");
  1.5662 +-  cfi.SetRARule(".cfa 99804755 +");
  1.5663 +-  cfi.SetRegisterRule("register1", ".cfa 54370437 *");
  1.5664 +-  cfi.SetRegisterRule("vodkathumbscrewingly", "24076308 .cfa +");
  1.5665 +-  cfi.SetRegisterRule("pubvexingfjordschmaltzy", ".cfa 29801007 -");
  1.5666 +-  cfi.SetRegisterRule("uncopyrightables", "92642917 .cfa /");
  1.5667 ++  cfi.SetCFARule(Module::Expr("$temp1 68737028 = $temp2 61072337 = $temp1 $temp2 -"));
  1.5668 ++  cfi.SetRARule(Module::Expr(".cfa 99804755 +"));
  1.5669 ++  cfi.SetRegisterRule("register1", Module::Expr(".cfa 54370437 *"));
  1.5670 ++  cfi.SetRegisterRule("vodkathumbscrewingly", Module::Expr("24076308 .cfa +"));
  1.5671 ++  cfi.SetRegisterRule("pubvexingfjordschmaltzy", Module::Expr(".cfa 29801007 -"));
  1.5672 ++  cfi.SetRegisterRule("uncopyrightables", Module::Expr("92642917 .cfa /"));
  1.5673 +   ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  1.5674 +                                             &caller_registers));
  1.5675 +   ASSERT_EQ(6U, caller_registers.size());
  1.5676 +   ASSERT_EQ(7664691U,           caller_registers[".cfa"]);
  1.5677 +   ASSERT_EQ(107469446U,         caller_registers[".ra"]);
  1.5678 +   ASSERT_EQ(416732599139967ULL, caller_registers["register1"]);
  1.5679 +   ASSERT_EQ(31740999U,          caller_registers["vodkathumbscrewingly"]);
  1.5680 +   ASSERT_EQ(-22136316ULL,       caller_registers["pubvexingfjordschmaltzy"]);
  1.5681 +@@ -142,154 +144,154 @@
  1.5682 +             "uncopyrightables: 92642917 .cfa / "
  1.5683 +             "vodkathumbscrewingly: 24076308 .cfa +",
  1.5684 +             cfi.Serialize());
  1.5685 + }
  1.5686 + 
  1.5687 + TEST_F(Simple, RulesOverride) {
  1.5688 +   ExpectNoMemoryReferences();
  1.5689 + 
  1.5690 +-  cfi.SetCFARule("330903416631436410");
  1.5691 +-  cfi.SetRARule("5870666104170902211");
  1.5692 +-  cfi.SetCFARule("2828089117179001");
  1.5693 ++  cfi.SetCFARule(Module::Expr("330903416631436410"));
  1.5694 ++  cfi.SetRARule(Module::Expr("5870666104170902211"));
  1.5695 ++  cfi.SetCFARule(Module::Expr("2828089117179001"));
  1.5696 +   ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  1.5697 +                                             &caller_registers));
  1.5698 +   ASSERT_EQ(2U, caller_registers.size());
  1.5699 +   ASSERT_EQ(2828089117179001ULL, caller_registers[".cfa"]);
  1.5700 +   ASSERT_EQ(5870666104170902211ULL, caller_registers[".ra"]);
  1.5701 +   ASSERT_EQ(".cfa: 2828089117179001 .ra: 5870666104170902211",
  1.5702 +             cfi.Serialize());
  1.5703 + }
  1.5704 + 
  1.5705 + class Scope: public CFIFixture, public Test { };
  1.5706 + 
  1.5707 + // There should be no value for .cfa in scope when evaluating the CFA rule.
  1.5708 + TEST_F(Scope, CFALacksCFA) {
  1.5709 +   ExpectNoMemoryReferences();
  1.5710 + 
  1.5711 +-  cfi.SetCFARule(".cfa");
  1.5712 +-  cfi.SetRARule("0");
  1.5713 ++  cfi.SetCFARule(Module::Expr(".cfa"));
  1.5714 ++  cfi.SetRARule(Module::Expr("0"));
  1.5715 +   ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  1.5716 +                                              &caller_registers));
  1.5717 + }
  1.5718 + 
  1.5719 + // There should be no value for .ra in scope when evaluating the CFA rule.
  1.5720 + TEST_F(Scope, CFALacksRA) {
  1.5721 +   ExpectNoMemoryReferences();
  1.5722 + 
  1.5723 +-  cfi.SetCFARule(".ra");
  1.5724 +-  cfi.SetRARule("0");
  1.5725 ++  cfi.SetCFARule(Module::Expr(".ra"));
  1.5726 ++  cfi.SetRARule(Module::Expr("0"));
  1.5727 +   ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  1.5728 +                                              &caller_registers));
  1.5729 + }
  1.5730 + 
  1.5731 + // The current frame's registers should be in scope when evaluating
  1.5732 + // the CFA rule.
  1.5733 + TEST_F(Scope, CFASeesCurrentRegs) {
  1.5734 +   ExpectNoMemoryReferences();
  1.5735 + 
  1.5736 +   registers[".baraminology"] = 0x06a7bc63e4f13893ULL;
  1.5737 +   registers[".ornithorhynchus"] = 0x5e0bf850bafce9d2ULL;
  1.5738 +-  cfi.SetCFARule(".baraminology .ornithorhynchus +");
  1.5739 +-  cfi.SetRARule("0");
  1.5740 ++  cfi.SetCFARule(Module::Expr(".baraminology .ornithorhynchus +"));
  1.5741 ++  cfi.SetRARule(Module::Expr("0"));
  1.5742 +   ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  1.5743 +                                             &caller_registers));
  1.5744 +   ASSERT_EQ(2U, caller_registers.size());
  1.5745 +   ASSERT_EQ(0x06a7bc63e4f13893ULL + 0x5e0bf850bafce9d2ULL,
  1.5746 +             caller_registers[".cfa"]);
  1.5747 + }
  1.5748 + 
  1.5749 + // .cfa should be in scope in the return address expression.
  1.5750 + TEST_F(Scope, RASeesCFA) {
  1.5751 +   ExpectNoMemoryReferences();
  1.5752 + 
  1.5753 +-  cfi.SetCFARule("48364076");
  1.5754 +-  cfi.SetRARule(".cfa");
  1.5755 ++  cfi.SetCFARule(Module::Expr("48364076"));
  1.5756 ++  cfi.SetRARule(Module::Expr(".cfa"));
  1.5757 +   ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  1.5758 +                                             &caller_registers));
  1.5759 +   ASSERT_EQ(2U, caller_registers.size());
  1.5760 +   ASSERT_EQ(48364076U, caller_registers[".ra"]);
  1.5761 + }
  1.5762 + 
  1.5763 + // There should be no value for .ra in scope when evaluating the CFA rule.
  1.5764 + TEST_F(Scope, RALacksRA) {
  1.5765 +   ExpectNoMemoryReferences();
  1.5766 + 
  1.5767 +-  cfi.SetCFARule("0");
  1.5768 +-  cfi.SetRARule(".ra");
  1.5769 ++  cfi.SetCFARule(Module::Expr("0"));
  1.5770 ++  cfi.SetRARule(Module::Expr(".ra"));
  1.5771 +   ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  1.5772 +                                              &caller_registers));
  1.5773 + }
  1.5774 + 
  1.5775 + // The current frame's registers should be in scope in the return
  1.5776 + // address expression.
  1.5777 + TEST_F(Scope, RASeesCurrentRegs) {
  1.5778 +   ExpectNoMemoryReferences();
  1.5779 + 
  1.5780 +   registers["noachian"] = 0x54dc4a5d8e5eb503ULL;
  1.5781 +-  cfi.SetCFARule("10359370");
  1.5782 +-  cfi.SetRARule("noachian");
  1.5783 ++  cfi.SetCFARule(Module::Expr("10359370"));
  1.5784 ++  cfi.SetRARule(Module::Expr("noachian"));
  1.5785 +   ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  1.5786 +                                             &caller_registers));
  1.5787 +   ASSERT_EQ(2U, caller_registers.size());
  1.5788 +   ASSERT_EQ(0x54dc4a5d8e5eb503ULL, caller_registers[".ra"]);
  1.5789 + }
  1.5790 + 
  1.5791 + // .cfa should be in scope for register rules.
  1.5792 + TEST_F(Scope, RegistersSeeCFA) {
  1.5793 +   ExpectNoMemoryReferences();
  1.5794 + 
  1.5795 +-  cfi.SetCFARule("6515179");
  1.5796 +-  cfi.SetRARule(".cfa");
  1.5797 +-  cfi.SetRegisterRule("rogerian", ".cfa");
  1.5798 ++  cfi.SetCFARule(Module::Expr("6515179"));
  1.5799 ++  cfi.SetRARule(Module::Expr(".cfa"));
  1.5800 ++  cfi.SetRegisterRule("rogerian", Module::Expr(".cfa"));
  1.5801 +   ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  1.5802 +                                             &caller_registers));
  1.5803 +   ASSERT_EQ(3U, caller_registers.size());
  1.5804 +   ASSERT_EQ(6515179U, caller_registers["rogerian"]);
  1.5805 + }
  1.5806 + 
  1.5807 + // The return address should not be in scope for register rules.
  1.5808 + TEST_F(Scope, RegsLackRA) {
  1.5809 +   ExpectNoMemoryReferences();
  1.5810 + 
  1.5811 +-  cfi.SetCFARule("42740329");
  1.5812 +-  cfi.SetRARule("27045204");
  1.5813 +-  cfi.SetRegisterRule("$r1", ".ra");
  1.5814 ++  cfi.SetCFARule(Module::Expr("42740329"));
  1.5815 ++  cfi.SetRARule(Module::Expr("27045204"));
  1.5816 ++  cfi.SetRegisterRule("$r1", Module::Expr(".ra"));
  1.5817 +   ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  1.5818 +                                              &caller_registers));
  1.5819 + }
  1.5820 + 
  1.5821 + // Register rules can see the current frame's register values.
  1.5822 + TEST_F(Scope, RegsSeeRegs) {
  1.5823 +   ExpectNoMemoryReferences();
  1.5824 + 
  1.5825 +   registers["$r1"] = 0x6ed3582c4bedb9adULL;
  1.5826 +   registers["$r2"] = 0xd27d9e742b8df6d0ULL;
  1.5827 +-  cfi.SetCFARule("88239303");
  1.5828 +-  cfi.SetRARule("30503835");
  1.5829 +-  cfi.SetRegisterRule("$r1", "$r1 42175211 = $r2");
  1.5830 +-  cfi.SetRegisterRule("$r2", "$r2 21357221 = $r1");
  1.5831 ++  cfi.SetCFARule(Module::Expr("88239303"));
  1.5832 ++  cfi.SetRARule(Module::Expr("30503835"));
  1.5833 ++  cfi.SetRegisterRule("$r1", Module::Expr("$r1 42175211 = $r2"));
  1.5834 ++  cfi.SetRegisterRule("$r2", Module::Expr("$r2 21357221 = $r1"));
  1.5835 +   ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  1.5836 +                                             &caller_registers));
  1.5837 +   ASSERT_EQ(4U, caller_registers.size());
  1.5838 +   ASSERT_EQ(0xd27d9e742b8df6d0ULL, caller_registers["$r1"]);
  1.5839 +   ASSERT_EQ(0x6ed3582c4bedb9adULL, caller_registers["$r2"]);
  1.5840 + }
  1.5841 + 
  1.5842 + // Each rule's temporaries are separate.
  1.5843 + TEST_F(Scope, SeparateTempsRA) {
  1.5844 +   ExpectNoMemoryReferences();
  1.5845 + 
  1.5846 +-  cfi.SetCFARule("$temp1 76569129 = $temp1");
  1.5847 +-  cfi.SetRARule("0");
  1.5848 ++  cfi.SetCFARule(Module::Expr("$temp1 76569129 = $temp1"));
  1.5849 ++  cfi.SetRARule(Module::Expr("0"));
  1.5850 +   ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  1.5851 +                                             &caller_registers));
  1.5852 + 
  1.5853 +-  cfi.SetCFARule("$temp1 76569129 = $temp1");
  1.5854 +-  cfi.SetRARule("$temp1");
  1.5855 ++  cfi.SetCFARule(Module::Expr("$temp1 76569129 = $temp1"));
  1.5856 ++  cfi.SetRARule(Module::Expr("$temp1"));
  1.5857 +   ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory,
  1.5858 +                                              &caller_registers));
  1.5859 + }
  1.5860 + 
  1.5861 + class MockCFIRuleParserHandler: public CFIRuleParser::Handler {
  1.5862 +  public:
  1.5863 +   MOCK_METHOD1(CFARule, void(const string &));
  1.5864 +   MOCK_METHOD1(RARule,  void(const string &));
  1.5865 +@@ -512,20 +514,20 @@
  1.5866 +       .WillRepeatedly(DoAll(SetArgumentPointee<1>(0xdc1975eba8602302ULL),
  1.5867 +                             Return(true)));
  1.5868 +   // Saved return address.
  1.5869 +   EXPECT_CALL(memory,
  1.5870 +               GetMemoryAtAddress(stack_top + 16, A<uint64_t *>()))
  1.5871 +       .WillRepeatedly(DoAll(SetArgumentPointee<1>(0xba5ad6d9acce28deULL),
  1.5872 +                             Return(true)));
  1.5873 + 
  1.5874 +-  call_frame_info.SetCFARule("sp 24 +");
  1.5875 +-  call_frame_info.SetRARule(".cfa 8 - ^");
  1.5876 +-  call_frame_info.SetRegisterRule("r0", ".cfa 24 - ^");
  1.5877 +-  call_frame_info.SetRegisterRule("r1", "r2");
  1.5878 ++  call_frame_info.SetCFARule(Module::Expr("sp 24 +"));
  1.5879 ++  call_frame_info.SetRARule(Module::Expr(".cfa 8 - ^"));
  1.5880 ++  call_frame_info.SetRegisterRule("r0", Module::Expr(".cfa 24 - ^"));
  1.5881 ++  call_frame_info.SetRegisterRule("r1", Module::Expr("r2"));
  1.5882 + 
  1.5883 +   callee_context.r0 = 0x94e030ca79edd119ULL;
  1.5884 +   callee_context.r1 = 0x937b4d7e95ce52d9ULL;
  1.5885 +   callee_context.r2 = 0x5fe0027416b8b62aULL; // caller's r1
  1.5886 +   // callee_context.r3 is not valid in callee.
  1.5887 +   // callee_context.r4 is not valid in callee.
  1.5888 +   callee_context.sp = stack_top;
  1.5889 +   callee_context.pc = 0x25b21b224311d280ULL;
  1.5890 +diff --git a/src/processor/postfix_evaluator-inl.h b/src/processor/postfix_evaluator-inl.h
  1.5891 +--- a/src/processor/postfix_evaluator-inl.h
  1.5892 ++++ b/src/processor/postfix_evaluator-inl.h
  1.5893 +@@ -226,52 +226,100 @@
  1.5894 +       return false;
  1.5895 +     }
  1.5896 +   }
  1.5897 + 
  1.5898 +   return true;
  1.5899 + }
  1.5900 + 
  1.5901 + template<typename ValueType>
  1.5902 +-bool PostfixEvaluator<ValueType>::Evaluate(const string &expression,
  1.5903 +-                                           DictionaryValidityType *assigned) {
  1.5904 ++bool PostfixEvaluator<ValueType>::Evaluate(const Module::Expr& expr,
  1.5905 ++                                           DictionaryValidityType* assigned) {
  1.5906 ++  // The expression is being exevaluated only for its side effects.  Skip
  1.5907 ++  // expressions that denote values only.
  1.5908 ++  if (expr.how_ != Module::kExprPostfix) {
  1.5909 ++    BPLOG(ERROR) << "Can't evaluate for side-effects: " << expr;
  1.5910 ++    return false;
  1.5911 ++  }
  1.5912 ++
  1.5913 +   // Ensure that the stack is cleared before returning.
  1.5914 +   AutoStackClearer clearer(&stack_);
  1.5915 + 
  1.5916 +-  if (!EvaluateInternal(expression, assigned))
  1.5917 ++  if (!EvaluateInternal(expr.postfix_, assigned))
  1.5918 +     return false;
  1.5919 + 
  1.5920 +   // If there's anything left on the stack, it indicates incomplete execution.
  1.5921 +   // This is a failure case.  If the stack is empty, evalution was complete
  1.5922 +   // and successful.
  1.5923 +   if (stack_.empty())
  1.5924 +     return true;
  1.5925 + 
  1.5926 +-  BPLOG(ERROR) << "Incomplete execution: " << expression;
  1.5927 ++  BPLOG(ERROR) << "Incomplete execution: " << expr;
  1.5928 +   return false;
  1.5929 + }
  1.5930 + 
  1.5931 + template<typename ValueType>
  1.5932 +-bool PostfixEvaluator<ValueType>::EvaluateForValue(const string &expression,
  1.5933 +-                                                   ValueType *result) {
  1.5934 +-  // Ensure that the stack is cleared before returning.
  1.5935 +-  AutoStackClearer clearer(&stack_);
  1.5936 ++bool PostfixEvaluator<ValueType>::EvaluateForValue(const Module::Expr& expr,
  1.5937 ++                                                   ValueType* result) {
  1.5938 ++  switch (expr.how_) {
  1.5939 + 
  1.5940 +-  if (!EvaluateInternal(expression, NULL))
  1.5941 +-    return false;
  1.5942 ++    // Postfix expression.  Give to the evaluator and return the
  1.5943 ++    // one-and-only stack element that should be left over.
  1.5944 ++    case Module::kExprPostfix: {
  1.5945 ++      // Ensure that the stack is cleared before returning.
  1.5946 ++      AutoStackClearer clearer(&stack_);
  1.5947 + 
  1.5948 +-  // A successful execution should leave exactly one value on the stack.
  1.5949 +-  if (stack_.size() != 1) {
  1.5950 +-    BPLOG(ERROR) << "Expression yielded bad number of results: "
  1.5951 +-                 << "'" << expression << "'";
  1.5952 +-    return false;
  1.5953 ++      if (!EvaluateInternal(expr.postfix_, NULL))
  1.5954 ++        return false;
  1.5955 ++
  1.5956 ++      // A successful execution should leave exactly one value on the stack.
  1.5957 ++      if (stack_.size() != 1) {
  1.5958 ++        BPLOG(ERROR) << "Expression yielded bad number of results: "
  1.5959 ++                     << "'" << expr << "'";
  1.5960 ++        return false;
  1.5961 ++      }
  1.5962 ++
  1.5963 ++      return PopValue(result);
  1.5964 ++    }
  1.5965 ++
  1.5966 ++    // Simple-form expressions
  1.5967 ++    case Module::kExprSimple:
  1.5968 ++    case Module::kExprSimpleMem: {
  1.5969 ++      // Look up the base value
  1.5970 ++      typename DictionaryType::const_iterator iterator
  1.5971 ++        = dictionary_->find(expr.ident_);
  1.5972 ++      if (iterator == dictionary_->end()) {
  1.5973 ++        // The identifier wasn't found in the dictionary.  Don't imply any
  1.5974 ++        // default value, just fail.
  1.5975 ++        BPLOG(INFO) << "Identifier " << expr.ident_
  1.5976 ++                    << " not in dictionary (kExprSimple{Mem})";
  1.5977 ++        return false;
  1.5978 ++      }
  1.5979 ++
  1.5980 ++      // Form the sum
  1.5981 ++      ValueType sum = iterator->second + (int64_t)expr.offset_;
  1.5982 ++
  1.5983 ++      // and dereference if necessary
  1.5984 ++      if (expr.how_ == Module::kExprSimpleMem) {
  1.5985 ++        ValueType derefd;
  1.5986 ++        if (!memory_ || !memory_->GetMemoryAtAddress(sum, &derefd)) {
  1.5987 ++          return false;
  1.5988 ++        }
  1.5989 ++        *result = derefd;
  1.5990 ++      } else {
  1.5991 ++        *result = sum;
  1.5992 ++      }
  1.5993 ++      return true;
  1.5994 ++    }
  1.5995 ++
  1.5996 ++    default:
  1.5997 ++      return false;
  1.5998 +   }
  1.5999 ++}
  1.6000 + 
  1.6001 +-  return PopValue(result);
  1.6002 +-}
  1.6003 + 
  1.6004 + template<typename ValueType>
  1.6005 + typename PostfixEvaluator<ValueType>::PopResult
  1.6006 + PostfixEvaluator<ValueType>::PopValueOrIdentifier(
  1.6007 +     ValueType *value, string *identifier) {
  1.6008 +   // There needs to be at least one element on the stack to pop.
  1.6009 +   if (!stack_.size())
  1.6010 +     return POP_RESULT_FAIL;
  1.6011 +diff --git a/src/processor/postfix_evaluator.h b/src/processor/postfix_evaluator.h
  1.6012 +--- a/src/processor/postfix_evaluator.h
  1.6013 ++++ b/src/processor/postfix_evaluator.h
  1.6014 +@@ -70,16 +70,17 @@
  1.6015 + #define PROCESSOR_POSTFIX_EVALUATOR_H__
  1.6016 + 
  1.6017 + 
  1.6018 + #include <map>
  1.6019 + #include <string>
  1.6020 + #include <vector>
  1.6021 + 
  1.6022 + #include "common/using_std_string.h"
  1.6023 ++#include "common/module.h"
  1.6024 + 
  1.6025 + namespace google_breakpad {
  1.6026 + 
  1.6027 + using std::map;
  1.6028 + using std::vector;
  1.6029 + 
  1.6030 + class MemoryRegion;
  1.6031 + 
  1.6032 +@@ -100,23 +101,23 @@
  1.6033 + 
  1.6034 +   // Evaluate the expression, starting with an empty stack. The results of
  1.6035 +   // execution will be stored in one (or more) variables in the dictionary.
  1.6036 +   // Returns false if any failures occur during execution, leaving
  1.6037 +   // variables in the dictionary in an indeterminate state. If assigned is
  1.6038 +   // non-NULL, any keys set in the dictionary as a result of evaluation
  1.6039 +   // will also be set to true in assigned, providing a way to determine if
  1.6040 +   // an expression modifies any of its input variables.
  1.6041 +-  bool Evaluate(const string &expression, DictionaryValidityType *assigned);
  1.6042 ++  bool Evaluate(const Module::Expr &expr, DictionaryValidityType *assigned);
  1.6043 + 
  1.6044 +-  // Like Evaluate, but provides the value left on the stack to the
  1.6045 +-  // caller. If evaluation succeeds and leaves exactly one value on
  1.6046 +-  // the stack, pop that value, store it in *result, and return true.
  1.6047 +-  // Otherwise, return false.
  1.6048 +-  bool EvaluateForValue(const string &expression, ValueType *result);
  1.6049 ++  // Like Evaluate, but expects the expression to denote a value.
  1.6050 ++  // If evaluation succeeds and (in the case of a postfix expression)
  1.6051 ++  // leaves exactly one value on the stack, pop that value, store it in
  1.6052 ++  // *result, and return true. Otherwise, return false.
  1.6053 ++  bool EvaluateForValue(const Module::Expr& expression, ValueType* result);
  1.6054 + 
  1.6055 +   DictionaryType* dictionary() const { return dictionary_; }
  1.6056 + 
  1.6057 +   // Reset the dictionary.  PostfixEvaluator does not take ownership.
  1.6058 +   void set_dictionary(DictionaryType *dictionary) {dictionary_ = dictionary; }
  1.6059 + 
  1.6060 +  private:
  1.6061 +   // Return values for PopValueOrIdentifier

mercurial