toolkit/crashreporter/breakpad-patches/02-cfi-rule-repr.patch@6474c204b198 (annotated)
toolkit/crashreporter/breakpad-patches/02-cfi-rule-repr.patch
Wed, 31 Dec 2014 06:09:35 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Wed, 31 Dec 2014 06:09:35 +0100
- changeset 0
- 6474c204b198
- permissions
- -rw-r--r--
Cloned upstream origin tor-browser at tor-browser-31.3.0esr-4.5-1-build1
revision ID fc1c9ff7c1b2defdbc039f12214767608f46423f for hacking purpose.
| michael@0 | 1 | # HG changeset patch |
| michael@0 | 2 | # User Ted Mielczarek <ted.mielczarek@gmail.com> |
| michael@0 | 3 | # Date 1360255133 18000 |
| michael@0 | 4 | # Node ID d23a69a6c34a1f1c21e241f37b388c8689f2386b |
| michael@0 | 5 | # Parent c3b1109dd392c16a9fe4e85da693010966dbbf0b |
| michael@0 | 6 | Change the representation of CFI rules to avoid postfix expressions in most cases |
| michael@0 | 7 | Patch by Julian Seward <jseward@acm.org> |
| michael@0 | 8 | R=ted |
| michael@0 | 9 | |
| michael@0 | 10 | diff --git a/Makefile.am b/Makefile.am |
| michael@0 | 11 | --- a/Makefile.am |
| michael@0 | 12 | +++ b/Makefile.am |
| michael@0 | 13 | @@ -133,16 +133,17 @@ |
| michael@0 | 14 | src/google_breakpad/processor/source_line_resolver_base.h \ |
| michael@0 | 15 | src/google_breakpad/processor/source_line_resolver_interface.h \ |
| michael@0 | 16 | src/google_breakpad/processor/stack_frame.h \ |
| michael@0 | 17 | src/google_breakpad/processor/stack_frame_cpu.h \ |
| michael@0 | 18 | src/google_breakpad/processor/stack_frame_symbolizer.h \ |
| michael@0 | 19 | src/google_breakpad/processor/stackwalker.h \ |
| michael@0 | 20 | src/google_breakpad/processor/symbol_supplier.h \ |
| michael@0 | 21 | src/google_breakpad/processor/system_info.h \ |
| michael@0 | 22 | + src/common/module.cc \ |
| michael@0 | 23 | src/processor/address_map-inl.h \ |
| michael@0 | 24 | src/processor/address_map.h \ |
| michael@0 | 25 | src/processor/basic_code_module.h \ |
| michael@0 | 26 | src/processor/basic_code_modules.cc \ |
| michael@0 | 27 | src/processor/basic_code_modules.h \ |
| michael@0 | 28 | src/processor/basic_source_line_resolver_types.h \ |
| michael@0 | 29 | src/processor/basic_source_line_resolver.cc \ |
| michael@0 | 30 | src/processor/binarystream.h \ |
| michael@0 | 31 | @@ -555,30 +556,32 @@ |
| michael@0 | 32 | src/testing/src/gmock-all.cc |
| michael@0 | 33 | src_processor_basic_source_line_resolver_unittest_CPPFLAGS = \ |
| michael@0 | 34 | -I$(top_srcdir)/src \ |
| michael@0 | 35 | -I$(top_srcdir)/src/testing/include \ |
| michael@0 | 36 | -I$(top_srcdir)/src/testing/gtest/include \ |
| michael@0 | 37 | -I$(top_srcdir)/src/testing/gtest \ |
| michael@0 | 38 | -I$(top_srcdir)/src/testing |
| michael@0 | 39 | src_processor_basic_source_line_resolver_unittest_LDADD = \ |
| michael@0 | 40 | + src/common/module.o \ |
| michael@0 | 41 | src/processor/basic_source_line_resolver.o \ |
| michael@0 | 42 | src/processor/cfi_frame_info.o \ |
| michael@0 | 43 | src/processor/pathname_stripper.o \ |
| michael@0 | 44 | src/processor/logging.o \ |
| michael@0 | 45 | src/processor/source_line_resolver_base.o \ |
| michael@0 | 46 | src/processor/tokenize.o \ |
| michael@0 | 47 | $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) |
| michael@0 | 48 | |
| michael@0 | 49 | src_processor_cfi_frame_info_unittest_SOURCES = \ |
| michael@0 | 50 | src/processor/cfi_frame_info_unittest.cc \ |
| michael@0 | 51 | src/testing/gtest/src/gtest-all.cc \ |
| michael@0 | 52 | src/testing/gtest/src/gtest_main.cc \ |
| michael@0 | 53 | src/testing/src/gmock-all.cc |
| michael@0 | 54 | src_processor_cfi_frame_info_unittest_LDADD = \ |
| michael@0 | 55 | + src/common/module.o \ |
| michael@0 | 56 | src/processor/cfi_frame_info.o \ |
| michael@0 | 57 | src/processor/logging.o \ |
| michael@0 | 58 | src/processor/pathname_stripper.o \ |
| michael@0 | 59 | $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) |
| michael@0 | 60 | src_processor_cfi_frame_info_unittest_CPPFLAGS = \ |
| michael@0 | 61 | -I$(top_srcdir)/src \ |
| michael@0 | 62 | -I$(top_srcdir)/src/testing/include \ |
| michael@0 | 63 | -I$(top_srcdir)/src/testing/gtest/include \ |
| michael@0 | 64 | @@ -598,16 +601,17 @@ |
| michael@0 | 65 | src/testing/src/gmock-all.cc |
| michael@0 | 66 | src_processor_exploitability_unittest_CPPFLAGS = \ |
| michael@0 | 67 | -I$(top_srcdir)/src \ |
| michael@0 | 68 | -I$(top_srcdir)/src/testing/include \ |
| michael@0 | 69 | -I$(top_srcdir)/src/testing/gtest/include \ |
| michael@0 | 70 | -I$(top_srcdir)/src/testing/gtest \ |
| michael@0 | 71 | -I$(top_srcdir)/src/testing |
| michael@0 | 72 | src_processor_exploitability_unittest_LDADD = \ |
| michael@0 | 73 | + src/common/module.o \ |
| michael@0 | 74 | src/processor/minidump_processor.o \ |
| michael@0 | 75 | src/processor/process_state.o \ |
| michael@0 | 76 | src/processor/disassembler_x86.o \ |
| michael@0 | 77 | src/processor/exploitability.o \ |
| michael@0 | 78 | src/processor/exploitability_win.o \ |
| michael@0 | 79 | src/processor/basic_code_modules.o \ |
| michael@0 | 80 | src/processor/basic_source_line_resolver.o \ |
| michael@0 | 81 | src/processor/call_stack.o \ |
| michael@0 | 82 | @@ -649,16 +653,17 @@ |
| michael@0 | 83 | src/testing/src/gmock-all.cc |
| michael@0 | 84 | src_processor_fast_source_line_resolver_unittest_CPPFLAGS = \ |
| michael@0 | 85 | -I$(top_srcdir)/src \ |
| michael@0 | 86 | -I$(top_srcdir)/src/testing/include \ |
| michael@0 | 87 | -I$(top_srcdir)/src/testing/gtest/include \ |
| michael@0 | 88 | -I$(top_srcdir)/src/testing/gtest \ |
| michael@0 | 89 | -I$(top_srcdir)/src/testing |
| michael@0 | 90 | src_processor_fast_source_line_resolver_unittest_LDADD = \ |
| michael@0 | 91 | + src/common/module.o \ |
| michael@0 | 92 | src/processor/fast_source_line_resolver.o \ |
| michael@0 | 93 | src/processor/basic_source_line_resolver.o \ |
| michael@0 | 94 | src/processor/cfi_frame_info.o \ |
| michael@0 | 95 | src/processor/module_comparer.o \ |
| michael@0 | 96 | src/processor/module_serializer.o \ |
| michael@0 | 97 | src/processor/pathname_stripper.o \ |
| michael@0 | 98 | src/processor/logging.o \ |
| michael@0 | 99 | src/processor/source_line_resolver_base.o \ |
| michael@0 | 100 | @@ -686,16 +691,17 @@ |
| michael@0 | 101 | src/testing/src/gmock-all.cc |
| michael@0 | 102 | src_processor_minidump_processor_unittest_CPPFLAGS = \ |
| michael@0 | 103 | -I$(top_srcdir)/src \ |
| michael@0 | 104 | -I$(top_srcdir)/src/testing/include \ |
| michael@0 | 105 | -I$(top_srcdir)/src/testing/gtest/include \ |
| michael@0 | 106 | -I$(top_srcdir)/src/testing/gtest \ |
| michael@0 | 107 | -I$(top_srcdir)/src/testing |
| michael@0 | 108 | src_processor_minidump_processor_unittest_LDADD = \ |
| michael@0 | 109 | + src/common/module.o \ |
| michael@0 | 110 | src/processor/basic_code_modules.o \ |
| michael@0 | 111 | src/processor/basic_source_line_resolver.o \ |
| michael@0 | 112 | src/processor/call_stack.o \ |
| michael@0 | 113 | src/processor/cfi_frame_info.o \ |
| michael@0 | 114 | src/processor/disassembler_x86.o \ |
| michael@0 | 115 | src/processor/exploitability.o \ |
| michael@0 | 116 | src/processor/exploitability_win.o \ |
| michael@0 | 117 | src/processor/logging.o \ |
| michael@0 | 118 | @@ -799,16 +805,17 @@ |
| michael@0 | 119 | src/processor/pathname_stripper_unittest.cc |
| michael@0 | 120 | src_processor_pathname_stripper_unittest_LDADD = \ |
| michael@0 | 121 | src/processor/pathname_stripper.o \ |
| michael@0 | 122 | $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) |
| michael@0 | 123 | |
| michael@0 | 124 | src_processor_postfix_evaluator_unittest_SOURCES = \ |
| michael@0 | 125 | src/processor/postfix_evaluator_unittest.cc |
| michael@0 | 126 | src_processor_postfix_evaluator_unittest_LDADD = \ |
| michael@0 | 127 | + src/common/module.o \ |
| michael@0 | 128 | src/processor/logging.o \ |
| michael@0 | 129 | src/processor/pathname_stripper.o \ |
| michael@0 | 130 | $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) |
| michael@0 | 131 | |
| michael@0 | 132 | src_processor_range_map_unittest_SOURCES = \ |
| michael@0 | 133 | src/processor/range_map_unittest.cc |
| michael@0 | 134 | src_processor_range_map_unittest_LDADD = \ |
| michael@0 | 135 | src/processor/logging.o \ |
| michael@0 | 136 | @@ -928,16 +935,17 @@ |
| michael@0 | 137 | src/processor/basic_code_modules.o \ |
| michael@0 | 138 | src/processor/logging.o \ |
| michael@0 | 139 | src/processor/minidump.o \ |
| michael@0 | 140 | src/processor/pathname_stripper.o |
| michael@0 | 141 | |
| michael@0 | 142 | src_processor_minidump_stackwalk_SOURCES = \ |
| michael@0 | 143 | src/processor/minidump_stackwalk.cc |
| michael@0 | 144 | src_processor_minidump_stackwalk_LDADD = \ |
| michael@0 | 145 | + src/common/module.o \ |
| michael@0 | 146 | src/processor/basic_code_modules.o \ |
| michael@0 | 147 | src/processor/basic_source_line_resolver.o \ |
| michael@0 | 148 | src/processor/binarystream.o \ |
| michael@0 | 149 | src/processor/call_stack.o \ |
| michael@0 | 150 | src/processor/cfi_frame_info.o \ |
| michael@0 | 151 | src/processor/disassembler_x86.o \ |
| michael@0 | 152 | src/processor/exploitability.o \ |
| michael@0 | 153 | src/processor/exploitability_win.o \ |
| michael@0 | 154 | diff --git a/Makefile.in b/Makefile.in |
| michael@0 | 155 | --- a/Makefile.in |
| michael@0 | 156 | +++ b/Makefile.in |
| michael@0 | 157 | @@ -1,14 +1,14 @@ |
| michael@0 | 158 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
| michael@0 | 159 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
| michael@0 | 160 | # @configure_input@ |
| michael@0 | 161 | |
| michael@0 | 162 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
| michael@0 | 163 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
| michael@0 | 164 | -# Inc. |
| michael@0 | 165 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
| michael@0 | 166 | +# Foundation, Inc. |
| michael@0 | 167 | # This Makefile.in is free software; the Free Software Foundation |
| michael@0 | 168 | # gives unlimited permission to copy and/or distribute it, |
| michael@0 | 169 | # with or without modifications, as long as this notice is preserved. |
| michael@0 | 170 | |
| michael@0 | 171 | # This program is distributed in the hope that it will be useful, |
| michael@0 | 172 | # but WITHOUT ANY WARRANTY, to the extent permitted by law; without |
| michael@0 | 173 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
| michael@0 | 174 | # PARTICULAR PURPOSE. |
| michael@0 | 175 | @@ -190,16 +190,22 @@ |
| michael@0 | 176 | sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ |
| michael@0 | 177 | $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ |
| michael@0 | 178 | if (++n[$$2] == $(am__install_max)) \ |
| michael@0 | 179 | { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ |
| michael@0 | 180 | END { for (dir in files) print dir, files[dir] }' |
| michael@0 | 181 | am__base_list = \ |
| michael@0 | 182 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
| michael@0 | 183 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
| michael@0 | 184 | +am__uninstall_files_from_dir = { \ |
| michael@0 | 185 | + test -z "$$files" \ |
| michael@0 | 186 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
| michael@0 | 187 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
| michael@0 | 188 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
| michael@0 | 189 | + } |
| michael@0 | 190 | am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ |
| michael@0 | 191 | "$(DESTDIR)$(docdir)" |
| michael@0 | 192 | LIBRARIES = $(lib_LIBRARIES) $(noinst_LIBRARIES) |
| michael@0 | 193 | AR = ar |
| michael@0 | 194 | ARFLAGS = cru |
| michael@0 | 195 | src_client_linux_libbreakpad_client_a_AR = $(AR) $(ARFLAGS) |
| michael@0 | 196 | src_client_linux_libbreakpad_client_a_LIBADD = |
| michael@0 | 197 | am__src_client_linux_libbreakpad_client_a_SOURCES_DIST = \ |
| michael@0 | 198 | @@ -261,18 +267,18 @@ |
| michael@0 | 199 | src/google_breakpad/processor/source_line_resolver_base.h \ |
| michael@0 | 200 | src/google_breakpad/processor/source_line_resolver_interface.h \ |
| michael@0 | 201 | src/google_breakpad/processor/stack_frame.h \ |
| michael@0 | 202 | src/google_breakpad/processor/stack_frame_cpu.h \ |
| michael@0 | 203 | src/google_breakpad/processor/stack_frame_symbolizer.h \ |
| michael@0 | 204 | src/google_breakpad/processor/stackwalker.h \ |
| michael@0 | 205 | src/google_breakpad/processor/symbol_supplier.h \ |
| michael@0 | 206 | src/google_breakpad/processor/system_info.h \ |
| michael@0 | 207 | - src/processor/address_map-inl.h src/processor/address_map.h \ |
| michael@0 | 208 | - src/processor/basic_code_module.h \ |
| michael@0 | 209 | + src/common/module.cc src/processor/address_map-inl.h \ |
| michael@0 | 210 | + src/processor/address_map.h src/processor/basic_code_module.h \ |
| michael@0 | 211 | src/processor/basic_code_modules.cc \ |
| michael@0 | 212 | src/processor/basic_code_modules.h \ |
| michael@0 | 213 | src/processor/basic_source_line_resolver_types.h \ |
| michael@0 | 214 | src/processor/basic_source_line_resolver.cc \ |
| michael@0 | 215 | src/processor/binarystream.h src/processor/binarystream.cc \ |
| michael@0 | 216 | src/processor/call_stack.cc src/processor/cfi_frame_info.cc \ |
| michael@0 | 217 | src/processor/cfi_frame_info.h \ |
| michael@0 | 218 | src/processor/contained_range_map-inl.h \ |
| michael@0 | 219 | @@ -322,17 +328,19 @@ |
| michael@0 | 220 | src/processor/static_contained_range_map-inl.h \ |
| michael@0 | 221 | src/processor/static_contained_range_map.h \ |
| michael@0 | 222 | src/processor/static_map_iterator-inl.h \ |
| michael@0 | 223 | src/processor/static_map_iterator.h \ |
| michael@0 | 224 | src/processor/static_map-inl.h src/processor/static_map.h \ |
| michael@0 | 225 | src/processor/static_range_map-inl.h \ |
| michael@0 | 226 | src/processor/static_range_map.h src/processor/tokenize.cc \ |
| michael@0 | 227 | src/processor/tokenize.h |
| michael@0 | 228 | -@DISABLE_PROCESSOR_FALSE@am_src_libbreakpad_a_OBJECTS = src/processor/basic_code_modules.$(OBJEXT) \ |
| michael@0 | 229 | +@DISABLE_PROCESSOR_FALSE@am_src_libbreakpad_a_OBJECTS = \ |
| michael@0 | 230 | +@DISABLE_PROCESSOR_FALSE@ src/common/module.$(OBJEXT) \ |
| michael@0 | 231 | +@DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.$(OBJEXT) \ |
| michael@0 | 232 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.$(OBJEXT) \ |
| michael@0 | 233 | @DISABLE_PROCESSOR_FALSE@ src/processor/binarystream.$(OBJEXT) \ |
| michael@0 | 234 | @DISABLE_PROCESSOR_FALSE@ src/processor/call_stack.$(OBJEXT) \ |
| michael@0 | 235 | @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.$(OBJEXT) \ |
| michael@0 | 236 | @DISABLE_PROCESSOR_FALSE@ src/processor/disassembler_x86.$(OBJEXT) \ |
| michael@0 | 237 | @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability.$(OBJEXT) \ |
| michael@0 | 238 | @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability_win.$(OBJEXT) \ |
| michael@0 | 239 | @DISABLE_PROCESSOR_FALSE@ src/processor/fast_source_line_resolver.$(OBJEXT) \ |
| michael@0 | 240 | @@ -620,17 +628,19 @@ |
| michael@0 | 241 | am__src_processor_basic_source_line_resolver_unittest_SOURCES_DIST = \ |
| michael@0 | 242 | src/processor/basic_source_line_resolver_unittest.cc \ |
| michael@0 | 243 | src/testing/gtest/src/gtest-all.cc \ |
| michael@0 | 244 | src/testing/src/gmock-all.cc |
| michael@0 | 245 | @DISABLE_PROCESSOR_FALSE@am_src_processor_basic_source_line_resolver_unittest_OBJECTS = src/processor/src_processor_basic_source_line_resolver_unittest-basic_source_line_resolver_unittest.$(OBJEXT) \ |
| michael@0 | 246 | @DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/src_processor_basic_source_line_resolver_unittest-gtest-all.$(OBJEXT) \ |
| michael@0 | 247 | @DISABLE_PROCESSOR_FALSE@ src/testing/src/src_processor_basic_source_line_resolver_unittest-gmock-all.$(OBJEXT) |
| michael@0 | 248 | src_processor_basic_source_line_resolver_unittest_OBJECTS = $(am_src_processor_basic_source_line_resolver_unittest_OBJECTS) |
| michael@0 | 249 | -@DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_DEPENDENCIES = src/processor/basic_source_line_resolver.o \ |
| michael@0 | 250 | +@DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_DEPENDENCIES = \ |
| michael@0 | 251 | +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ |
| michael@0 | 252 | +@DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ |
| michael@0 | 253 | @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ |
| michael@0 | 254 | @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ |
| michael@0 | 255 | @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ |
| michael@0 | 256 | @DISABLE_PROCESSOR_FALSE@ src/processor/source_line_resolver_base.o \ |
| michael@0 | 257 | @DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \ |
| michael@0 | 258 | @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ |
| michael@0 | 259 | @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) |
| michael@0 | 260 | am__src_processor_binarystream_unittest_SOURCES_DIST = \ |
| michael@0 | 261 | @@ -653,16 +663,17 @@ |
| michael@0 | 262 | src/testing/src/gmock-all.cc |
| michael@0 | 263 | @DISABLE_PROCESSOR_FALSE@am_src_processor_cfi_frame_info_unittest_OBJECTS = src/processor/src_processor_cfi_frame_info_unittest-cfi_frame_info_unittest.$(OBJEXT) \ |
| michael@0 | 264 | @DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/src_processor_cfi_frame_info_unittest-gtest-all.$(OBJEXT) \ |
| michael@0 | 265 | @DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/src_processor_cfi_frame_info_unittest-gtest_main.$(OBJEXT) \ |
| michael@0 | 266 | @DISABLE_PROCESSOR_FALSE@ src/testing/src/src_processor_cfi_frame_info_unittest-gmock-all.$(OBJEXT) |
| michael@0 | 267 | src_processor_cfi_frame_info_unittest_OBJECTS = \ |
| michael@0 | 268 | $(am_src_processor_cfi_frame_info_unittest_OBJECTS) |
| michael@0 | 269 | @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_DEPENDENCIES = \ |
| michael@0 | 270 | +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ |
| michael@0 | 271 | @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ |
| michael@0 | 272 | @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ |
| michael@0 | 273 | @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ |
| michael@0 | 274 | @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ |
| michael@0 | 275 | @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) |
| michael@0 | 276 | am__src_processor_contained_range_map_unittest_SOURCES_DIST = \ |
| michael@0 | 277 | src/processor/contained_range_map_unittest.cc |
| michael@0 | 278 | @DISABLE_PROCESSOR_FALSE@am_src_processor_contained_range_map_unittest_OBJECTS = src/processor/contained_range_map_unittest.$(OBJEXT) |
| michael@0 | 279 | @@ -694,16 +705,17 @@ |
| michael@0 | 280 | src/testing/src/gmock-all.cc |
| michael@0 | 281 | @DISABLE_PROCESSOR_FALSE@am_src_processor_exploitability_unittest_OBJECTS = src/processor/src_processor_exploitability_unittest-exploitability_unittest.$(OBJEXT) \ |
| michael@0 | 282 | @DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/src_processor_exploitability_unittest-gtest-all.$(OBJEXT) \ |
| michael@0 | 283 | @DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/src_processor_exploitability_unittest-gtest_main.$(OBJEXT) \ |
| michael@0 | 284 | @DISABLE_PROCESSOR_FALSE@ src/testing/src/src_processor_exploitability_unittest-gmock-all.$(OBJEXT) |
| michael@0 | 285 | src_processor_exploitability_unittest_OBJECTS = \ |
| michael@0 | 286 | $(am_src_processor_exploitability_unittest_OBJECTS) |
| michael@0 | 287 | @DISABLE_PROCESSOR_FALSE@src_processor_exploitability_unittest_DEPENDENCIES = \ |
| michael@0 | 288 | +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ |
| michael@0 | 289 | @DISABLE_PROCESSOR_FALSE@ src/processor/minidump_processor.o \ |
| michael@0 | 290 | @DISABLE_PROCESSOR_FALSE@ src/processor/process_state.o \ |
| michael@0 | 291 | @DISABLE_PROCESSOR_FALSE@ src/processor/disassembler_x86.o \ |
| michael@0 | 292 | @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability.o \ |
| michael@0 | 293 | @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability_win.o \ |
| michael@0 | 294 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.o \ |
| michael@0 | 295 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ |
| michael@0 | 296 | @DISABLE_PROCESSOR_FALSE@ src/processor/call_stack.o \ |
| michael@0 | 297 | @@ -726,17 +738,19 @@ |
| michael@0 | 298 | am__src_processor_fast_source_line_resolver_unittest_SOURCES_DIST = \ |
| michael@0 | 299 | src/processor/fast_source_line_resolver_unittest.cc \ |
| michael@0 | 300 | src/testing/gtest/src/gtest-all.cc \ |
| michael@0 | 301 | src/testing/src/gmock-all.cc |
| michael@0 | 302 | @DISABLE_PROCESSOR_FALSE@am_src_processor_fast_source_line_resolver_unittest_OBJECTS = src/processor/src_processor_fast_source_line_resolver_unittest-fast_source_line_resolver_unittest.$(OBJEXT) \ |
| michael@0 | 303 | @DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/src_processor_fast_source_line_resolver_unittest-gtest-all.$(OBJEXT) \ |
| michael@0 | 304 | @DISABLE_PROCESSOR_FALSE@ src/testing/src/src_processor_fast_source_line_resolver_unittest-gmock-all.$(OBJEXT) |
| michael@0 | 305 | src_processor_fast_source_line_resolver_unittest_OBJECTS = $(am_src_processor_fast_source_line_resolver_unittest_OBJECTS) |
| michael@0 | 306 | -@DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_DEPENDENCIES = src/processor/fast_source_line_resolver.o \ |
| michael@0 | 307 | +@DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_DEPENDENCIES = \ |
| michael@0 | 308 | +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ |
| michael@0 | 309 | +@DISABLE_PROCESSOR_FALSE@ src/processor/fast_source_line_resolver.o \ |
| michael@0 | 310 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ |
| michael@0 | 311 | @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ |
| michael@0 | 312 | @DISABLE_PROCESSOR_FALSE@ src/processor/module_comparer.o \ |
| michael@0 | 313 | @DISABLE_PROCESSOR_FALSE@ src/processor/module_serializer.o \ |
| michael@0 | 314 | @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ |
| michael@0 | 315 | @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ |
| michael@0 | 316 | @DISABLE_PROCESSOR_FALSE@ src/processor/source_line_resolver_base.o \ |
| michael@0 | 317 | @DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \ |
| michael@0 | 318 | @@ -771,16 +785,17 @@ |
| michael@0 | 319 | src/testing/gtest/src/gtest-all.cc \ |
| michael@0 | 320 | src/testing/src/gmock-all.cc |
| michael@0 | 321 | @DISABLE_PROCESSOR_FALSE@am_src_processor_minidump_processor_unittest_OBJECTS = src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.$(OBJEXT) \ |
| michael@0 | 322 | @DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.$(OBJEXT) \ |
| michael@0 | 323 | @DISABLE_PROCESSOR_FALSE@ src/testing/src/src_processor_minidump_processor_unittest-gmock-all.$(OBJEXT) |
| michael@0 | 324 | src_processor_minidump_processor_unittest_OBJECTS = \ |
| michael@0 | 325 | $(am_src_processor_minidump_processor_unittest_OBJECTS) |
| michael@0 | 326 | @DISABLE_PROCESSOR_FALSE@src_processor_minidump_processor_unittest_DEPENDENCIES = \ |
| michael@0 | 327 | +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ |
| michael@0 | 328 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.o \ |
| michael@0 | 329 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ |
| michael@0 | 330 | @DISABLE_PROCESSOR_FALSE@ src/processor/call_stack.o \ |
| michael@0 | 331 | @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ |
| michael@0 | 332 | @DISABLE_PROCESSOR_FALSE@ src/processor/disassembler_x86.o \ |
| michael@0 | 333 | @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability.o \ |
| michael@0 | 334 | @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability_win.o \ |
| michael@0 | 335 | @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ |
| michael@0 | 336 | @@ -801,16 +816,17 @@ |
| michael@0 | 337 | @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ |
| michael@0 | 338 | @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) |
| michael@0 | 339 | am__src_processor_minidump_stackwalk_SOURCES_DIST = \ |
| michael@0 | 340 | src/processor/minidump_stackwalk.cc |
| michael@0 | 341 | @DISABLE_PROCESSOR_FALSE@am_src_processor_minidump_stackwalk_OBJECTS = src/processor/minidump_stackwalk.$(OBJEXT) |
| michael@0 | 342 | src_processor_minidump_stackwalk_OBJECTS = \ |
| michael@0 | 343 | $(am_src_processor_minidump_stackwalk_OBJECTS) |
| michael@0 | 344 | @DISABLE_PROCESSOR_FALSE@src_processor_minidump_stackwalk_DEPENDENCIES = \ |
| michael@0 | 345 | +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ |
| michael@0 | 346 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.o \ |
| michael@0 | 347 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ |
| michael@0 | 348 | @DISABLE_PROCESSOR_FALSE@ src/processor/binarystream.o \ |
| michael@0 | 349 | @DISABLE_PROCESSOR_FALSE@ src/processor/call_stack.o \ |
| michael@0 | 350 | @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ |
| michael@0 | 351 | @DISABLE_PROCESSOR_FALSE@ src/processor/disassembler_x86.o \ |
| michael@0 | 352 | @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability.o \ |
| michael@0 | 353 | @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability_win.o \ |
| michael@0 | 354 | @@ -862,16 +878,17 @@ |
| michael@0 | 355 | @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ |
| michael@0 | 356 | @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) |
| michael@0 | 357 | am__src_processor_postfix_evaluator_unittest_SOURCES_DIST = \ |
| michael@0 | 358 | src/processor/postfix_evaluator_unittest.cc |
| michael@0 | 359 | @DISABLE_PROCESSOR_FALSE@am_src_processor_postfix_evaluator_unittest_OBJECTS = src/processor/postfix_evaluator_unittest.$(OBJEXT) |
| michael@0 | 360 | src_processor_postfix_evaluator_unittest_OBJECTS = \ |
| michael@0 | 361 | $(am_src_processor_postfix_evaluator_unittest_OBJECTS) |
| michael@0 | 362 | @DISABLE_PROCESSOR_FALSE@src_processor_postfix_evaluator_unittest_DEPENDENCIES = \ |
| michael@0 | 363 | +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ |
| michael@0 | 364 | @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ |
| michael@0 | 365 | @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ |
| michael@0 | 366 | @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \ |
| michael@0 | 367 | @DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) |
| michael@0 | 368 | am__src_processor_range_map_unittest_SOURCES_DIST = \ |
| michael@0 | 369 | src/processor/range_map_unittest.cc |
| michael@0 | 370 | @DISABLE_PROCESSOR_FALSE@am_src_processor_range_map_unittest_OBJECTS = src/processor/range_map_unittest.$(OBJEXT) |
| michael@0 | 371 | src_processor_range_map_unittest_OBJECTS = \ |
| michael@0 | 372 | @@ -1212,22 +1229,26 @@ |
| michael@0 | 373 | ETAGS = etags |
| michael@0 | 374 | CTAGS = ctags |
| michael@0 | 375 | am__tty_colors = \ |
| michael@0 | 376 | red=; grn=; lgn=; blu=; std= |
| michael@0 | 377 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
| michael@0 | 378 | distdir = $(PACKAGE)-$(VERSION) |
| michael@0 | 379 | top_distdir = $(distdir) |
| michael@0 | 380 | am__remove_distdir = \ |
| michael@0 | 381 | - { test ! -d "$(distdir)" \ |
| michael@0 | 382 | - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
| michael@0 | 383 | - && rm -fr "$(distdir)"; }; } |
| michael@0 | 384 | + if test -d "$(distdir)"; then \ |
| michael@0 | 385 | + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
| michael@0 | 386 | + && rm -rf "$(distdir)" \ |
| michael@0 | 387 | + || { sleep 5 && rm -rf "$(distdir)"; }; \ |
| michael@0 | 388 | + else :; fi |
| michael@0 | 389 | DIST_ARCHIVES = $(distdir).tar.gz |
| michael@0 | 390 | GZIP_ENV = --best |
| michael@0 | 391 | distuninstallcheck_listfiles = find . -type f -print |
| michael@0 | 392 | +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
| michael@0 | 393 | + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
| michael@0 | 394 | distcleancheck_listfiles = find . -type f -print |
| michael@0 | 395 | ACLOCAL = @ACLOCAL@ |
| michael@0 | 396 | AMTAR = @AMTAR@ |
| michael@0 | 397 | AUTOCONF = @AUTOCONF@ |
| michael@0 | 398 | AUTOHEADER = @AUTOHEADER@ |
| michael@0 | 399 | AUTOMAKE = @AUTOMAKE@ |
| michael@0 | 400 | AWK = @AWK@ |
| michael@0 | 401 | CC = @CC@ |
| michael@0 | 402 | @@ -1383,16 +1404,17 @@ |
| michael@0 | 403 | @DISABLE_PROCESSOR_FALSE@ src/google_breakpad/processor/source_line_resolver_base.h \ |
| michael@0 | 404 | @DISABLE_PROCESSOR_FALSE@ src/google_breakpad/processor/source_line_resolver_interface.h \ |
| michael@0 | 405 | @DISABLE_PROCESSOR_FALSE@ src/google_breakpad/processor/stack_frame.h \ |
| michael@0 | 406 | @DISABLE_PROCESSOR_FALSE@ src/google_breakpad/processor/stack_frame_cpu.h \ |
| michael@0 | 407 | @DISABLE_PROCESSOR_FALSE@ src/google_breakpad/processor/stack_frame_symbolizer.h \ |
| michael@0 | 408 | @DISABLE_PROCESSOR_FALSE@ src/google_breakpad/processor/stackwalker.h \ |
| michael@0 | 409 | @DISABLE_PROCESSOR_FALSE@ src/google_breakpad/processor/symbol_supplier.h \ |
| michael@0 | 410 | @DISABLE_PROCESSOR_FALSE@ src/google_breakpad/processor/system_info.h \ |
| michael@0 | 411 | +@DISABLE_PROCESSOR_FALSE@ src/common/module.cc \ |
| michael@0 | 412 | @DISABLE_PROCESSOR_FALSE@ src/processor/address_map-inl.h \ |
| michael@0 | 413 | @DISABLE_PROCESSOR_FALSE@ src/processor/address_map.h \ |
| michael@0 | 414 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_module.h \ |
| michael@0 | 415 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.cc \ |
| michael@0 | 416 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.h \ |
| michael@0 | 417 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver_types.h \ |
| michael@0 | 418 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.cc \ |
| michael@0 | 419 | @DISABLE_PROCESSOR_FALSE@ src/processor/binarystream.h \ |
| michael@0 | 420 | @@ -1715,31 +1737,33 @@ |
| michael@0 | 421 | @DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_CPPFLAGS = \ |
| michael@0 | 422 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src \ |
| michael@0 | 423 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/include \ |
| michael@0 | 424 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/gtest/include \ |
| michael@0 | 425 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/gtest \ |
| michael@0 | 426 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing |
| michael@0 | 427 | |
| michael@0 | 428 | @DISABLE_PROCESSOR_FALSE@src_processor_basic_source_line_resolver_unittest_LDADD = \ |
| michael@0 | 429 | +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ |
| michael@0 | 430 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ |
| michael@0 | 431 | @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ |
| michael@0 | 432 | @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ |
| michael@0 | 433 | @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ |
| michael@0 | 434 | @DISABLE_PROCESSOR_FALSE@ src/processor/source_line_resolver_base.o \ |
| michael@0 | 435 | @DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \ |
| michael@0 | 436 | @DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) |
| michael@0 | 437 | |
| michael@0 | 438 | @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_SOURCES = \ |
| michael@0 | 439 | @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info_unittest.cc \ |
| michael@0 | 440 | @DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/gtest-all.cc \ |
| michael@0 | 441 | @DISABLE_PROCESSOR_FALSE@ src/testing/gtest/src/gtest_main.cc \ |
| michael@0 | 442 | @DISABLE_PROCESSOR_FALSE@ src/testing/src/gmock-all.cc |
| michael@0 | 443 | |
| michael@0 | 444 | @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_LDADD = \ |
| michael@0 | 445 | +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ |
| michael@0 | 446 | @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ |
| michael@0 | 447 | @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ |
| michael@0 | 448 | @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ |
| michael@0 | 449 | @DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) |
| michael@0 | 450 | |
| michael@0 | 451 | @DISABLE_PROCESSOR_FALSE@src_processor_cfi_frame_info_unittest_CPPFLAGS = \ |
| michael@0 | 452 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src \ |
| michael@0 | 453 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/include \ |
| michael@0 | 454 | @@ -1763,16 +1787,17 @@ |
| michael@0 | 455 | @DISABLE_PROCESSOR_FALSE@src_processor_exploitability_unittest_CPPFLAGS = \ |
| michael@0 | 456 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src \ |
| michael@0 | 457 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/include \ |
| michael@0 | 458 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/gtest/include \ |
| michael@0 | 459 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/gtest \ |
| michael@0 | 460 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing |
| michael@0 | 461 | |
| michael@0 | 462 | @DISABLE_PROCESSOR_FALSE@src_processor_exploitability_unittest_LDADD = \ |
| michael@0 | 463 | +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ |
| michael@0 | 464 | @DISABLE_PROCESSOR_FALSE@ src/processor/minidump_processor.o \ |
| michael@0 | 465 | @DISABLE_PROCESSOR_FALSE@ src/processor/process_state.o \ |
| michael@0 | 466 | @DISABLE_PROCESSOR_FALSE@ src/processor/disassembler_x86.o \ |
| michael@0 | 467 | @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability.o \ |
| michael@0 | 468 | @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability_win.o \ |
| michael@0 | 469 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.o \ |
| michael@0 | 470 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ |
| michael@0 | 471 | @DISABLE_PROCESSOR_FALSE@ src/processor/call_stack.o \ |
| michael@0 | 472 | @@ -1818,16 +1843,17 @@ |
| michael@0 | 473 | @DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_CPPFLAGS = \ |
| michael@0 | 474 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src \ |
| michael@0 | 475 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/include \ |
| michael@0 | 476 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/gtest/include \ |
| michael@0 | 477 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/gtest \ |
| michael@0 | 478 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing |
| michael@0 | 479 | |
| michael@0 | 480 | @DISABLE_PROCESSOR_FALSE@src_processor_fast_source_line_resolver_unittest_LDADD = \ |
| michael@0 | 481 | +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ |
| michael@0 | 482 | @DISABLE_PROCESSOR_FALSE@ src/processor/fast_source_line_resolver.o \ |
| michael@0 | 483 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ |
| michael@0 | 484 | @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ |
| michael@0 | 485 | @DISABLE_PROCESSOR_FALSE@ src/processor/module_comparer.o \ |
| michael@0 | 486 | @DISABLE_PROCESSOR_FALSE@ src/processor/module_serializer.o \ |
| michael@0 | 487 | @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ |
| michael@0 | 488 | @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ |
| michael@0 | 489 | @DISABLE_PROCESSOR_FALSE@ src/processor/source_line_resolver_base.o \ |
| michael@0 | 490 | @@ -1859,16 +1885,17 @@ |
| michael@0 | 491 | @DISABLE_PROCESSOR_FALSE@src_processor_minidump_processor_unittest_CPPFLAGS = \ |
| michael@0 | 492 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src \ |
| michael@0 | 493 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/include \ |
| michael@0 | 494 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/gtest/include \ |
| michael@0 | 495 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing/gtest \ |
| michael@0 | 496 | @DISABLE_PROCESSOR_FALSE@ -I$(top_srcdir)/src/testing |
| michael@0 | 497 | |
| michael@0 | 498 | @DISABLE_PROCESSOR_FALSE@src_processor_minidump_processor_unittest_LDADD = \ |
| michael@0 | 499 | +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ |
| michael@0 | 500 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.o \ |
| michael@0 | 501 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ |
| michael@0 | 502 | @DISABLE_PROCESSOR_FALSE@ src/processor/call_stack.o \ |
| michael@0 | 503 | @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ |
| michael@0 | 504 | @DISABLE_PROCESSOR_FALSE@ src/processor/disassembler_x86.o \ |
| michael@0 | 505 | @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability.o \ |
| michael@0 | 506 | @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability_win.o \ |
| michael@0 | 507 | @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ |
| michael@0 | 508 | @@ -1984,16 +2011,17 @@ |
| michael@0 | 509 | @DISABLE_PROCESSOR_FALSE@src_processor_pathname_stripper_unittest_LDADD = \ |
| michael@0 | 510 | @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ |
| michael@0 | 511 | @DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) |
| michael@0 | 512 | |
| michael@0 | 513 | @DISABLE_PROCESSOR_FALSE@src_processor_postfix_evaluator_unittest_SOURCES = \ |
| michael@0 | 514 | @DISABLE_PROCESSOR_FALSE@ src/processor/postfix_evaluator_unittest.cc |
| michael@0 | 515 | |
| michael@0 | 516 | @DISABLE_PROCESSOR_FALSE@src_processor_postfix_evaluator_unittest_LDADD = \ |
| michael@0 | 517 | +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ |
| michael@0 | 518 | @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ |
| michael@0 | 519 | @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o \ |
| michael@0 | 520 | @DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) |
| michael@0 | 521 | |
| michael@0 | 522 | @DISABLE_PROCESSOR_FALSE@src_processor_range_map_unittest_SOURCES = \ |
| michael@0 | 523 | @DISABLE_PROCESSOR_FALSE@ src/processor/range_map_unittest.cc |
| michael@0 | 524 | |
| michael@0 | 525 | @DISABLE_PROCESSOR_FALSE@src_processor_range_map_unittest_LDADD = \ |
| michael@0 | 526 | @@ -2122,16 +2150,17 @@ |
| michael@0 | 527 | @DISABLE_PROCESSOR_FALSE@ src/processor/logging.o \ |
| michael@0 | 528 | @DISABLE_PROCESSOR_FALSE@ src/processor/minidump.o \ |
| michael@0 | 529 | @DISABLE_PROCESSOR_FALSE@ src/processor/pathname_stripper.o |
| michael@0 | 530 | |
| michael@0 | 531 | @DISABLE_PROCESSOR_FALSE@src_processor_minidump_stackwalk_SOURCES = \ |
| michael@0 | 532 | @DISABLE_PROCESSOR_FALSE@ src/processor/minidump_stackwalk.cc |
| michael@0 | 533 | |
| michael@0 | 534 | @DISABLE_PROCESSOR_FALSE@src_processor_minidump_stackwalk_LDADD = \ |
| michael@0 | 535 | +@DISABLE_PROCESSOR_FALSE@ src/common/module.o \ |
| michael@0 | 536 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_code_modules.o \ |
| michael@0 | 537 | @DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.o \ |
| michael@0 | 538 | @DISABLE_PROCESSOR_FALSE@ src/processor/binarystream.o \ |
| michael@0 | 539 | @DISABLE_PROCESSOR_FALSE@ src/processor/call_stack.o \ |
| michael@0 | 540 | @DISABLE_PROCESSOR_FALSE@ src/processor/cfi_frame_info.o \ |
| michael@0 | 541 | @DISABLE_PROCESSOR_FALSE@ src/processor/disassembler_x86.o \ |
| michael@0 | 542 | @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability.o \ |
| michael@0 | 543 | @DISABLE_PROCESSOR_FALSE@ src/processor/exploitability_win.o \ |
| michael@0 | 544 | @@ -2289,17 +2318,17 @@ |
| michael@0 | 545 | src/tools/windows/dump_syms/testdata/dump_syms_regtest.sym \ |
| michael@0 | 546 | src/tools/windows/symupload/symupload.cc \ |
| michael@0 | 547 | src/tools/windows/symupload/symupload.vcproj |
| michael@0 | 548 | |
| michael@0 | 549 | all: all-am |
| michael@0 | 550 | |
| michael@0 | 551 | .SUFFIXES: |
| michael@0 | 552 | .SUFFIXES: .S .c .cc .o .obj |
| michael@0 | 553 | -am--refresh: |
| michael@0 | 554 | +am--refresh: Makefile |
| michael@0 | 555 | @: |
| michael@0 | 556 | $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
| michael@0 | 557 | @for dep in $?; do \ |
| michael@0 | 558 | case '$(am__configure_deps)' in \ |
| michael@0 | 559 | *$$dep*) \ |
| michael@0 | 560 | echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ |
| michael@0 | 561 | $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ |
| michael@0 | 562 | && exit 0; \ |
| michael@0 | 563 | @@ -2325,20 +2354,18 @@ |
| michael@0 | 564 | |
| michael@0 | 565 | $(top_srcdir)/configure: $(am__configure_deps) |
| michael@0 | 566 | $(am__cd) $(srcdir) && $(AUTOCONF) |
| michael@0 | 567 | $(ACLOCAL_M4): $(am__aclocal_m4_deps) |
| michael@0 | 568 | $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
| michael@0 | 569 | $(am__aclocal_m4_deps): |
| michael@0 | 570 | |
| michael@0 | 571 | src/config.h: src/stamp-h1 |
| michael@0 | 572 | - @if test ! -f $@; then \ |
| michael@0 | 573 | - rm -f src/stamp-h1; \ |
| michael@0 | 574 | - $(MAKE) $(AM_MAKEFLAGS) src/stamp-h1; \ |
| michael@0 | 575 | - else :; fi |
| michael@0 | 576 | + @if test ! -f $@; then rm -f src/stamp-h1; else :; fi |
| michael@0 | 577 | + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) src/stamp-h1; else :; fi |
| michael@0 | 578 | |
| michael@0 | 579 | src/stamp-h1: $(top_srcdir)/src/config.h.in $(top_builddir)/config.status |
| michael@0 | 580 | @rm -f src/stamp-h1 |
| michael@0 | 581 | cd $(top_builddir) && $(SHELL) ./config.status src/config.h |
| michael@0 | 582 | $(top_srcdir)/src/config.h.in: $(am__configure_deps) |
| michael@0 | 583 | ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) |
| michael@0 | 584 | rm -f src/stamp-h1 |
| michael@0 | 585 | touch $@ |
| michael@0 | 586 | @@ -2366,19 +2393,17 @@ |
| michael@0 | 587 | ( cd "$(DESTDIR)$(libdir)" && $(RANLIB) $$f ) || exit $$?; \ |
| michael@0 | 588 | else :; fi; \ |
| michael@0 | 589 | done |
| michael@0 | 590 | |
| michael@0 | 591 | uninstall-libLIBRARIES: |
| michael@0 | 592 | @$(NORMAL_UNINSTALL) |
| michael@0 | 593 | @list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \ |
| michael@0 | 594 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
| michael@0 | 595 | - test -n "$$files" || exit 0; \ |
| michael@0 | 596 | - echo " ( cd '$(DESTDIR)$(libdir)' && rm -f "$$files" )"; \ |
| michael@0 | 597 | - cd "$(DESTDIR)$(libdir)" && rm -f $$files |
| michael@0 | 598 | + dir='$(DESTDIR)$(libdir)'; $(am__uninstall_files_from_dir) |
| michael@0 | 599 | |
| michael@0 | 600 | clean-libLIBRARIES: |
| michael@0 | 601 | -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES) |
| michael@0 | 602 | |
| michael@0 | 603 | clean-noinstLIBRARIES: |
| michael@0 | 604 | -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) |
| michael@0 | 605 | src/client/linux/crash_generation/$(am__dirstamp): |
| michael@0 | 606 | @$(MKDIR_P) src/client/linux/crash_generation |
| michael@0 | 607 | @@ -2477,20 +2502,22 @@ |
| michael@0 | 608 | @$(MKDIR_P) src/common/android/$(DEPDIR) |
| michael@0 | 609 | @: > src/common/android/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 610 | src/common/android/breakpad_getcontext.$(OBJEXT): \ |
| michael@0 | 611 | src/common/android/$(am__dirstamp) \ |
| michael@0 | 612 | src/common/android/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 613 | src/client/linux/$(am__dirstamp): |
| michael@0 | 614 | @$(MKDIR_P) src/client/linux |
| michael@0 | 615 | @: > src/client/linux/$(am__dirstamp) |
| michael@0 | 616 | -src/client/linux/libbreakpad_client.a: $(src_client_linux_libbreakpad_client_a_OBJECTS) $(src_client_linux_libbreakpad_client_a_DEPENDENCIES) src/client/linux/$(am__dirstamp) |
| michael@0 | 617 | +src/client/linux/libbreakpad_client.a: $(src_client_linux_libbreakpad_client_a_OBJECTS) $(src_client_linux_libbreakpad_client_a_DEPENDENCIES) $(EXTRA_src_client_linux_libbreakpad_client_a_DEPENDENCIES) src/client/linux/$(am__dirstamp) |
| michael@0 | 618 | -rm -f src/client/linux/libbreakpad_client.a |
| michael@0 | 619 | $(src_client_linux_libbreakpad_client_a_AR) src/client/linux/libbreakpad_client.a $(src_client_linux_libbreakpad_client_a_OBJECTS) $(src_client_linux_libbreakpad_client_a_LIBADD) |
| michael@0 | 620 | $(RANLIB) src/client/linux/libbreakpad_client.a |
| michael@0 | 621 | +src/common/module.$(OBJEXT): src/common/$(am__dirstamp) \ |
| michael@0 | 622 | + src/common/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 623 | src/processor/$(am__dirstamp): |
| michael@0 | 624 | @$(MKDIR_P) src/processor |
| michael@0 | 625 | @: > src/processor/$(am__dirstamp) |
| michael@0 | 626 | src/processor/$(DEPDIR)/$(am__dirstamp): |
| michael@0 | 627 | @$(MKDIR_P) src/processor/$(DEPDIR) |
| michael@0 | 628 | @: > src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 629 | src/processor/basic_code_modules.$(OBJEXT): \ |
| michael@0 | 630 | src/processor/$(am__dirstamp) \ |
| michael@0 | 631 | @@ -2559,17 +2586,17 @@ |
| michael@0 | 632 | src/processor/stackwalker_x86.$(OBJEXT): \ |
| michael@0 | 633 | src/processor/$(am__dirstamp) \ |
| michael@0 | 634 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 635 | src/processor/tokenize.$(OBJEXT): src/processor/$(am__dirstamp) \ |
| michael@0 | 636 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 637 | src/$(am__dirstamp): |
| michael@0 | 638 | @$(MKDIR_P) src |
| michael@0 | 639 | @: > src/$(am__dirstamp) |
| michael@0 | 640 | -src/libbreakpad.a: $(src_libbreakpad_a_OBJECTS) $(src_libbreakpad_a_DEPENDENCIES) src/$(am__dirstamp) |
| michael@0 | 641 | +src/libbreakpad.a: $(src_libbreakpad_a_OBJECTS) $(src_libbreakpad_a_DEPENDENCIES) $(EXTRA_src_libbreakpad_a_DEPENDENCIES) src/$(am__dirstamp) |
| michael@0 | 642 | -rm -f src/libbreakpad.a |
| michael@0 | 643 | $(src_libbreakpad_a_AR) src/libbreakpad.a $(src_libbreakpad_a_OBJECTS) $(src_libbreakpad_a_LIBADD) |
| michael@0 | 644 | $(RANLIB) src/libbreakpad.a |
| michael@0 | 645 | src/third_party/libdisasm/$(am__dirstamp): |
| michael@0 | 646 | @$(MKDIR_P) src/third_party/libdisasm |
| michael@0 | 647 | @: > src/third_party/libdisasm/$(am__dirstamp) |
| michael@0 | 648 | src/third_party/libdisasm/$(DEPDIR)/$(am__dirstamp): |
| michael@0 | 649 | @$(MKDIR_P) src/third_party/libdisasm/$(DEPDIR) |
| michael@0 | 650 | @@ -2611,17 +2638,17 @@ |
| michael@0 | 651 | src/third_party/libdisasm/$(am__dirstamp) \ |
| michael@0 | 652 | src/third_party/libdisasm/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 653 | src/third_party/libdisasm/x86_misc.$(OBJEXT): \ |
| michael@0 | 654 | src/third_party/libdisasm/$(am__dirstamp) \ |
| michael@0 | 655 | src/third_party/libdisasm/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 656 | src/third_party/libdisasm/x86_operand_list.$(OBJEXT): \ |
| michael@0 | 657 | src/third_party/libdisasm/$(am__dirstamp) \ |
| michael@0 | 658 | src/third_party/libdisasm/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 659 | -src/third_party/libdisasm/libdisasm.a: $(src_third_party_libdisasm_libdisasm_a_OBJECTS) $(src_third_party_libdisasm_libdisasm_a_DEPENDENCIES) src/third_party/libdisasm/$(am__dirstamp) |
| michael@0 | 660 | +src/third_party/libdisasm/libdisasm.a: $(src_third_party_libdisasm_libdisasm_a_OBJECTS) $(src_third_party_libdisasm_libdisasm_a_DEPENDENCIES) $(EXTRA_src_third_party_libdisasm_libdisasm_a_DEPENDENCIES) src/third_party/libdisasm/$(am__dirstamp) |
| michael@0 | 661 | -rm -f src/third_party/libdisasm/libdisasm.a |
| michael@0 | 662 | $(src_third_party_libdisasm_libdisasm_a_AR) src/third_party/libdisasm/libdisasm.a $(src_third_party_libdisasm_libdisasm_a_OBJECTS) $(src_third_party_libdisasm_libdisasm_a_LIBADD) |
| michael@0 | 663 | $(RANLIB) src/third_party/libdisasm/libdisasm.a |
| michael@0 | 664 | install-binPROGRAMS: $(bin_PROGRAMS) |
| michael@0 | 665 | @$(NORMAL_INSTALL) |
| michael@0 | 666 | test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
| michael@0 | 667 | @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
| michael@0 | 668 | for p in $$list; do echo "$$p $$p"; done | \ |
| michael@0 | 669 | @@ -2658,17 +2685,17 @@ |
| michael@0 | 670 | clean-binPROGRAMS: |
| michael@0 | 671 | -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) |
| michael@0 | 672 | |
| michael@0 | 673 | clean-checkPROGRAMS: |
| michael@0 | 674 | -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) |
| michael@0 | 675 | |
| michael@0 | 676 | clean-noinstPROGRAMS: |
| michael@0 | 677 | -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) |
| michael@0 | 678 | -src/client/linux/linux_client_unittest$(EXEEXT): $(src_client_linux_linux_client_unittest_OBJECTS) $(src_client_linux_linux_client_unittest_DEPENDENCIES) src/client/linux/$(am__dirstamp) |
| michael@0 | 679 | +src/client/linux/linux_client_unittest$(EXEEXT): $(src_client_linux_linux_client_unittest_OBJECTS) $(src_client_linux_linux_client_unittest_DEPENDENCIES) $(EXTRA_src_client_linux_linux_client_unittest_DEPENDENCIES) src/client/linux/$(am__dirstamp) |
| michael@0 | 680 | @rm -f src/client/linux/linux_client_unittest$(EXEEXT) |
| michael@0 | 681 | $(src_client_linux_linux_client_unittest_LINK) $(src_client_linux_linux_client_unittest_OBJECTS) $(src_client_linux_linux_client_unittest_LDADD) $(LIBS) |
| michael@0 | 682 | src/client/linux/handler/src_client_linux_linux_client_unittest_shlib-exception_handler_unittest.$(OBJEXT): \ |
| michael@0 | 683 | src/client/linux/handler/$(am__dirstamp) \ |
| michael@0 | 684 | src/client/linux/handler/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 685 | src/client/linux/minidump_writer/src_client_linux_linux_client_unittest_shlib-directory_reader_unittest.$(OBJEXT): \ |
| michael@0 | 686 | src/client/linux/minidump_writer/$(am__dirstamp) \ |
| michael@0 | 687 | src/client/linux/minidump_writer/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 688 | @@ -2751,23 +2778,23 @@ |
| michael@0 | 689 | src/processor/$(am__dirstamp) \ |
| michael@0 | 690 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 691 | src/common/android/src_client_linux_linux_client_unittest_shlib-breakpad_getcontext.$(OBJEXT): \ |
| michael@0 | 692 | src/common/android/$(am__dirstamp) \ |
| michael@0 | 693 | src/common/android/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 694 | src/common/android/src_client_linux_linux_client_unittest_shlib-breakpad_getcontext_unittest.$(OBJEXT): \ |
| michael@0 | 695 | src/common/android/$(am__dirstamp) \ |
| michael@0 | 696 | src/common/android/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 697 | -src/client/linux/linux_client_unittest_shlib$(EXEEXT): $(src_client_linux_linux_client_unittest_shlib_OBJECTS) $(src_client_linux_linux_client_unittest_shlib_DEPENDENCIES) src/client/linux/$(am__dirstamp) |
| michael@0 | 698 | +src/client/linux/linux_client_unittest_shlib$(EXEEXT): $(src_client_linux_linux_client_unittest_shlib_OBJECTS) $(src_client_linux_linux_client_unittest_shlib_DEPENDENCIES) $(EXTRA_src_client_linux_linux_client_unittest_shlib_DEPENDENCIES) src/client/linux/$(am__dirstamp) |
| michael@0 | 699 | @rm -f src/client/linux/linux_client_unittest_shlib$(EXEEXT) |
| michael@0 | 700 | $(src_client_linux_linux_client_unittest_shlib_LINK) $(src_client_linux_linux_client_unittest_shlib_OBJECTS) $(src_client_linux_linux_client_unittest_shlib_LDADD) $(LIBS) |
| michael@0 | 701 | src/client/linux/minidump_writer/src_client_linux_linux_dumper_unittest_helper-linux_dumper_unittest_helper.$(OBJEXT): \ |
| michael@0 | 702 | src/client/linux/minidump_writer/$(am__dirstamp) \ |
| michael@0 | 703 | src/client/linux/minidump_writer/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 704 | -src/client/linux/linux_dumper_unittest_helper$(EXEEXT): $(src_client_linux_linux_dumper_unittest_helper_OBJECTS) $(src_client_linux_linux_dumper_unittest_helper_DEPENDENCIES) src/client/linux/$(am__dirstamp) |
| michael@0 | 705 | +src/client/linux/linux_dumper_unittest_helper$(EXEEXT): $(src_client_linux_linux_dumper_unittest_helper_OBJECTS) $(src_client_linux_linux_dumper_unittest_helper_DEPENDENCIES) $(EXTRA_src_client_linux_linux_dumper_unittest_helper_DEPENDENCIES) src/client/linux/$(am__dirstamp) |
| michael@0 | 706 | @rm -f src/client/linux/linux_dumper_unittest_helper$(EXEEXT) |
| michael@0 | 707 | $(src_client_linux_linux_dumper_unittest_helper_LINK) $(src_client_linux_linux_dumper_unittest_helper_OBJECTS) $(src_client_linux_linux_dumper_unittest_helper_LDADD) $(LIBS) |
| michael@0 | 708 | src/common/src_common_dumper_unittest-byte_cursor_unittest.$(OBJEXT): \ |
| michael@0 | 709 | src/common/$(am__dirstamp) \ |
| michael@0 | 710 | src/common/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 711 | src/common/src_common_dumper_unittest-dwarf_cfi_to_module.$(OBJEXT): \ |
| michael@0 | 712 | src/common/$(am__dirstamp) \ |
| michael@0 | 713 | src/common/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 714 | @@ -2901,17 +2928,17 @@ |
| michael@0 | 715 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 716 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 717 | src/testing/gtest/src/src_common_dumper_unittest-gtest_main.$(OBJEXT): \ |
| michael@0 | 718 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 719 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 720 | src/testing/src/src_common_dumper_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 721 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 722 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 723 | -src/common/dumper_unittest$(EXEEXT): $(src_common_dumper_unittest_OBJECTS) $(src_common_dumper_unittest_DEPENDENCIES) src/common/$(am__dirstamp) |
| michael@0 | 724 | +src/common/dumper_unittest$(EXEEXT): $(src_common_dumper_unittest_OBJECTS) $(src_common_dumper_unittest_DEPENDENCIES) $(EXTRA_src_common_dumper_unittest_DEPENDENCIES) src/common/$(am__dirstamp) |
| michael@0 | 725 | @rm -f src/common/dumper_unittest$(EXEEXT) |
| michael@0 | 726 | $(CXXLINK) $(src_common_dumper_unittest_OBJECTS) $(src_common_dumper_unittest_LDADD) $(LIBS) |
| michael@0 | 727 | src/common/src_common_test_assembler_unittest-test_assembler.$(OBJEXT): \ |
| michael@0 | 728 | src/common/$(am__dirstamp) \ |
| michael@0 | 729 | src/common/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 730 | src/common/src_common_test_assembler_unittest-test_assembler_unittest.$(OBJEXT): \ |
| michael@0 | 731 | src/common/$(am__dirstamp) \ |
| michael@0 | 732 | src/common/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 733 | @@ -2919,145 +2946,145 @@ |
| michael@0 | 734 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 735 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 736 | src/testing/gtest/src/src_common_test_assembler_unittest-gtest_main.$(OBJEXT): \ |
| michael@0 | 737 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 738 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 739 | src/testing/src/src_common_test_assembler_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 740 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 741 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 742 | -src/common/test_assembler_unittest$(EXEEXT): $(src_common_test_assembler_unittest_OBJECTS) $(src_common_test_assembler_unittest_DEPENDENCIES) src/common/$(am__dirstamp) |
| michael@0 | 743 | +src/common/test_assembler_unittest$(EXEEXT): $(src_common_test_assembler_unittest_OBJECTS) $(src_common_test_assembler_unittest_DEPENDENCIES) $(EXTRA_src_common_test_assembler_unittest_DEPENDENCIES) src/common/$(am__dirstamp) |
| michael@0 | 744 | @rm -f src/common/test_assembler_unittest$(EXEEXT) |
| michael@0 | 745 | $(CXXLINK) $(src_common_test_assembler_unittest_OBJECTS) $(src_common_test_assembler_unittest_LDADD) $(LIBS) |
| michael@0 | 746 | src/processor/address_map_unittest.$(OBJEXT): \ |
| michael@0 | 747 | src/processor/$(am__dirstamp) \ |
| michael@0 | 748 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 749 | -src/processor/address_map_unittest$(EXEEXT): $(src_processor_address_map_unittest_OBJECTS) $(src_processor_address_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 750 | +src/processor/address_map_unittest$(EXEEXT): $(src_processor_address_map_unittest_OBJECTS) $(src_processor_address_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_address_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 751 | @rm -f src/processor/address_map_unittest$(EXEEXT) |
| michael@0 | 752 | $(CXXLINK) $(src_processor_address_map_unittest_OBJECTS) $(src_processor_address_map_unittest_LDADD) $(LIBS) |
| michael@0 | 753 | src/processor/src_processor_basic_source_line_resolver_unittest-basic_source_line_resolver_unittest.$(OBJEXT): \ |
| michael@0 | 754 | src/processor/$(am__dirstamp) \ |
| michael@0 | 755 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 756 | src/testing/gtest/src/src_processor_basic_source_line_resolver_unittest-gtest-all.$(OBJEXT): \ |
| michael@0 | 757 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 758 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 759 | src/testing/src/src_processor_basic_source_line_resolver_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 760 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 761 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 762 | -src/processor/basic_source_line_resolver_unittest$(EXEEXT): $(src_processor_basic_source_line_resolver_unittest_OBJECTS) $(src_processor_basic_source_line_resolver_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 763 | +src/processor/basic_source_line_resolver_unittest$(EXEEXT): $(src_processor_basic_source_line_resolver_unittest_OBJECTS) $(src_processor_basic_source_line_resolver_unittest_DEPENDENCIES) $(EXTRA_src_processor_basic_source_line_resolver_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 764 | @rm -f src/processor/basic_source_line_resolver_unittest$(EXEEXT) |
| michael@0 | 765 | $(CXXLINK) $(src_processor_basic_source_line_resolver_unittest_OBJECTS) $(src_processor_basic_source_line_resolver_unittest_LDADD) $(LIBS) |
| michael@0 | 766 | src/processor/src_processor_binarystream_unittest-binarystream_unittest.$(OBJEXT): \ |
| michael@0 | 767 | src/processor/$(am__dirstamp) \ |
| michael@0 | 768 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 769 | src/testing/gtest/src/src_processor_binarystream_unittest-gtest-all.$(OBJEXT): \ |
| michael@0 | 770 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 771 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 772 | src/testing/src/src_processor_binarystream_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 773 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 774 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 775 | -src/processor/binarystream_unittest$(EXEEXT): $(src_processor_binarystream_unittest_OBJECTS) $(src_processor_binarystream_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 776 | +src/processor/binarystream_unittest$(EXEEXT): $(src_processor_binarystream_unittest_OBJECTS) $(src_processor_binarystream_unittest_DEPENDENCIES) $(EXTRA_src_processor_binarystream_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 777 | @rm -f src/processor/binarystream_unittest$(EXEEXT) |
| michael@0 | 778 | $(CXXLINK) $(src_processor_binarystream_unittest_OBJECTS) $(src_processor_binarystream_unittest_LDADD) $(LIBS) |
| michael@0 | 779 | src/processor/src_processor_cfi_frame_info_unittest-cfi_frame_info_unittest.$(OBJEXT): \ |
| michael@0 | 780 | src/processor/$(am__dirstamp) \ |
| michael@0 | 781 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 782 | src/testing/gtest/src/src_processor_cfi_frame_info_unittest-gtest-all.$(OBJEXT): \ |
| michael@0 | 783 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 784 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 785 | src/testing/gtest/src/src_processor_cfi_frame_info_unittest-gtest_main.$(OBJEXT): \ |
| michael@0 | 786 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 787 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 788 | src/testing/src/src_processor_cfi_frame_info_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 789 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 790 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 791 | -src/processor/cfi_frame_info_unittest$(EXEEXT): $(src_processor_cfi_frame_info_unittest_OBJECTS) $(src_processor_cfi_frame_info_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 792 | +src/processor/cfi_frame_info_unittest$(EXEEXT): $(src_processor_cfi_frame_info_unittest_OBJECTS) $(src_processor_cfi_frame_info_unittest_DEPENDENCIES) $(EXTRA_src_processor_cfi_frame_info_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 793 | @rm -f src/processor/cfi_frame_info_unittest$(EXEEXT) |
| michael@0 | 794 | $(CXXLINK) $(src_processor_cfi_frame_info_unittest_OBJECTS) $(src_processor_cfi_frame_info_unittest_LDADD) $(LIBS) |
| michael@0 | 795 | src/processor/contained_range_map_unittest.$(OBJEXT): \ |
| michael@0 | 796 | src/processor/$(am__dirstamp) \ |
| michael@0 | 797 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 798 | -src/processor/contained_range_map_unittest$(EXEEXT): $(src_processor_contained_range_map_unittest_OBJECTS) $(src_processor_contained_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 799 | +src/processor/contained_range_map_unittest$(EXEEXT): $(src_processor_contained_range_map_unittest_OBJECTS) $(src_processor_contained_range_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_contained_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 800 | @rm -f src/processor/contained_range_map_unittest$(EXEEXT) |
| michael@0 | 801 | $(CXXLINK) $(src_processor_contained_range_map_unittest_OBJECTS) $(src_processor_contained_range_map_unittest_LDADD) $(LIBS) |
| michael@0 | 802 | src/processor/src_processor_disassembler_x86_unittest-disassembler_x86_unittest.$(OBJEXT): \ |
| michael@0 | 803 | src/processor/$(am__dirstamp) \ |
| michael@0 | 804 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 805 | src/testing/gtest/src/src_processor_disassembler_x86_unittest-gtest-all.$(OBJEXT): \ |
| michael@0 | 806 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 807 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 808 | src/testing/gtest/src/src_processor_disassembler_x86_unittest-gtest_main.$(OBJEXT): \ |
| michael@0 | 809 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 810 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 811 | src/testing/src/src_processor_disassembler_x86_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 812 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 813 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 814 | -src/processor/disassembler_x86_unittest$(EXEEXT): $(src_processor_disassembler_x86_unittest_OBJECTS) $(src_processor_disassembler_x86_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 815 | +src/processor/disassembler_x86_unittest$(EXEEXT): $(src_processor_disassembler_x86_unittest_OBJECTS) $(src_processor_disassembler_x86_unittest_DEPENDENCIES) $(EXTRA_src_processor_disassembler_x86_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 816 | @rm -f src/processor/disassembler_x86_unittest$(EXEEXT) |
| michael@0 | 817 | $(CXXLINK) $(src_processor_disassembler_x86_unittest_OBJECTS) $(src_processor_disassembler_x86_unittest_LDADD) $(LIBS) |
| michael@0 | 818 | src/processor/src_processor_exploitability_unittest-exploitability_unittest.$(OBJEXT): \ |
| michael@0 | 819 | src/processor/$(am__dirstamp) \ |
| michael@0 | 820 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 821 | src/testing/gtest/src/src_processor_exploitability_unittest-gtest-all.$(OBJEXT): \ |
| michael@0 | 822 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 823 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 824 | src/testing/gtest/src/src_processor_exploitability_unittest-gtest_main.$(OBJEXT): \ |
| michael@0 | 825 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 826 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 827 | src/testing/src/src_processor_exploitability_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 828 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 829 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 830 | -src/processor/exploitability_unittest$(EXEEXT): $(src_processor_exploitability_unittest_OBJECTS) $(src_processor_exploitability_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 831 | +src/processor/exploitability_unittest$(EXEEXT): $(src_processor_exploitability_unittest_OBJECTS) $(src_processor_exploitability_unittest_DEPENDENCIES) $(EXTRA_src_processor_exploitability_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 832 | @rm -f src/processor/exploitability_unittest$(EXEEXT) |
| michael@0 | 833 | $(CXXLINK) $(src_processor_exploitability_unittest_OBJECTS) $(src_processor_exploitability_unittest_LDADD) $(LIBS) |
| michael@0 | 834 | src/processor/src_processor_fast_source_line_resolver_unittest-fast_source_line_resolver_unittest.$(OBJEXT): \ |
| michael@0 | 835 | src/processor/$(am__dirstamp) \ |
| michael@0 | 836 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 837 | src/testing/gtest/src/src_processor_fast_source_line_resolver_unittest-gtest-all.$(OBJEXT): \ |
| michael@0 | 838 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 839 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 840 | src/testing/src/src_processor_fast_source_line_resolver_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 841 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 842 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 843 | -src/processor/fast_source_line_resolver_unittest$(EXEEXT): $(src_processor_fast_source_line_resolver_unittest_OBJECTS) $(src_processor_fast_source_line_resolver_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 844 | +src/processor/fast_source_line_resolver_unittest$(EXEEXT): $(src_processor_fast_source_line_resolver_unittest_OBJECTS) $(src_processor_fast_source_line_resolver_unittest_DEPENDENCIES) $(EXTRA_src_processor_fast_source_line_resolver_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 845 | @rm -f src/processor/fast_source_line_resolver_unittest$(EXEEXT) |
| michael@0 | 846 | $(CXXLINK) $(src_processor_fast_source_line_resolver_unittest_OBJECTS) $(src_processor_fast_source_line_resolver_unittest_LDADD) $(LIBS) |
| michael@0 | 847 | src/processor/src_processor_map_serializers_unittest-map_serializers_unittest.$(OBJEXT): \ |
| michael@0 | 848 | src/processor/$(am__dirstamp) \ |
| michael@0 | 849 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 850 | src/testing/gtest/src/src_processor_map_serializers_unittest-gtest-all.$(OBJEXT): \ |
| michael@0 | 851 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 852 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 853 | src/testing/src/src_processor_map_serializers_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 854 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 855 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 856 | -src/processor/map_serializers_unittest$(EXEEXT): $(src_processor_map_serializers_unittest_OBJECTS) $(src_processor_map_serializers_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 857 | +src/processor/map_serializers_unittest$(EXEEXT): $(src_processor_map_serializers_unittest_OBJECTS) $(src_processor_map_serializers_unittest_DEPENDENCIES) $(EXTRA_src_processor_map_serializers_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 858 | @rm -f src/processor/map_serializers_unittest$(EXEEXT) |
| michael@0 | 859 | $(CXXLINK) $(src_processor_map_serializers_unittest_OBJECTS) $(src_processor_map_serializers_unittest_LDADD) $(LIBS) |
| michael@0 | 860 | src/processor/minidump_dump.$(OBJEXT): src/processor/$(am__dirstamp) \ |
| michael@0 | 861 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 862 | -src/processor/minidump_dump$(EXEEXT): $(src_processor_minidump_dump_OBJECTS) $(src_processor_minidump_dump_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 863 | +src/processor/minidump_dump$(EXEEXT): $(src_processor_minidump_dump_OBJECTS) $(src_processor_minidump_dump_DEPENDENCIES) $(EXTRA_src_processor_minidump_dump_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 864 | @rm -f src/processor/minidump_dump$(EXEEXT) |
| michael@0 | 865 | $(CXXLINK) $(src_processor_minidump_dump_OBJECTS) $(src_processor_minidump_dump_LDADD) $(LIBS) |
| michael@0 | 866 | src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.$(OBJEXT): \ |
| michael@0 | 867 | src/processor/$(am__dirstamp) \ |
| michael@0 | 868 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 869 | src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.$(OBJEXT): \ |
| michael@0 | 870 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 871 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 872 | src/testing/src/src_processor_minidump_processor_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 873 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 874 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 875 | -src/processor/minidump_processor_unittest$(EXEEXT): $(src_processor_minidump_processor_unittest_OBJECTS) $(src_processor_minidump_processor_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 876 | +src/processor/minidump_processor_unittest$(EXEEXT): $(src_processor_minidump_processor_unittest_OBJECTS) $(src_processor_minidump_processor_unittest_DEPENDENCIES) $(EXTRA_src_processor_minidump_processor_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 877 | @rm -f src/processor/minidump_processor_unittest$(EXEEXT) |
| michael@0 | 878 | $(CXXLINK) $(src_processor_minidump_processor_unittest_OBJECTS) $(src_processor_minidump_processor_unittest_LDADD) $(LIBS) |
| michael@0 | 879 | src/processor/minidump_stackwalk.$(OBJEXT): \ |
| michael@0 | 880 | src/processor/$(am__dirstamp) \ |
| michael@0 | 881 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 882 | -src/processor/minidump_stackwalk$(EXEEXT): $(src_processor_minidump_stackwalk_OBJECTS) $(src_processor_minidump_stackwalk_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 883 | +src/processor/minidump_stackwalk$(EXEEXT): $(src_processor_minidump_stackwalk_OBJECTS) $(src_processor_minidump_stackwalk_DEPENDENCIES) $(EXTRA_src_processor_minidump_stackwalk_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 884 | @rm -f src/processor/minidump_stackwalk$(EXEEXT) |
| michael@0 | 885 | $(CXXLINK) $(src_processor_minidump_stackwalk_OBJECTS) $(src_processor_minidump_stackwalk_LDADD) $(LIBS) |
| michael@0 | 886 | src/common/src_processor_minidump_unittest-test_assembler.$(OBJEXT): \ |
| michael@0 | 887 | src/common/$(am__dirstamp) \ |
| michael@0 | 888 | src/common/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 889 | src/processor/src_processor_minidump_unittest-minidump_unittest.$(OBJEXT): \ |
| michael@0 | 890 | src/processor/$(am__dirstamp) \ |
| michael@0 | 891 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 892 | @@ -3068,35 +3095,35 @@ |
| michael@0 | 893 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 894 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 895 | src/testing/gtest/src/src_processor_minidump_unittest-gtest_main.$(OBJEXT): \ |
| michael@0 | 896 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 897 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 898 | src/testing/src/src_processor_minidump_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 899 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 900 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 901 | -src/processor/minidump_unittest$(EXEEXT): $(src_processor_minidump_unittest_OBJECTS) $(src_processor_minidump_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 902 | +src/processor/minidump_unittest$(EXEEXT): $(src_processor_minidump_unittest_OBJECTS) $(src_processor_minidump_unittest_DEPENDENCIES) $(EXTRA_src_processor_minidump_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 903 | @rm -f src/processor/minidump_unittest$(EXEEXT) |
| michael@0 | 904 | $(CXXLINK) $(src_processor_minidump_unittest_OBJECTS) $(src_processor_minidump_unittest_LDADD) $(LIBS) |
| michael@0 | 905 | src/processor/pathname_stripper_unittest.$(OBJEXT): \ |
| michael@0 | 906 | src/processor/$(am__dirstamp) \ |
| michael@0 | 907 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 908 | -src/processor/pathname_stripper_unittest$(EXEEXT): $(src_processor_pathname_stripper_unittest_OBJECTS) $(src_processor_pathname_stripper_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 909 | +src/processor/pathname_stripper_unittest$(EXEEXT): $(src_processor_pathname_stripper_unittest_OBJECTS) $(src_processor_pathname_stripper_unittest_DEPENDENCIES) $(EXTRA_src_processor_pathname_stripper_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 910 | @rm -f src/processor/pathname_stripper_unittest$(EXEEXT) |
| michael@0 | 911 | $(CXXLINK) $(src_processor_pathname_stripper_unittest_OBJECTS) $(src_processor_pathname_stripper_unittest_LDADD) $(LIBS) |
| michael@0 | 912 | src/processor/postfix_evaluator_unittest.$(OBJEXT): \ |
| michael@0 | 913 | src/processor/$(am__dirstamp) \ |
| michael@0 | 914 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 915 | -src/processor/postfix_evaluator_unittest$(EXEEXT): $(src_processor_postfix_evaluator_unittest_OBJECTS) $(src_processor_postfix_evaluator_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 916 | +src/processor/postfix_evaluator_unittest$(EXEEXT): $(src_processor_postfix_evaluator_unittest_OBJECTS) $(src_processor_postfix_evaluator_unittest_DEPENDENCIES) $(EXTRA_src_processor_postfix_evaluator_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 917 | @rm -f src/processor/postfix_evaluator_unittest$(EXEEXT) |
| michael@0 | 918 | $(CXXLINK) $(src_processor_postfix_evaluator_unittest_OBJECTS) $(src_processor_postfix_evaluator_unittest_LDADD) $(LIBS) |
| michael@0 | 919 | src/processor/range_map_unittest.$(OBJEXT): \ |
| michael@0 | 920 | src/processor/$(am__dirstamp) \ |
| michael@0 | 921 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 922 | -src/processor/range_map_unittest$(EXEEXT): $(src_processor_range_map_unittest_OBJECTS) $(src_processor_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 923 | +src/processor/range_map_unittest$(EXEEXT): $(src_processor_range_map_unittest_OBJECTS) $(src_processor_range_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 924 | @rm -f src/processor/range_map_unittest$(EXEEXT) |
| michael@0 | 925 | $(CXXLINK) $(src_processor_range_map_unittest_OBJECTS) $(src_processor_range_map_unittest_LDADD) $(LIBS) |
| michael@0 | 926 | src/common/src_processor_stackwalker_amd64_unittest-test_assembler.$(OBJEXT): \ |
| michael@0 | 927 | src/common/$(am__dirstamp) \ |
| michael@0 | 928 | src/common/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 929 | src/processor/src_processor_stackwalker_amd64_unittest-stackwalker_amd64_unittest.$(OBJEXT): \ |
| michael@0 | 930 | src/processor/$(am__dirstamp) \ |
| michael@0 | 931 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 932 | @@ -3104,17 +3131,17 @@ |
| michael@0 | 933 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 934 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 935 | src/testing/gtest/src/src_processor_stackwalker_amd64_unittest-gtest_main.$(OBJEXT): \ |
| michael@0 | 936 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 937 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 938 | src/testing/src/src_processor_stackwalker_amd64_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 939 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 940 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 941 | -src/processor/stackwalker_amd64_unittest$(EXEEXT): $(src_processor_stackwalker_amd64_unittest_OBJECTS) $(src_processor_stackwalker_amd64_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 942 | +src/processor/stackwalker_amd64_unittest$(EXEEXT): $(src_processor_stackwalker_amd64_unittest_OBJECTS) $(src_processor_stackwalker_amd64_unittest_DEPENDENCIES) $(EXTRA_src_processor_stackwalker_amd64_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 943 | @rm -f src/processor/stackwalker_amd64_unittest$(EXEEXT) |
| michael@0 | 944 | $(CXXLINK) $(src_processor_stackwalker_amd64_unittest_OBJECTS) $(src_processor_stackwalker_amd64_unittest_LDADD) $(LIBS) |
| michael@0 | 945 | src/common/src_processor_stackwalker_arm_unittest-test_assembler.$(OBJEXT): \ |
| michael@0 | 946 | src/common/$(am__dirstamp) \ |
| michael@0 | 947 | src/common/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 948 | src/processor/src_processor_stackwalker_arm_unittest-stackwalker_arm_unittest.$(OBJEXT): \ |
| michael@0 | 949 | src/processor/$(am__dirstamp) \ |
| michael@0 | 950 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 951 | @@ -3122,23 +3149,23 @@ |
| michael@0 | 952 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 953 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 954 | src/testing/gtest/src/src_processor_stackwalker_arm_unittest-gtest_main.$(OBJEXT): \ |
| michael@0 | 955 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 956 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 957 | src/testing/src/src_processor_stackwalker_arm_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 958 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 959 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 960 | -src/processor/stackwalker_arm_unittest$(EXEEXT): $(src_processor_stackwalker_arm_unittest_OBJECTS) $(src_processor_stackwalker_arm_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 961 | +src/processor/stackwalker_arm_unittest$(EXEEXT): $(src_processor_stackwalker_arm_unittest_OBJECTS) $(src_processor_stackwalker_arm_unittest_DEPENDENCIES) $(EXTRA_src_processor_stackwalker_arm_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 962 | @rm -f src/processor/stackwalker_arm_unittest$(EXEEXT) |
| michael@0 | 963 | $(CXXLINK) $(src_processor_stackwalker_arm_unittest_OBJECTS) $(src_processor_stackwalker_arm_unittest_LDADD) $(LIBS) |
| michael@0 | 964 | src/processor/stackwalker_selftest.$(OBJEXT): \ |
| michael@0 | 965 | src/processor/$(am__dirstamp) \ |
| michael@0 | 966 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 967 | -src/processor/stackwalker_selftest$(EXEEXT): $(src_processor_stackwalker_selftest_OBJECTS) $(src_processor_stackwalker_selftest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 968 | +src/processor/stackwalker_selftest$(EXEEXT): $(src_processor_stackwalker_selftest_OBJECTS) $(src_processor_stackwalker_selftest_DEPENDENCIES) $(EXTRA_src_processor_stackwalker_selftest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 969 | @rm -f src/processor/stackwalker_selftest$(EXEEXT) |
| michael@0 | 970 | $(CXXLINK) $(src_processor_stackwalker_selftest_OBJECTS) $(src_processor_stackwalker_selftest_LDADD) $(LIBS) |
| michael@0 | 971 | src/common/src_processor_stackwalker_x86_unittest-test_assembler.$(OBJEXT): \ |
| michael@0 | 972 | src/common/$(am__dirstamp) \ |
| michael@0 | 973 | src/common/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 974 | src/processor/src_processor_stackwalker_x86_unittest-stackwalker_x86_unittest.$(OBJEXT): \ |
| michael@0 | 975 | src/processor/$(am__dirstamp) \ |
| michael@0 | 976 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 977 | @@ -3146,65 +3173,65 @@ |
| michael@0 | 978 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 979 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 980 | src/testing/gtest/src/src_processor_stackwalker_x86_unittest-gtest_main.$(OBJEXT): \ |
| michael@0 | 981 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 982 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 983 | src/testing/src/src_processor_stackwalker_x86_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 984 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 985 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 986 | -src/processor/stackwalker_x86_unittest$(EXEEXT): $(src_processor_stackwalker_x86_unittest_OBJECTS) $(src_processor_stackwalker_x86_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 987 | +src/processor/stackwalker_x86_unittest$(EXEEXT): $(src_processor_stackwalker_x86_unittest_OBJECTS) $(src_processor_stackwalker_x86_unittest_DEPENDENCIES) $(EXTRA_src_processor_stackwalker_x86_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 988 | @rm -f src/processor/stackwalker_x86_unittest$(EXEEXT) |
| michael@0 | 989 | $(CXXLINK) $(src_processor_stackwalker_x86_unittest_OBJECTS) $(src_processor_stackwalker_x86_unittest_LDADD) $(LIBS) |
| michael@0 | 990 | src/processor/src_processor_static_address_map_unittest-static_address_map_unittest.$(OBJEXT): \ |
| michael@0 | 991 | src/processor/$(am__dirstamp) \ |
| michael@0 | 992 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 993 | src/testing/gtest/src/src_processor_static_address_map_unittest-gtest-all.$(OBJEXT): \ |
| michael@0 | 994 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 995 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 996 | src/testing/src/src_processor_static_address_map_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 997 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 998 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 999 | -src/processor/static_address_map_unittest$(EXEEXT): $(src_processor_static_address_map_unittest_OBJECTS) $(src_processor_static_address_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 1000 | +src/processor/static_address_map_unittest$(EXEEXT): $(src_processor_static_address_map_unittest_OBJECTS) $(src_processor_static_address_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_static_address_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 1001 | @rm -f src/processor/static_address_map_unittest$(EXEEXT) |
| michael@0 | 1002 | $(CXXLINK) $(src_processor_static_address_map_unittest_OBJECTS) $(src_processor_static_address_map_unittest_LDADD) $(LIBS) |
| michael@0 | 1003 | src/processor/src_processor_static_contained_range_map_unittest-static_contained_range_map_unittest.$(OBJEXT): \ |
| michael@0 | 1004 | src/processor/$(am__dirstamp) \ |
| michael@0 | 1005 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1006 | src/testing/gtest/src/src_processor_static_contained_range_map_unittest-gtest-all.$(OBJEXT): \ |
| michael@0 | 1007 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 1008 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1009 | src/testing/src/src_processor_static_contained_range_map_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 1010 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 1011 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1012 | -src/processor/static_contained_range_map_unittest$(EXEEXT): $(src_processor_static_contained_range_map_unittest_OBJECTS) $(src_processor_static_contained_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 1013 | +src/processor/static_contained_range_map_unittest$(EXEEXT): $(src_processor_static_contained_range_map_unittest_OBJECTS) $(src_processor_static_contained_range_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_static_contained_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 1014 | @rm -f src/processor/static_contained_range_map_unittest$(EXEEXT) |
| michael@0 | 1015 | $(CXXLINK) $(src_processor_static_contained_range_map_unittest_OBJECTS) $(src_processor_static_contained_range_map_unittest_LDADD) $(LIBS) |
| michael@0 | 1016 | src/processor/src_processor_static_map_unittest-static_map_unittest.$(OBJEXT): \ |
| michael@0 | 1017 | src/processor/$(am__dirstamp) \ |
| michael@0 | 1018 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1019 | src/testing/gtest/src/src_processor_static_map_unittest-gtest-all.$(OBJEXT): \ |
| michael@0 | 1020 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 1021 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1022 | src/testing/src/src_processor_static_map_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 1023 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 1024 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1025 | -src/processor/static_map_unittest$(EXEEXT): $(src_processor_static_map_unittest_OBJECTS) $(src_processor_static_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 1026 | +src/processor/static_map_unittest$(EXEEXT): $(src_processor_static_map_unittest_OBJECTS) $(src_processor_static_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_static_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 1027 | @rm -f src/processor/static_map_unittest$(EXEEXT) |
| michael@0 | 1028 | $(CXXLINK) $(src_processor_static_map_unittest_OBJECTS) $(src_processor_static_map_unittest_LDADD) $(LIBS) |
| michael@0 | 1029 | src/processor/src_processor_static_range_map_unittest-static_range_map_unittest.$(OBJEXT): \ |
| michael@0 | 1030 | src/processor/$(am__dirstamp) \ |
| michael@0 | 1031 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1032 | src/testing/gtest/src/src_processor_static_range_map_unittest-gtest-all.$(OBJEXT): \ |
| michael@0 | 1033 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 1034 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1035 | src/testing/src/src_processor_static_range_map_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 1036 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 1037 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1038 | -src/processor/static_range_map_unittest$(EXEEXT): $(src_processor_static_range_map_unittest_OBJECTS) $(src_processor_static_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 1039 | +src/processor/static_range_map_unittest$(EXEEXT): $(src_processor_static_range_map_unittest_OBJECTS) $(src_processor_static_range_map_unittest_DEPENDENCIES) $(EXTRA_src_processor_static_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 1040 | @rm -f src/processor/static_range_map_unittest$(EXEEXT) |
| michael@0 | 1041 | $(CXXLINK) $(src_processor_static_range_map_unittest_OBJECTS) $(src_processor_static_range_map_unittest_LDADD) $(LIBS) |
| michael@0 | 1042 | src/common/src_processor_synth_minidump_unittest-test_assembler.$(OBJEXT): \ |
| michael@0 | 1043 | src/common/$(am__dirstamp) \ |
| michael@0 | 1044 | src/common/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1045 | src/processor/src_processor_synth_minidump_unittest-synth_minidump_unittest.$(OBJEXT): \ |
| michael@0 | 1046 | src/processor/$(am__dirstamp) \ |
| michael@0 | 1047 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1048 | @@ -3215,17 +3242,17 @@ |
| michael@0 | 1049 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 1050 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1051 | src/testing/src/src_processor_synth_minidump_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 1052 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 1053 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1054 | src/processor/src_processor_synth_minidump_unittest-synth_minidump.$(OBJEXT): \ |
| michael@0 | 1055 | src/processor/$(am__dirstamp) \ |
| michael@0 | 1056 | src/processor/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1057 | -src/processor/synth_minidump_unittest$(EXEEXT): $(src_processor_synth_minidump_unittest_OBJECTS) $(src_processor_synth_minidump_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 1058 | +src/processor/synth_minidump_unittest$(EXEEXT): $(src_processor_synth_minidump_unittest_OBJECTS) $(src_processor_synth_minidump_unittest_DEPENDENCIES) $(EXTRA_src_processor_synth_minidump_unittest_DEPENDENCIES) src/processor/$(am__dirstamp) |
| michael@0 | 1059 | @rm -f src/processor/synth_minidump_unittest$(EXEEXT) |
| michael@0 | 1060 | $(CXXLINK) $(src_processor_synth_minidump_unittest_OBJECTS) $(src_processor_synth_minidump_unittest_LDADD) $(LIBS) |
| michael@0 | 1061 | src/tools/linux/core2md/$(am__dirstamp): |
| michael@0 | 1062 | @$(MKDIR_P) src/tools/linux/core2md |
| michael@0 | 1063 | @: > src/tools/linux/core2md/$(am__dirstamp) |
| michael@0 | 1064 | src/tools/linux/core2md/$(DEPDIR)/$(am__dirstamp): |
| michael@0 | 1065 | @$(MKDIR_P) src/tools/linux/core2md/$(DEPDIR) |
| michael@0 | 1066 | @: > src/tools/linux/core2md/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1067 | @@ -3233,29 +3260,27 @@ |
| michael@0 | 1068 | src/tools/linux/core2md/$(am__dirstamp) \ |
| michael@0 | 1069 | src/tools/linux/core2md/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1070 | src/client/linux/minidump_writer/linux_core_dumper.$(OBJEXT): \ |
| michael@0 | 1071 | src/client/linux/minidump_writer/$(am__dirstamp) \ |
| michael@0 | 1072 | src/client/linux/minidump_writer/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1073 | src/common/linux/elf_core_dump.$(OBJEXT): \ |
| michael@0 | 1074 | src/common/linux/$(am__dirstamp) \ |
| michael@0 | 1075 | src/common/linux/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1076 | -src/tools/linux/core2md/core2md$(EXEEXT): $(src_tools_linux_core2md_core2md_OBJECTS) $(src_tools_linux_core2md_core2md_DEPENDENCIES) src/tools/linux/core2md/$(am__dirstamp) |
| michael@0 | 1077 | +src/tools/linux/core2md/core2md$(EXEEXT): $(src_tools_linux_core2md_core2md_OBJECTS) $(src_tools_linux_core2md_core2md_DEPENDENCIES) $(EXTRA_src_tools_linux_core2md_core2md_DEPENDENCIES) src/tools/linux/core2md/$(am__dirstamp) |
| michael@0 | 1078 | @rm -f src/tools/linux/core2md/core2md$(EXEEXT) |
| michael@0 | 1079 | $(CXXLINK) $(src_tools_linux_core2md_core2md_OBJECTS) $(src_tools_linux_core2md_core2md_LDADD) $(LIBS) |
| michael@0 | 1080 | src/common/dwarf_cfi_to_module.$(OBJEXT): src/common/$(am__dirstamp) \ |
| michael@0 | 1081 | src/common/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1082 | src/common/dwarf_cu_to_module.$(OBJEXT): src/common/$(am__dirstamp) \ |
| michael@0 | 1083 | src/common/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1084 | src/common/dwarf_line_to_module.$(OBJEXT): src/common/$(am__dirstamp) \ |
| michael@0 | 1085 | src/common/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1086 | src/common/language.$(OBJEXT): src/common/$(am__dirstamp) \ |
| michael@0 | 1087 | src/common/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1088 | -src/common/module.$(OBJEXT): src/common/$(am__dirstamp) \ |
| michael@0 | 1089 | - src/common/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1090 | src/common/stabs_reader.$(OBJEXT): src/common/$(am__dirstamp) \ |
| michael@0 | 1091 | src/common/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1092 | src/common/stabs_to_module.$(OBJEXT): src/common/$(am__dirstamp) \ |
| michael@0 | 1093 | src/common/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1094 | src/common/dwarf/bytereader.$(OBJEXT): \ |
| michael@0 | 1095 | src/common/dwarf/$(am__dirstamp) \ |
| michael@0 | 1096 | src/common/dwarf/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1097 | src/common/dwarf/dwarf2diehandler.$(OBJEXT): \ |
| michael@0 | 1098 | @@ -3274,65 +3299,65 @@ |
| michael@0 | 1099 | @$(MKDIR_P) src/tools/linux/dump_syms |
| michael@0 | 1100 | @: > src/tools/linux/dump_syms/$(am__dirstamp) |
| michael@0 | 1101 | src/tools/linux/dump_syms/$(DEPDIR)/$(am__dirstamp): |
| michael@0 | 1102 | @$(MKDIR_P) src/tools/linux/dump_syms/$(DEPDIR) |
| michael@0 | 1103 | @: > src/tools/linux/dump_syms/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1104 | src/tools/linux/dump_syms/dump_syms.$(OBJEXT): \ |
| michael@0 | 1105 | src/tools/linux/dump_syms/$(am__dirstamp) \ |
| michael@0 | 1106 | src/tools/linux/dump_syms/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1107 | -src/tools/linux/dump_syms/dump_syms$(EXEEXT): $(src_tools_linux_dump_syms_dump_syms_OBJECTS) $(src_tools_linux_dump_syms_dump_syms_DEPENDENCIES) src/tools/linux/dump_syms/$(am__dirstamp) |
| michael@0 | 1108 | +src/tools/linux/dump_syms/dump_syms$(EXEEXT): $(src_tools_linux_dump_syms_dump_syms_OBJECTS) $(src_tools_linux_dump_syms_dump_syms_DEPENDENCIES) $(EXTRA_src_tools_linux_dump_syms_dump_syms_DEPENDENCIES) src/tools/linux/dump_syms/$(am__dirstamp) |
| michael@0 | 1109 | @rm -f src/tools/linux/dump_syms/dump_syms$(EXEEXT) |
| michael@0 | 1110 | $(CXXLINK) $(src_tools_linux_dump_syms_dump_syms_OBJECTS) $(src_tools_linux_dump_syms_dump_syms_LDADD) $(LIBS) |
| michael@0 | 1111 | src/tools/linux/md2core/$(am__dirstamp): |
| michael@0 | 1112 | @$(MKDIR_P) src/tools/linux/md2core |
| michael@0 | 1113 | @: > src/tools/linux/md2core/$(am__dirstamp) |
| michael@0 | 1114 | src/tools/linux/md2core/$(DEPDIR)/$(am__dirstamp): |
| michael@0 | 1115 | @$(MKDIR_P) src/tools/linux/md2core/$(DEPDIR) |
| michael@0 | 1116 | @: > src/tools/linux/md2core/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1117 | src/tools/linux/md2core/minidump-2-core.$(OBJEXT): \ |
| michael@0 | 1118 | src/tools/linux/md2core/$(am__dirstamp) \ |
| michael@0 | 1119 | src/tools/linux/md2core/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1120 | -src/tools/linux/md2core/minidump-2-core$(EXEEXT): $(src_tools_linux_md2core_minidump_2_core_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_DEPENDENCIES) src/tools/linux/md2core/$(am__dirstamp) |
| michael@0 | 1121 | +src/tools/linux/md2core/minidump-2-core$(EXEEXT): $(src_tools_linux_md2core_minidump_2_core_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_DEPENDENCIES) $(EXTRA_src_tools_linux_md2core_minidump_2_core_DEPENDENCIES) src/tools/linux/md2core/$(am__dirstamp) |
| michael@0 | 1122 | @rm -f src/tools/linux/md2core/minidump-2-core$(EXEEXT) |
| michael@0 | 1123 | $(CXXLINK) $(src_tools_linux_md2core_minidump_2_core_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_LDADD) $(LIBS) |
| michael@0 | 1124 | src/testing/gtest/src/src_tools_linux_md2core_minidump_2_core_unittest-gtest-all.$(OBJEXT): \ |
| michael@0 | 1125 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 1126 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1127 | src/testing/gtest/src/src_tools_linux_md2core_minidump_2_core_unittest-gtest_main.$(OBJEXT): \ |
| michael@0 | 1128 | src/testing/gtest/src/$(am__dirstamp) \ |
| michael@0 | 1129 | src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1130 | src/testing/src/src_tools_linux_md2core_minidump_2_core_unittest-gmock-all.$(OBJEXT): \ |
| michael@0 | 1131 | src/testing/src/$(am__dirstamp) \ |
| michael@0 | 1132 | src/testing/src/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1133 | src/tools/linux/md2core/src_tools_linux_md2core_minidump_2_core_unittest-minidump_memory_range_unittest.$(OBJEXT): \ |
| michael@0 | 1134 | src/tools/linux/md2core/$(am__dirstamp) \ |
| michael@0 | 1135 | src/tools/linux/md2core/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1136 | -src/tools/linux/md2core/minidump_2_core_unittest$(EXEEXT): $(src_tools_linux_md2core_minidump_2_core_unittest_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_unittest_DEPENDENCIES) src/tools/linux/md2core/$(am__dirstamp) |
| michael@0 | 1137 | +src/tools/linux/md2core/minidump_2_core_unittest$(EXEEXT): $(src_tools_linux_md2core_minidump_2_core_unittest_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_unittest_DEPENDENCIES) $(EXTRA_src_tools_linux_md2core_minidump_2_core_unittest_DEPENDENCIES) src/tools/linux/md2core/$(am__dirstamp) |
| michael@0 | 1138 | @rm -f src/tools/linux/md2core/minidump_2_core_unittest$(EXEEXT) |
| michael@0 | 1139 | $(CXXLINK) $(src_tools_linux_md2core_minidump_2_core_unittest_OBJECTS) $(src_tools_linux_md2core_minidump_2_core_unittest_LDADD) $(LIBS) |
| michael@0 | 1140 | src/common/linux/http_upload.$(OBJEXT): \ |
| michael@0 | 1141 | src/common/linux/$(am__dirstamp) \ |
| michael@0 | 1142 | src/common/linux/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1143 | src/tools/linux/symupload/$(am__dirstamp): |
| michael@0 | 1144 | @$(MKDIR_P) src/tools/linux/symupload |
| michael@0 | 1145 | @: > src/tools/linux/symupload/$(am__dirstamp) |
| michael@0 | 1146 | src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp): |
| michael@0 | 1147 | @$(MKDIR_P) src/tools/linux/symupload/$(DEPDIR) |
| michael@0 | 1148 | @: > src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1149 | src/tools/linux/symupload/minidump_upload.$(OBJEXT): \ |
| michael@0 | 1150 | src/tools/linux/symupload/$(am__dirstamp) \ |
| michael@0 | 1151 | src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1152 | -src/tools/linux/symupload/minidump_upload$(EXEEXT): $(src_tools_linux_symupload_minidump_upload_OBJECTS) $(src_tools_linux_symupload_minidump_upload_DEPENDENCIES) src/tools/linux/symupload/$(am__dirstamp) |
| michael@0 | 1153 | +src/tools/linux/symupload/minidump_upload$(EXEEXT): $(src_tools_linux_symupload_minidump_upload_OBJECTS) $(src_tools_linux_symupload_minidump_upload_DEPENDENCIES) $(EXTRA_src_tools_linux_symupload_minidump_upload_DEPENDENCIES) src/tools/linux/symupload/$(am__dirstamp) |
| michael@0 | 1154 | @rm -f src/tools/linux/symupload/minidump_upload$(EXEEXT) |
| michael@0 | 1155 | $(CXXLINK) $(src_tools_linux_symupload_minidump_upload_OBJECTS) $(src_tools_linux_symupload_minidump_upload_LDADD) $(LIBS) |
| michael@0 | 1156 | src/tools/linux/symupload/sym_upload.$(OBJEXT): \ |
| michael@0 | 1157 | src/tools/linux/symupload/$(am__dirstamp) \ |
| michael@0 | 1158 | src/tools/linux/symupload/$(DEPDIR)/$(am__dirstamp) |
| michael@0 | 1159 | -src/tools/linux/symupload/sym_upload$(EXEEXT): $(src_tools_linux_symupload_sym_upload_OBJECTS) $(src_tools_linux_symupload_sym_upload_DEPENDENCIES) src/tools/linux/symupload/$(am__dirstamp) |
| michael@0 | 1160 | +src/tools/linux/symupload/sym_upload$(EXEEXT): $(src_tools_linux_symupload_sym_upload_OBJECTS) $(src_tools_linux_symupload_sym_upload_DEPENDENCIES) $(EXTRA_src_tools_linux_symupload_sym_upload_DEPENDENCIES) src/tools/linux/symupload/$(am__dirstamp) |
| michael@0 | 1161 | @rm -f src/tools/linux/symupload/sym_upload$(EXEEXT) |
| michael@0 | 1162 | $(CXXLINK) $(src_tools_linux_symupload_sym_upload_OBJECTS) $(src_tools_linux_symupload_sym_upload_LDADD) $(LIBS) |
| michael@0 | 1163 | |
| michael@0 | 1164 | mostlyclean-compile: |
| michael@0 | 1165 | -rm -f *.$(OBJEXT) |
| michael@0 | 1166 | -rm -f src/client/linux/crash_generation/crash_generation_client.$(OBJEXT) |
| michael@0 | 1167 | -rm -f src/client/linux/crash_generation/crash_generation_server.$(OBJEXT) |
| michael@0 | 1168 | -rm -f src/client/linux/handler/exception_handler.$(OBJEXT) |
| michael@0 | 1169 | @@ -5859,19 +5884,17 @@ |
| michael@0 | 1170 | echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \ |
| michael@0 | 1171 | $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \ |
| michael@0 | 1172 | done |
| michael@0 | 1173 | |
| michael@0 | 1174 | uninstall-dist_docDATA: |
| michael@0 | 1175 | @$(NORMAL_UNINSTALL) |
| michael@0 | 1176 | @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ |
| michael@0 | 1177 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
| michael@0 | 1178 | - test -n "$$files" || exit 0; \ |
| michael@0 | 1179 | - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ |
| michael@0 | 1180 | - cd "$(DESTDIR)$(docdir)" && rm -f $$files |
| michael@0 | 1181 | + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) |
| michael@0 | 1182 | |
| michael@0 | 1183 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
| michael@0 | 1184 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
| michael@0 | 1185 | unique=`for i in $$list; do \ |
| michael@0 | 1186 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
| michael@0 | 1187 | done | \ |
| michael@0 | 1188 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
| michael@0 | 1189 | END { if (nonempty) { for (i in files) print i; }; }'`; \ |
| michael@0 | 1190 | @@ -5996,24 +6019,25 @@ |
| michael@0 | 1191 | report=""; \ |
| michael@0 | 1192 | if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ |
| michael@0 | 1193 | report="Please report to $(PACKAGE_BUGREPORT)"; \ |
| michael@0 | 1194 | test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ |
| michael@0 | 1195 | dashes="$$report"; \ |
| michael@0 | 1196 | fi; \ |
| michael@0 | 1197 | dashes=`echo "$$dashes" | sed s/./=/g`; \ |
| michael@0 | 1198 | if test "$$failed" -eq 0; then \ |
| michael@0 | 1199 | - echo "$$grn$$dashes"; \ |
| michael@0 | 1200 | + col="$$grn"; \ |
| michael@0 | 1201 | else \ |
| michael@0 | 1202 | - echo "$$red$$dashes"; \ |
| michael@0 | 1203 | + col="$$red"; \ |
| michael@0 | 1204 | fi; \ |
| michael@0 | 1205 | - echo "$$banner"; \ |
| michael@0 | 1206 | - test -z "$$skipped" || echo "$$skipped"; \ |
| michael@0 | 1207 | - test -z "$$report" || echo "$$report"; \ |
| michael@0 | 1208 | - echo "$$dashes$$std"; \ |
| michael@0 | 1209 | + echo "$${col}$$dashes$${std}"; \ |
| michael@0 | 1210 | + echo "$${col}$$banner$${std}"; \ |
| michael@0 | 1211 | + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ |
| michael@0 | 1212 | + test -z "$$report" || echo "$${col}$$report$${std}"; \ |
| michael@0 | 1213 | + echo "$${col}$$dashes$${std}"; \ |
| michael@0 | 1214 | test "$$failed" -eq 0; \ |
| michael@0 | 1215 | else :; fi |
| michael@0 | 1216 | |
| michael@0 | 1217 | distdir: $(DISTFILES) |
| michael@0 | 1218 | $(am__remove_distdir) |
| michael@0 | 1219 | test -d "$(distdir)" || mkdir "$(distdir)" |
| michael@0 | 1220 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
| michael@0 | 1221 | topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
| michael@0 | 1222 | @@ -6051,25 +6075,29 @@ |
| michael@0 | 1223 | ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ |
| michael@0 | 1224 | ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ |
| michael@0 | 1225 | || chmod -R a+r "$(distdir)" |
| michael@0 | 1226 | dist-gzip: distdir |
| michael@0 | 1227 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
| michael@0 | 1228 | $(am__remove_distdir) |
| michael@0 | 1229 | |
| michael@0 | 1230 | dist-bzip2: distdir |
| michael@0 | 1231 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
| michael@0 | 1232 | + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
| michael@0 | 1233 | + $(am__remove_distdir) |
| michael@0 | 1234 | + |
| michael@0 | 1235 | +dist-lzip: distdir |
| michael@0 | 1236 | + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
| michael@0 | 1237 | $(am__remove_distdir) |
| michael@0 | 1238 | |
| michael@0 | 1239 | dist-lzma: distdir |
| michael@0 | 1240 | tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma |
| michael@0 | 1241 | $(am__remove_distdir) |
| michael@0 | 1242 | |
| michael@0 | 1243 | dist-xz: distdir |
| michael@0 | 1244 | - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz |
| michael@0 | 1245 | + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
| michael@0 | 1246 | $(am__remove_distdir) |
| michael@0 | 1247 | |
| michael@0 | 1248 | dist-tarZ: distdir |
| michael@0 | 1249 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
| michael@0 | 1250 | $(am__remove_distdir) |
| michael@0 | 1251 | |
| michael@0 | 1252 | dist-shar: distdir |
| michael@0 | 1253 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
| michael@0 | 1254 | @@ -6090,16 +6118,18 @@ |
| michael@0 | 1255 | distcheck: dist |
| michael@0 | 1256 | case '$(DIST_ARCHIVES)' in \ |
| michael@0 | 1257 | *.tar.gz*) \ |
| michael@0 | 1258 | GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ |
| michael@0 | 1259 | *.tar.bz2*) \ |
| michael@0 | 1260 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
| michael@0 | 1261 | *.tar.lzma*) \ |
| michael@0 | 1262 | lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
| michael@0 | 1263 | + *.tar.lz*) \ |
| michael@0 | 1264 | + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
| michael@0 | 1265 | *.tar.xz*) \ |
| michael@0 | 1266 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
| michael@0 | 1267 | *.tar.Z*) \ |
| michael@0 | 1268 | uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ |
| michael@0 | 1269 | *.shar.gz*) \ |
| michael@0 | 1270 | GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ |
| michael@0 | 1271 | *.zip*) \ |
| michael@0 | 1272 | unzip $(distdir).zip ;;\ |
| michael@0 | 1273 | @@ -6109,16 +6139,17 @@ |
| michael@0 | 1274 | mkdir $(distdir)/_inst |
| michael@0 | 1275 | chmod a-w $(distdir) |
| michael@0 | 1276 | test -d $(distdir)/_build || exit 0; \ |
| michael@0 | 1277 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
| michael@0 | 1278 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
| michael@0 | 1279 | && am__cwd=`pwd` \ |
| michael@0 | 1280 | && $(am__cd) $(distdir)/_build \ |
| michael@0 | 1281 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
| michael@0 | 1282 | + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
| michael@0 | 1283 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
| michael@0 | 1284 | && $(MAKE) $(AM_MAKEFLAGS) \ |
| michael@0 | 1285 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
| michael@0 | 1286 | && $(MAKE) $(AM_MAKEFLAGS) check \ |
| michael@0 | 1287 | && $(MAKE) $(AM_MAKEFLAGS) install \ |
| michael@0 | 1288 | && $(MAKE) $(AM_MAKEFLAGS) installcheck \ |
| michael@0 | 1289 | && $(MAKE) $(AM_MAKEFLAGS) uninstall \ |
| michael@0 | 1290 | && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ |
| michael@0 | 1291 | @@ -6137,18 +6168,26 @@ |
| michael@0 | 1292 | && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ |
| michael@0 | 1293 | && cd "$$am__cwd" \ |
| michael@0 | 1294 | || exit 1 |
| michael@0 | 1295 | $(am__remove_distdir) |
| michael@0 | 1296 | @(echo "$(distdir) archives ready for distribution: "; \ |
| michael@0 | 1297 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
| michael@0 | 1298 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
| michael@0 | 1299 | distuninstallcheck: |
| michael@0 | 1300 | - @$(am__cd) '$(distuninstallcheck_dir)' \ |
| michael@0 | 1301 | - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
| michael@0 | 1302 | + @test -n '$(distuninstallcheck_dir)' || { \ |
| michael@0 | 1303 | + echo 'ERROR: trying to run $@ with an empty' \ |
| michael@0 | 1304 | + '$$(distuninstallcheck_dir)' >&2; \ |
| michael@0 | 1305 | + exit 1; \ |
| michael@0 | 1306 | + }; \ |
| michael@0 | 1307 | + $(am__cd) '$(distuninstallcheck_dir)' || { \ |
| michael@0 | 1308 | + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ |
| michael@0 | 1309 | + exit 1; \ |
| michael@0 | 1310 | + }; \ |
| michael@0 | 1311 | + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ |
| michael@0 | 1312 | || { echo "ERROR: files left after uninstall:" ; \ |
| michael@0 | 1313 | if test -n "$(DESTDIR)"; then \ |
| michael@0 | 1314 | echo " (check DESTDIR support)"; \ |
| michael@0 | 1315 | fi ; \ |
| michael@0 | 1316 | $(distuninstallcheck_listfiles) ; \ |
| michael@0 | 1317 | exit 1; } >&2 |
| michael@0 | 1318 | distcleancheck: distclean |
| michael@0 | 1319 | @if test '$(srcdir)' = . ; then \ |
| michael@0 | 1320 | @@ -6173,20 +6212,25 @@ |
| michael@0 | 1321 | install-data: install-data-am |
| michael@0 | 1322 | uninstall: uninstall-am |
| michael@0 | 1323 | |
| michael@0 | 1324 | install-am: all-am |
| michael@0 | 1325 | @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am |
| michael@0 | 1326 | |
| michael@0 | 1327 | installcheck: installcheck-am |
| michael@0 | 1328 | install-strip: |
| michael@0 | 1329 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
| michael@0 | 1330 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
| michael@0 | 1331 | - `test -z '$(STRIP)' || \ |
| michael@0 | 1332 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
| michael@0 | 1333 | + if test -z '$(STRIP)'; then \ |
| michael@0 | 1334 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
| michael@0 | 1335 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
| michael@0 | 1336 | + install; \ |
| michael@0 | 1337 | + else \ |
| michael@0 | 1338 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
| michael@0 | 1339 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
| michael@0 | 1340 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
| michael@0 | 1341 | + fi |
| michael@0 | 1342 | mostlyclean-generic: |
| michael@0 | 1343 | |
| michael@0 | 1344 | clean-generic: |
| michael@0 | 1345 | |
| michael@0 | 1346 | distclean-generic: |
| michael@0 | 1347 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
| michael@0 | 1348 | -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) |
| michael@0 | 1349 | -rm -f src/$(am__dirstamp) |
| michael@0 | 1350 | @@ -6308,18 +6352,18 @@ |
| michael@0 | 1351 | uninstall-am: uninstall-binPROGRAMS uninstall-dist_docDATA \ |
| michael@0 | 1352 | uninstall-libLIBRARIES |
| michael@0 | 1353 | |
| michael@0 | 1354 | .MAKE: check-am install-am install-strip |
| michael@0 | 1355 | |
| michael@0 | 1356 | .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \ |
| michael@0 | 1357 | clean clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ |
| michael@0 | 1358 | clean-libLIBRARIES clean-noinstLIBRARIES clean-noinstPROGRAMS \ |
| michael@0 | 1359 | - ctags dist dist-all dist-bzip2 dist-gzip dist-lzma dist-shar \ |
| michael@0 | 1360 | - dist-tarZ dist-xz dist-zip distcheck distclean \ |
| michael@0 | 1361 | + ctags dist dist-all dist-bzip2 dist-gzip dist-lzip dist-lzma \ |
| michael@0 | 1362 | + dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ |
| michael@0 | 1363 | distclean-compile distclean-generic distclean-hdr \ |
| michael@0 | 1364 | distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
| michael@0 | 1365 | dvi-am html html-am info info-am install install-am \ |
| michael@0 | 1366 | install-binPROGRAMS install-data install-data-am \ |
| michael@0 | 1367 | install-dist_docDATA install-dvi install-dvi-am install-exec \ |
| michael@0 | 1368 | install-exec-am install-html install-html-am install-info \ |
| michael@0 | 1369 | install-info-am install-libLIBRARIES install-man install-pdf \ |
| michael@0 | 1370 | install-pdf-am install-ps install-ps-am install-strip \ |
| michael@0 | 1371 | diff --git a/aclocal.m4 b/aclocal.m4 |
| michael@0 | 1372 | --- a/aclocal.m4 |
| michael@0 | 1373 | +++ b/aclocal.m4 |
| michael@0 | 1374 | @@ -1,61 +1,65 @@ |
| michael@0 | 1375 | -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- |
| michael@0 | 1376 | +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- |
| michael@0 | 1377 | |
| michael@0 | 1378 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
| michael@0 | 1379 | -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| michael@0 | 1380 | +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
| michael@0 | 1381 | +# Inc. |
| michael@0 | 1382 | # This file is free software; the Free Software Foundation |
| michael@0 | 1383 | # gives unlimited permission to copy and/or distribute it, |
| michael@0 | 1384 | # with or without modifications, as long as this notice is preserved. |
| michael@0 | 1385 | |
| michael@0 | 1386 | # This program is distributed in the hope that it will be useful, |
| michael@0 | 1387 | # but WITHOUT ANY WARRANTY, to the extent permitted by law; without |
| michael@0 | 1388 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
| michael@0 | 1389 | # PARTICULAR PURPOSE. |
| michael@0 | 1390 | |
| michael@0 | 1391 | m4_ifndef([AC_AUTOCONF_VERSION], |
| michael@0 | 1392 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
| michael@0 | 1393 | -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, |
| michael@0 | 1394 | -[m4_warning([this file was generated for autoconf 2.65. |
| michael@0 | 1395 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, |
| michael@0 | 1396 | +[m4_warning([this file was generated for autoconf 2.68. |
| michael@0 | 1397 | You have another version of autoconf. It may work, but is not guaranteed to. |
| michael@0 | 1398 | If you have problems, you may need to regenerate the build system entirely. |
| michael@0 | 1399 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
| michael@0 | 1400 | |
| michael@0 | 1401 | -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
| michael@0 | 1402 | +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software |
| michael@0 | 1403 | +# Foundation, Inc. |
| michael@0 | 1404 | # |
| michael@0 | 1405 | # This file is free software; the Free Software Foundation |
| michael@0 | 1406 | # gives unlimited permission to copy and/or distribute it, |
| michael@0 | 1407 | # with or without modifications, as long as this notice is preserved. |
| michael@0 | 1408 | |
| michael@0 | 1409 | +# serial 1 |
| michael@0 | 1410 | + |
| michael@0 | 1411 | # AM_AUTOMAKE_VERSION(VERSION) |
| michael@0 | 1412 | # ---------------------------- |
| michael@0 | 1413 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
| michael@0 | 1414 | # generated from the m4 files accompanying Automake X.Y. |
| michael@0 | 1415 | # (This private macro should not be called outside this file.) |
| michael@0 | 1416 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
| michael@0 | 1417 | [am__api_version='1.11' |
| michael@0 | 1418 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
| michael@0 | 1419 | dnl require some minimum version. Point them to the right macro. |
| michael@0 | 1420 | -m4_if([$1], [1.11.1], [], |
| michael@0 | 1421 | +m4_if([$1], [1.11.3], [], |
| michael@0 | 1422 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
| michael@0 | 1423 | ]) |
| michael@0 | 1424 | |
| michael@0 | 1425 | # _AM_AUTOCONF_VERSION(VERSION) |
| michael@0 | 1426 | # ----------------------------- |
| michael@0 | 1427 | # aclocal traces this macro to find the Autoconf version. |
| michael@0 | 1428 | # This is a private macro too. Using m4_define simplifies |
| michael@0 | 1429 | # the logic in aclocal, which can simply ignore this definition. |
| michael@0 | 1430 | m4_define([_AM_AUTOCONF_VERSION], []) |
| michael@0 | 1431 | |
| michael@0 | 1432 | # AM_SET_CURRENT_AUTOMAKE_VERSION |
| michael@0 | 1433 | # ------------------------------- |
| michael@0 | 1434 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
| michael@0 | 1435 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
| michael@0 | 1436 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
| michael@0 | 1437 | -[AM_AUTOMAKE_VERSION([1.11.1])dnl |
| michael@0 | 1438 | +[AM_AUTOMAKE_VERSION([1.11.3])dnl |
| michael@0 | 1439 | m4_ifndef([AC_AUTOCONF_VERSION], |
| michael@0 | 1440 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
| michael@0 | 1441 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
| michael@0 | 1442 | |
| michael@0 | 1443 | # Figure out how to run the assembler. -*- Autoconf -*- |
| michael@0 | 1444 | |
| michael@0 | 1445 | # Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
| michael@0 | 1446 | # |
| michael@0 | 1447 | @@ -74,22 +78,24 @@ |
| michael@0 | 1448 | test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS |
| michael@0 | 1449 | AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)]) |
| michael@0 | 1450 | AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)]) |
| michael@0 | 1451 | _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl |
| michael@0 | 1452 | ]) |
| michael@0 | 1453 | |
| michael@0 | 1454 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
| michael@0 | 1455 | |
| michael@0 | 1456 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
| michael@0 | 1457 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
| michael@0 | 1458 | # |
| michael@0 | 1459 | # This file is free software; the Free Software Foundation |
| michael@0 | 1460 | # gives unlimited permission to copy and/or distribute it, |
| michael@0 | 1461 | # with or without modifications, as long as this notice is preserved. |
| michael@0 | 1462 | |
| michael@0 | 1463 | +# serial 1 |
| michael@0 | 1464 | + |
| michael@0 | 1465 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
| michael@0 | 1466 | # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to |
| michael@0 | 1467 | # `$srcdir', `$srcdir/..', or `$srcdir/../..'. |
| michael@0 | 1468 | # |
| michael@0 | 1469 | # Of course, Automake must honor this variable whenever it calls a |
| michael@0 | 1470 | # tool from the auxiliary directory. The problem is that $srcdir (and |
| michael@0 | 1471 | # therefore $ac_aux_dir as well) can be either absolute or relative, |
| michael@0 | 1472 | # depending on how configure is run. This is pretty annoying, since |
| michael@0 | 1473 | @@ -161,24 +167,24 @@ |
| michael@0 | 1474 | $1_FALSE= |
| michael@0 | 1475 | fi |
| michael@0 | 1476 | AC_CONFIG_COMMANDS_PRE( |
| michael@0 | 1477 | [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then |
| michael@0 | 1478 | AC_MSG_ERROR([[conditional "$1" was never defined. |
| michael@0 | 1479 | Usually this means the macro was only invoked conditionally.]]) |
| michael@0 | 1480 | fi])]) |
| michael@0 | 1481 | |
| michael@0 | 1482 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 |
| michael@0 | 1483 | -# Free Software Foundation, Inc. |
| michael@0 | 1484 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, |
| michael@0 | 1485 | +# 2010, 2011 Free Software Foundation, Inc. |
| michael@0 | 1486 | # |
| michael@0 | 1487 | # This file is free software; the Free Software Foundation |
| michael@0 | 1488 | # gives unlimited permission to copy and/or distribute it, |
| michael@0 | 1489 | # with or without modifications, as long as this notice is preserved. |
| michael@0 | 1490 | |
| michael@0 | 1491 | -# serial 10 |
| michael@0 | 1492 | +# serial 12 |
| michael@0 | 1493 | |
| michael@0 | 1494 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
| michael@0 | 1495 | # written in clear, in which case automake, when reading aclocal.m4, |
| michael@0 | 1496 | # will think it sees a *use*, and therefore will trigger all it's |
| michael@0 | 1497 | # C support machinery. Also note that it means that autoscan, seeing |
| michael@0 | 1498 | # CC etc. in the Makefile, will ask for an AC_PROG_CC use... |
| michael@0 | 1499 | |
| michael@0 | 1500 | |
| michael@0 | 1501 | @@ -208,16 +214,17 @@ |
| michael@0 | 1502 | AC_CACHE_CHECK([dependency style of $depcc], |
| michael@0 | 1503 | [am_cv_$1_dependencies_compiler_type], |
| michael@0 | 1504 | [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
| michael@0 | 1505 | # We make a subdir and do the tests there. Otherwise we can end up |
| michael@0 | 1506 | # making bogus files that we don't know about and never remove. For |
| michael@0 | 1507 | # instance it was reported that on HP-UX the gcc test will end up |
| michael@0 | 1508 | # making a dummy file named `D' -- because `-MD' means `put the output |
| michael@0 | 1509 | # in D'. |
| michael@0 | 1510 | + rm -rf conftest.dir |
| michael@0 | 1511 | mkdir conftest.dir |
| michael@0 | 1512 | # Copy depcomp to subdir because otherwise we won't find it if we're |
| michael@0 | 1513 | # using a relative directory. |
| michael@0 | 1514 | cp "$am_depcomp" conftest.dir |
| michael@0 | 1515 | cd conftest.dir |
| michael@0 | 1516 | # We will build objects and dependencies in a subdirectory because |
| michael@0 | 1517 | # it helps to detect inapplicable dependency modes. For instance |
| michael@0 | 1518 | # both Tru64's cc and ICC support -MD to output dependencies as a |
| michael@0 | 1519 | @@ -272,17 +279,17 @@ |
| michael@0 | 1520 | # after this tag, mechanisms are not by side-effect, so they'll |
| michael@0 | 1521 | # only be used when explicitly requested |
| michael@0 | 1522 | if test "x$enable_dependency_tracking" = xyes; then |
| michael@0 | 1523 | continue |
| michael@0 | 1524 | else |
| michael@0 | 1525 | break |
| michael@0 | 1526 | fi |
| michael@0 | 1527 | ;; |
| michael@0 | 1528 | - msvisualcpp | msvcmsys) |
| michael@0 | 1529 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
| michael@0 | 1530 | # This compiler won't grok `-c -o', but also, the minuso test has |
| michael@0 | 1531 | # not run yet. These depmodes are late enough in the game, and |
| michael@0 | 1532 | # so weak that their functioning should not be impacted. |
| michael@0 | 1533 | am__obj=conftest.${OBJEXT-o} |
| michael@0 | 1534 | am__minus_obj= |
| michael@0 | 1535 | ;; |
| michael@0 | 1536 | none) break ;; |
| michael@0 | 1537 | esac |
| michael@0 | 1538 | @@ -337,20 +344,23 @@ |
| michael@0 | 1539 | # ------------ |
| michael@0 | 1540 | AC_DEFUN([AM_DEP_TRACK], |
| michael@0 | 1541 | [AC_ARG_ENABLE(dependency-tracking, |
| michael@0 | 1542 | [ --disable-dependency-tracking speeds up one-time build |
| michael@0 | 1543 | --enable-dependency-tracking do not reject slow dependency extractors]) |
| michael@0 | 1544 | if test "x$enable_dependency_tracking" != xno; then |
| michael@0 | 1545 | am_depcomp="$ac_aux_dir/depcomp" |
| michael@0 | 1546 | AMDEPBACKSLASH='\' |
| michael@0 | 1547 | + am__nodep='_no' |
| michael@0 | 1548 | fi |
| michael@0 | 1549 | AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) |
| michael@0 | 1550 | AC_SUBST([AMDEPBACKSLASH])dnl |
| michael@0 | 1551 | _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl |
| michael@0 | 1552 | +AC_SUBST([am__nodep])dnl |
| michael@0 | 1553 | +_AM_SUBST_NOTMAKE([am__nodep])dnl |
| michael@0 | 1554 | ]) |
| michael@0 | 1555 | |
| michael@0 | 1556 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
| michael@0 | 1557 | |
| michael@0 | 1558 | # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 |
| michael@0 | 1559 | # Free Software Foundation, Inc. |
| michael@0 | 1560 | # |
| michael@0 | 1561 | # This file is free software; the Free Software Foundation |
| michael@0 | 1562 | @@ -574,22 +584,25 @@ |
| michael@0 | 1563 | $_am_arg | $_am_arg:* ) |
| michael@0 | 1564 | break ;; |
| michael@0 | 1565 | * ) |
| michael@0 | 1566 | _am_stamp_count=`expr $_am_stamp_count + 1` ;; |
| michael@0 | 1567 | esac |
| michael@0 | 1568 | done |
| michael@0 | 1569 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
| michael@0 | 1570 | |
| michael@0 | 1571 | -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. |
| michael@0 | 1572 | +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, |
| michael@0 | 1573 | +# Inc. |
| michael@0 | 1574 | # |
| michael@0 | 1575 | # This file is free software; the Free Software Foundation |
| michael@0 | 1576 | # gives unlimited permission to copy and/or distribute it, |
| michael@0 | 1577 | # with or without modifications, as long as this notice is preserved. |
| michael@0 | 1578 | |
| michael@0 | 1579 | +# serial 1 |
| michael@0 | 1580 | + |
| michael@0 | 1581 | # AM_PROG_INSTALL_SH |
| michael@0 | 1582 | # ------------------ |
| michael@0 | 1583 | # Define $install_sh. |
| michael@0 | 1584 | AC_DEFUN([AM_PROG_INSTALL_SH], |
| michael@0 | 1585 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
| michael@0 | 1586 | if test x"${install_sh}" != xset; then |
| michael@0 | 1587 | case $am_aux_dir in |
| michael@0 | 1588 | *\ * | *\ *) |
| michael@0 | 1589 | @@ -746,22 +759,25 @@ |
| michael@0 | 1590 | if eval "$MISSING --run true"; then |
| michael@0 | 1591 | am_missing_run="$MISSING --run " |
| michael@0 | 1592 | else |
| michael@0 | 1593 | am_missing_run= |
| michael@0 | 1594 | AC_MSG_WARN([`missing' script is too old or missing]) |
| michael@0 | 1595 | fi |
| michael@0 | 1596 | ]) |
| michael@0 | 1597 | |
| michael@0 | 1598 | -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
| michael@0 | 1599 | +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, |
| michael@0 | 1600 | +# Inc. |
| michael@0 | 1601 | # |
| michael@0 | 1602 | # This file is free software; the Free Software Foundation |
| michael@0 | 1603 | # gives unlimited permission to copy and/or distribute it, |
| michael@0 | 1604 | # with or without modifications, as long as this notice is preserved. |
| michael@0 | 1605 | |
| michael@0 | 1606 | +# serial 1 |
| michael@0 | 1607 | + |
| michael@0 | 1608 | # AM_PROG_MKDIR_P |
| michael@0 | 1609 | # --------------- |
| michael@0 | 1610 | # Check for `mkdir -p'. |
| michael@0 | 1611 | AC_DEFUN([AM_PROG_MKDIR_P], |
| michael@0 | 1612 | [AC_PREREQ([2.60])dnl |
| michael@0 | 1613 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
| michael@0 | 1614 | dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, |
| michael@0 | 1615 | dnl while keeping a definition of mkdir_p for backward compatibility. |
| michael@0 | 1616 | @@ -774,53 +790,56 @@ |
| michael@0 | 1617 | case $mkdir_p in |
| michael@0 | 1618 | [[\\/$]]* | ?:[[\\/]]*) ;; |
| michael@0 | 1619 | */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; |
| michael@0 | 1620 | esac |
| michael@0 | 1621 | ]) |
| michael@0 | 1622 | |
| michael@0 | 1623 | # Helper functions for option handling. -*- Autoconf -*- |
| michael@0 | 1624 | |
| michael@0 | 1625 | -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. |
| michael@0 | 1626 | +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software |
| michael@0 | 1627 | +# Foundation, Inc. |
| michael@0 | 1628 | # |
| michael@0 | 1629 | # This file is free software; the Free Software Foundation |
| michael@0 | 1630 | # gives unlimited permission to copy and/or distribute it, |
| michael@0 | 1631 | # with or without modifications, as long as this notice is preserved. |
| michael@0 | 1632 | |
| michael@0 | 1633 | -# serial 4 |
| michael@0 | 1634 | +# serial 5 |
| michael@0 | 1635 | |
| michael@0 | 1636 | # _AM_MANGLE_OPTION(NAME) |
| michael@0 | 1637 | # ----------------------- |
| michael@0 | 1638 | AC_DEFUN([_AM_MANGLE_OPTION], |
| michael@0 | 1639 | [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) |
| michael@0 | 1640 | |
| michael@0 | 1641 | # _AM_SET_OPTION(NAME) |
| michael@0 | 1642 | -# ------------------------------ |
| michael@0 | 1643 | +# -------------------- |
| michael@0 | 1644 | # Set option NAME. Presently that only means defining a flag for this option. |
| michael@0 | 1645 | AC_DEFUN([_AM_SET_OPTION], |
| michael@0 | 1646 | [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) |
| michael@0 | 1647 | |
| michael@0 | 1648 | # _AM_SET_OPTIONS(OPTIONS) |
| michael@0 | 1649 | -# ---------------------------------- |
| michael@0 | 1650 | +# ------------------------ |
| michael@0 | 1651 | # OPTIONS is a space-separated list of Automake options. |
| michael@0 | 1652 | AC_DEFUN([_AM_SET_OPTIONS], |
| michael@0 | 1653 | [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
| michael@0 | 1654 | |
| michael@0 | 1655 | # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) |
| michael@0 | 1656 | # ------------------------------------------- |
| michael@0 | 1657 | # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. |
| michael@0 | 1658 | AC_DEFUN([_AM_IF_OPTION], |
| michael@0 | 1659 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
| michael@0 | 1660 | |
| michael@0 | 1661 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
| michael@0 | 1662 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
| michael@0 | 1663 | # |
| michael@0 | 1664 | # This file is free software; the Free Software Foundation |
| michael@0 | 1665 | # gives unlimited permission to copy and/or distribute it, |
| michael@0 | 1666 | # with or without modifications, as long as this notice is preserved. |
| michael@0 | 1667 | |
| michael@0 | 1668 | +# serial 1 |
| michael@0 | 1669 | + |
| michael@0 | 1670 | # AM_RUN_LOG(COMMAND) |
| michael@0 | 1671 | # ------------------- |
| michael@0 | 1672 | # Run COMMAND, save the exit status in ac_status, and log it. |
| michael@0 | 1673 | # (This has been adapted from Autoconf's _AC_RUN_LOG macro.) |
| michael@0 | 1674 | AC_DEFUN([AM_RUN_LOG], |
| michael@0 | 1675 | [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD |
| michael@0 | 1676 | ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD |
| michael@0 | 1677 | ac_status=$? |
| michael@0 | 1678 | @@ -887,22 +906,24 @@ |
| michael@0 | 1679 | # Ok. |
| michael@0 | 1680 | : |
| michael@0 | 1681 | else |
| michael@0 | 1682 | AC_MSG_ERROR([newly created file is older than distributed files! |
| michael@0 | 1683 | Check your system clock]) |
| michael@0 | 1684 | fi |
| michael@0 | 1685 | AC_MSG_RESULT(yes)]) |
| michael@0 | 1686 | |
| michael@0 | 1687 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
| michael@0 | 1688 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
| michael@0 | 1689 | # |
| michael@0 | 1690 | # This file is free software; the Free Software Foundation |
| michael@0 | 1691 | # gives unlimited permission to copy and/or distribute it, |
| michael@0 | 1692 | # with or without modifications, as long as this notice is preserved. |
| michael@0 | 1693 | |
| michael@0 | 1694 | +# serial 1 |
| michael@0 | 1695 | + |
| michael@0 | 1696 | # AM_PROG_INSTALL_STRIP |
| michael@0 | 1697 | # --------------------- |
| michael@0 | 1698 | # One issue with vendor `install' (even GNU) is that you can't |
| michael@0 | 1699 | # specify the program used to strip binaries. This is especially |
| michael@0 | 1700 | # annoying in cross-compiling environments, where the build's strip |
| michael@0 | 1701 | # is unlikely to handle the host's binaries. |
| michael@0 | 1702 | # Fortunately install-sh will honor a STRIPPROG variable, so we |
| michael@0 | 1703 | # always use install-sh in `make install-strip', and initialize |
| michael@0 | 1704 | @@ -915,38 +936,38 @@ |
| michael@0 | 1705 | # will honor the `STRIP' environment variable to overrule this program. |
| michael@0 | 1706 | dnl Don't test for $cross_compiling = yes, because it might be `maybe'. |
| michael@0 | 1707 | if test "$cross_compiling" != no; then |
| michael@0 | 1708 | AC_CHECK_TOOL([STRIP], [strip], :) |
| michael@0 | 1709 | fi |
| michael@0 | 1710 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
| michael@0 | 1711 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
| michael@0 | 1712 | |
| michael@0 | 1713 | -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. |
| michael@0 | 1714 | +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. |
| michael@0 | 1715 | # |
| michael@0 | 1716 | # This file is free software; the Free Software Foundation |
| michael@0 | 1717 | # gives unlimited permission to copy and/or distribute it, |
| michael@0 | 1718 | # with or without modifications, as long as this notice is preserved. |
| michael@0 | 1719 | |
| michael@0 | 1720 | -# serial 2 |
| michael@0 | 1721 | +# serial 3 |
| michael@0 | 1722 | |
| michael@0 | 1723 | # _AM_SUBST_NOTMAKE(VARIABLE) |
| michael@0 | 1724 | # --------------------------- |
| michael@0 | 1725 | # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. |
| michael@0 | 1726 | # This macro is traced by Automake. |
| michael@0 | 1727 | AC_DEFUN([_AM_SUBST_NOTMAKE]) |
| michael@0 | 1728 | |
| michael@0 | 1729 | # AM_SUBST_NOTMAKE(VARIABLE) |
| michael@0 | 1730 | -# --------------------------- |
| michael@0 | 1731 | +# -------------------------- |
| michael@0 | 1732 | # Public sister of _AM_SUBST_NOTMAKE. |
| michael@0 | 1733 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
| michael@0 | 1734 | |
| michael@0 | 1735 | # Check how to create a tarball. -*- Autoconf -*- |
| michael@0 | 1736 | |
| michael@0 | 1737 | -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. |
| michael@0 | 1738 | +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. |
| michael@0 | 1739 | # |
| michael@0 | 1740 | # This file is free software; the Free Software Foundation |
| michael@0 | 1741 | # gives unlimited permission to copy and/or distribute it, |
| michael@0 | 1742 | # with or without modifications, as long as this notice is preserved. |
| michael@0 | 1743 | |
| michael@0 | 1744 | # serial 2 |
| michael@0 | 1745 | |
| michael@0 | 1746 | # _AM_PROG_TAR(FORMAT) |
| michael@0 | 1747 | @@ -958,20 +979,21 @@ |
| michael@0 | 1748 | # writing to stdout a FORMAT-tarball containing the directory |
| michael@0 | 1749 | # $tardir. |
| michael@0 | 1750 | # tardir=directory && $(am__tar) > result.tar |
| michael@0 | 1751 | # |
| michael@0 | 1752 | # Substitute a variable $(am__untar) that extract such |
| michael@0 | 1753 | # a tarball read from stdin. |
| michael@0 | 1754 | # $(am__untar) < result.tar |
| michael@0 | 1755 | AC_DEFUN([_AM_PROG_TAR], |
| michael@0 | 1756 | -[# Always define AMTAR for backward compatibility. |
| michael@0 | 1757 | -AM_MISSING_PROG([AMTAR], [tar]) |
| michael@0 | 1758 | +[# Always define AMTAR for backward compatibility. Yes, it's still used |
| michael@0 | 1759 | +# in the wild :-( We should find a proper way to deprecate it ... |
| michael@0 | 1760 | +AC_SUBST([AMTAR], ['$${TAR-tar}']) |
| michael@0 | 1761 | m4_if([$1], [v7], |
| michael@0 | 1762 | - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], |
| michael@0 | 1763 | + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
| michael@0 | 1764 | [m4_case([$1], [ustar],, [pax],, |
| michael@0 | 1765 | [m4_fatal([Unknown tar format])]) |
| michael@0 | 1766 | AC_MSG_CHECKING([how to create a $1 tar archive]) |
| michael@0 | 1767 | # Loop over all known methods to create a tar archive until one works. |
| michael@0 | 1768 | _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
| michael@0 | 1769 | _am_tools=${am_cv_prog_tar_$1-$_am_tools} |
| michael@0 | 1770 | # Do not fold the above two line into one, because Tru64 sh and |
| michael@0 | 1771 | # Solaris sh will not grok spaces in the rhs of `-'. |
| michael@0 | 1772 | diff --git a/configure b/configure |
| michael@0 | 1773 | --- a/configure |
| michael@0 | 1774 | +++ b/configure |
| michael@0 | 1775 | @@ -1,18 +1,18 @@ |
| michael@0 | 1776 | #! /bin/sh |
| michael@0 | 1777 | # Guess values for system-dependent variables and create Makefiles. |
| michael@0 | 1778 | -# Generated by GNU Autoconf 2.65 for breakpad 0.1. |
| michael@0 | 1779 | +# Generated by GNU Autoconf 2.68 for breakpad 0.1. |
| michael@0 | 1780 | # |
| michael@0 | 1781 | # Report bugs to <google-breakpad-dev@googlegroups.com>. |
| michael@0 | 1782 | # |
| michael@0 | 1783 | # |
| michael@0 | 1784 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
| michael@0 | 1785 | -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
| michael@0 | 1786 | -# Inc. |
| michael@0 | 1787 | +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software |
| michael@0 | 1788 | +# Foundation, Inc. |
| michael@0 | 1789 | # |
| michael@0 | 1790 | # |
| michael@0 | 1791 | # This configure script is free software; the Free Software Foundation |
| michael@0 | 1792 | # gives unlimited permission to copy, distribute and modify it. |
| michael@0 | 1793 | ## -------------------- ## |
| michael@0 | 1794 | ## M4sh Initialization. ## |
| michael@0 | 1795 | ## -------------------- ## |
| michael@0 | 1796 | |
| michael@0 | 1797 | @@ -86,16 +86,17 @@ |
| michael@0 | 1798 | # IFS |
| michael@0 | 1799 | # We need space, tab and new line, in precisely that order. Quoting is |
| michael@0 | 1800 | # there to prevent editors from complaining about space-tab. |
| michael@0 | 1801 | # (If _AS_PATH_WALK were called with IFS unset, it would disable word |
| michael@0 | 1802 | # splitting by setting IFS to empty value.) |
| michael@0 | 1803 | IFS=" "" $as_nl" |
| michael@0 | 1804 | |
| michael@0 | 1805 | # Find who we are. Look in the path if we contain no directory separator. |
| michael@0 | 1806 | +as_myself= |
| michael@0 | 1807 | case $0 in #(( |
| michael@0 | 1808 | *[\\/]* ) as_myself=$0 ;; |
| michael@0 | 1809 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 1810 | for as_dir in $PATH |
| michael@0 | 1811 | do |
| michael@0 | 1812 | IFS=$as_save_IFS |
| michael@0 | 1813 | test -z "$as_dir" && as_dir=. |
| michael@0 | 1814 | test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break |
| michael@0 | 1815 | @@ -211,21 +212,28 @@ |
| michael@0 | 1816 | fi; } |
| michael@0 | 1817 | IFS=$as_save_IFS |
| michael@0 | 1818 | |
| michael@0 | 1819 | |
| michael@0 | 1820 | if test "x$CONFIG_SHELL" != x; then : |
| michael@0 | 1821 | # We cannot yet assume a decent shell, so we have to provide a |
| michael@0 | 1822 | # neutralization value for shells without unset; and this also |
| michael@0 | 1823 | # works around shells that cannot unset nonexistent variables. |
| michael@0 | 1824 | + # Preserve -v and -x to the replacement shell. |
| michael@0 | 1825 | BASH_ENV=/dev/null |
| michael@0 | 1826 | ENV=/dev/null |
| michael@0 | 1827 | (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
| michael@0 | 1828 | export CONFIG_SHELL |
| michael@0 | 1829 | - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} |
| michael@0 | 1830 | + case $- in # (((( |
| michael@0 | 1831 | + *v*x* | *x*v* ) as_opts=-vx ;; |
| michael@0 | 1832 | + *v* ) as_opts=-v ;; |
| michael@0 | 1833 | + *x* ) as_opts=-x ;; |
| michael@0 | 1834 | + * ) as_opts= ;; |
| michael@0 | 1835 | + esac |
| michael@0 | 1836 | + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} |
| michael@0 | 1837 | fi |
| michael@0 | 1838 | |
| michael@0 | 1839 | if test x$as_have_required = xno; then : |
| michael@0 | 1840 | $as_echo "$0: This script requires a shell more modern than all" |
| michael@0 | 1841 | $as_echo "$0: the shells that I found on your system." |
| michael@0 | 1842 | if test x${ZSH_VERSION+set} = xset ; then |
| michael@0 | 1843 | $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" |
| michael@0 | 1844 | $as_echo "$0: be upgraded to zsh 4.3.4 or later." |
| michael@0 | 1845 | @@ -314,17 +322,17 @@ |
| michael@0 | 1846 | /^X\(\/\).*/{ |
| michael@0 | 1847 | s//\1/ |
| michael@0 | 1848 | q |
| michael@0 | 1849 | } |
| michael@0 | 1850 | s/.*/./; q'` |
| michael@0 | 1851 | test -d "$as_dir" && break |
| michael@0 | 1852 | done |
| michael@0 | 1853 | test -z "$as_dirs" || eval "mkdir $as_dirs" |
| michael@0 | 1854 | - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" |
| michael@0 | 1855 | + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" |
| michael@0 | 1856 | |
| michael@0 | 1857 | |
| michael@0 | 1858 | } # as_fn_mkdir_p |
| michael@0 | 1859 | # as_fn_append VAR VALUE |
| michael@0 | 1860 | # ---------------------- |
| michael@0 | 1861 | # Append the text in VALUE to the end of the definition contained in VAR. Take |
| michael@0 | 1862 | # advantage of any shell optimizations that allow amortized linear growth over |
| michael@0 | 1863 | # repeated appends, instead of the typical quadratic growth present in naive |
| michael@0 | 1864 | @@ -354,29 +362,29 @@ |
| michael@0 | 1865 | else |
| michael@0 | 1866 | as_fn_arith () |
| michael@0 | 1867 | { |
| michael@0 | 1868 | as_val=`expr "$@" || test $? -eq 1` |
| michael@0 | 1869 | } |
| michael@0 | 1870 | fi # as_fn_arith |
| michael@0 | 1871 | |
| michael@0 | 1872 | |
| michael@0 | 1873 | -# as_fn_error ERROR [LINENO LOG_FD] |
| michael@0 | 1874 | -# --------------------------------- |
| michael@0 | 1875 | +# as_fn_error STATUS ERROR [LINENO LOG_FD] |
| michael@0 | 1876 | +# ---------------------------------------- |
| michael@0 | 1877 | # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are |
| michael@0 | 1878 | # provided, also output the error to LOG_FD, referencing LINENO. Then exit the |
| michael@0 | 1879 | -# script with status $?, using 1 if that was 0. |
| michael@0 | 1880 | +# script with STATUS, using 1 if that was 0. |
| michael@0 | 1881 | as_fn_error () |
| michael@0 | 1882 | { |
| michael@0 | 1883 | - as_status=$?; test $as_status -eq 0 && as_status=1 |
| michael@0 | 1884 | - if test "$3"; then |
| michael@0 | 1885 | - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
| michael@0 | 1886 | - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 |
| michael@0 | 1887 | + as_status=$1; test $as_status -eq 0 && as_status=1 |
| michael@0 | 1888 | + if test "$4"; then |
| michael@0 | 1889 | + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
| michael@0 | 1890 | + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 |
| michael@0 | 1891 | fi |
| michael@0 | 1892 | - $as_echo "$as_me: error: $1" >&2 |
| michael@0 | 1893 | + $as_echo "$as_me: error: $2" >&2 |
| michael@0 | 1894 | as_fn_exit $as_status |
| michael@0 | 1895 | } # as_fn_error |
| michael@0 | 1896 | |
| michael@0 | 1897 | if expr a : '\(a\)' >/dev/null 2>&1 && |
| michael@0 | 1898 | test "X`expr 00001 : '.*\(...\)'`" = X001; then |
| michael@0 | 1899 | as_expr=expr |
| michael@0 | 1900 | else |
| michael@0 | 1901 | as_expr=false |
| michael@0 | 1902 | @@ -528,17 +536,17 @@ |
| michael@0 | 1903 | # Sed expression to map a string onto a valid variable name. |
| michael@0 | 1904 | as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" |
| michael@0 | 1905 | |
| michael@0 | 1906 | |
| michael@0 | 1907 | test -n "$DJDIR" || exec 7<&0 </dev/null |
| michael@0 | 1908 | exec 6>&1 |
| michael@0 | 1909 | |
| michael@0 | 1910 | # Name of the host. |
| michael@0 | 1911 | -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, |
| michael@0 | 1912 | +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, |
| michael@0 | 1913 | # so uname gets run too. |
| michael@0 | 1914 | ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` |
| michael@0 | 1915 | |
| michael@0 | 1916 | # |
| michael@0 | 1917 | # Initializations. |
| michael@0 | 1918 | # |
| michael@0 | 1919 | ac_default_prefix=/usr/local |
| michael@0 | 1920 | ac_clean_files= |
| michael@0 | 1921 | @@ -627,16 +635,17 @@ |
| michael@0 | 1922 | am__fastdepCCAS_FALSE |
| michael@0 | 1923 | am__fastdepCCAS_TRUE |
| michael@0 | 1924 | CCASDEPMODE |
| michael@0 | 1925 | CCASFLAGS |
| michael@0 | 1926 | CCAS |
| michael@0 | 1927 | am__fastdepCC_FALSE |
| michael@0 | 1928 | am__fastdepCC_TRUE |
| michael@0 | 1929 | CCDEPMODE |
| michael@0 | 1930 | +am__nodep |
| michael@0 | 1931 | AMDEPBACKSLASH |
| michael@0 | 1932 | AMDEP_FALSE |
| michael@0 | 1933 | AMDEP_TRUE |
| michael@0 | 1934 | am__quote |
| michael@0 | 1935 | am__include |
| michael@0 | 1936 | DEPDIR |
| michael@0 | 1937 | OBJEXT |
| michael@0 | 1938 | EXEEXT |
| michael@0 | 1939 | @@ -794,18 +803,19 @@ |
| michael@0 | 1940 | # If the previous option needs an argument, assign it. |
| michael@0 | 1941 | if test -n "$ac_prev"; then |
| michael@0 | 1942 | eval $ac_prev=\$ac_option |
| michael@0 | 1943 | ac_prev= |
| michael@0 | 1944 | continue |
| michael@0 | 1945 | fi |
| michael@0 | 1946 | |
| michael@0 | 1947 | case $ac_option in |
| michael@0 | 1948 | - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; |
| michael@0 | 1949 | - *) ac_optarg=yes ;; |
| michael@0 | 1950 | + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; |
| michael@0 | 1951 | + *=) ac_optarg= ;; |
| michael@0 | 1952 | + *) ac_optarg=yes ;; |
| michael@0 | 1953 | esac |
| michael@0 | 1954 | |
| michael@0 | 1955 | # Accept the important Cygnus configure options, so we can diagnose typos. |
| michael@0 | 1956 | |
| michael@0 | 1957 | case $ac_dashdash$ac_option in |
| michael@0 | 1958 | --) |
| michael@0 | 1959 | ac_dashdash=yes ;; |
| michael@0 | 1960 | |
| michael@0 | 1961 | @@ -840,17 +850,17 @@ |
| michael@0 | 1962 | -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ |
| michael@0 | 1963 | | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) |
| michael@0 | 1964 | datarootdir=$ac_optarg ;; |
| michael@0 | 1965 | |
| michael@0 | 1966 | -disable-* | --disable-*) |
| michael@0 | 1967 | ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` |
| michael@0 | 1968 | # Reject names that are not valid shell variable names. |
| michael@0 | 1969 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
| michael@0 | 1970 | - as_fn_error "invalid feature name: $ac_useropt" |
| michael@0 | 1971 | + as_fn_error $? "invalid feature name: $ac_useropt" |
| michael@0 | 1972 | ac_useropt_orig=$ac_useropt |
| michael@0 | 1973 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
| michael@0 | 1974 | case $ac_user_opts in |
| michael@0 | 1975 | *" |
| michael@0 | 1976 | "enable_$ac_useropt" |
| michael@0 | 1977 | "*) ;; |
| michael@0 | 1978 | *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" |
| michael@0 | 1979 | ac_unrecognized_sep=', ';; |
| michael@0 | 1980 | @@ -866,17 +876,17 @@ |
| michael@0 | 1981 | ac_prev=dvidir ;; |
| michael@0 | 1982 | -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) |
| michael@0 | 1983 | dvidir=$ac_optarg ;; |
| michael@0 | 1984 | |
| michael@0 | 1985 | -enable-* | --enable-*) |
| michael@0 | 1986 | ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` |
| michael@0 | 1987 | # Reject names that are not valid shell variable names. |
| michael@0 | 1988 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
| michael@0 | 1989 | - as_fn_error "invalid feature name: $ac_useropt" |
| michael@0 | 1990 | + as_fn_error $? "invalid feature name: $ac_useropt" |
| michael@0 | 1991 | ac_useropt_orig=$ac_useropt |
| michael@0 | 1992 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
| michael@0 | 1993 | case $ac_user_opts in |
| michael@0 | 1994 | *" |
| michael@0 | 1995 | "enable_$ac_useropt" |
| michael@0 | 1996 | "*) ;; |
| michael@0 | 1997 | *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" |
| michael@0 | 1998 | ac_unrecognized_sep=', ';; |
| michael@0 | 1999 | @@ -1070,33 +1080,33 @@ |
| michael@0 | 2000 | |
| michael@0 | 2001 | -version | --version | --versio | --versi | --vers | -V) |
| michael@0 | 2002 | ac_init_version=: ;; |
| michael@0 | 2003 | |
| michael@0 | 2004 | -with-* | --with-*) |
| michael@0 | 2005 | ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` |
| michael@0 | 2006 | # Reject names that are not valid shell variable names. |
| michael@0 | 2007 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
| michael@0 | 2008 | - as_fn_error "invalid package name: $ac_useropt" |
| michael@0 | 2009 | + as_fn_error $? "invalid package name: $ac_useropt" |
| michael@0 | 2010 | ac_useropt_orig=$ac_useropt |
| michael@0 | 2011 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
| michael@0 | 2012 | case $ac_user_opts in |
| michael@0 | 2013 | *" |
| michael@0 | 2014 | "with_$ac_useropt" |
| michael@0 | 2015 | "*) ;; |
| michael@0 | 2016 | *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" |
| michael@0 | 2017 | ac_unrecognized_sep=', ';; |
| michael@0 | 2018 | esac |
| michael@0 | 2019 | eval with_$ac_useropt=\$ac_optarg ;; |
| michael@0 | 2020 | |
| michael@0 | 2021 | -without-* | --without-*) |
| michael@0 | 2022 | ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` |
| michael@0 | 2023 | # Reject names that are not valid shell variable names. |
| michael@0 | 2024 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
| michael@0 | 2025 | - as_fn_error "invalid package name: $ac_useropt" |
| michael@0 | 2026 | + as_fn_error $? "invalid package name: $ac_useropt" |
| michael@0 | 2027 | ac_useropt_orig=$ac_useropt |
| michael@0 | 2028 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
| michael@0 | 2029 | case $ac_user_opts in |
| michael@0 | 2030 | *" |
| michael@0 | 2031 | "with_$ac_useropt" |
| michael@0 | 2032 | "*) ;; |
| michael@0 | 2033 | *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" |
| michael@0 | 2034 | ac_unrecognized_sep=', ';; |
| michael@0 | 2035 | @@ -1116,50 +1126,50 @@ |
| michael@0 | 2036 | |
| michael@0 | 2037 | -x-libraries | --x-libraries | --x-librarie | --x-librari \ |
| michael@0 | 2038 | | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) |
| michael@0 | 2039 | ac_prev=x_libraries ;; |
| michael@0 | 2040 | -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ |
| michael@0 | 2041 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) |
| michael@0 | 2042 | x_libraries=$ac_optarg ;; |
| michael@0 | 2043 | |
| michael@0 | 2044 | - -*) as_fn_error "unrecognized option: \`$ac_option' |
| michael@0 | 2045 | -Try \`$0 --help' for more information." |
| michael@0 | 2046 | + -*) as_fn_error $? "unrecognized option: \`$ac_option' |
| michael@0 | 2047 | +Try \`$0 --help' for more information" |
| michael@0 | 2048 | ;; |
| michael@0 | 2049 | |
| michael@0 | 2050 | *=*) |
| michael@0 | 2051 | ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` |
| michael@0 | 2052 | # Reject names that are not valid shell variable names. |
| michael@0 | 2053 | case $ac_envvar in #( |
| michael@0 | 2054 | '' | [0-9]* | *[!_$as_cr_alnum]* ) |
| michael@0 | 2055 | - as_fn_error "invalid variable name: \`$ac_envvar'" ;; |
| michael@0 | 2056 | + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; |
| michael@0 | 2057 | esac |
| michael@0 | 2058 | eval $ac_envvar=\$ac_optarg |
| michael@0 | 2059 | export $ac_envvar ;; |
| michael@0 | 2060 | |
| michael@0 | 2061 | *) |
| michael@0 | 2062 | # FIXME: should be removed in autoconf 3.0. |
| michael@0 | 2063 | $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 |
| michael@0 | 2064 | expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && |
| michael@0 | 2065 | $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 |
| michael@0 | 2066 | - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} |
| michael@0 | 2067 | + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" |
| michael@0 | 2068 | ;; |
| michael@0 | 2069 | |
| michael@0 | 2070 | esac |
| michael@0 | 2071 | done |
| michael@0 | 2072 | |
| michael@0 | 2073 | if test -n "$ac_prev"; then |
| michael@0 | 2074 | ac_option=--`echo $ac_prev | sed 's/_/-/g'` |
| michael@0 | 2075 | - as_fn_error "missing argument to $ac_option" |
| michael@0 | 2076 | + as_fn_error $? "missing argument to $ac_option" |
| michael@0 | 2077 | fi |
| michael@0 | 2078 | |
| michael@0 | 2079 | if test -n "$ac_unrecognized_opts"; then |
| michael@0 | 2080 | case $enable_option_checking in |
| michael@0 | 2081 | no) ;; |
| michael@0 | 2082 | - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; |
| michael@0 | 2083 | + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; |
| michael@0 | 2084 | *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; |
| michael@0 | 2085 | esac |
| michael@0 | 2086 | fi |
| michael@0 | 2087 | |
| michael@0 | 2088 | # Check all directory arguments for consistency. |
| michael@0 | 2089 | for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ |
| michael@0 | 2090 | datadir sysconfdir sharedstatedir localstatedir includedir \ |
| michael@0 | 2091 | oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ |
| michael@0 | 2092 | @@ -1172,49 +1182,49 @@ |
| michael@0 | 2093 | ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` |
| michael@0 | 2094 | eval $ac_var=\$ac_val;; |
| michael@0 | 2095 | esac |
| michael@0 | 2096 | # Be sure to have absolute directory names. |
| michael@0 | 2097 | case $ac_val in |
| michael@0 | 2098 | [\\/$]* | ?:[\\/]* ) continue;; |
| michael@0 | 2099 | NONE | '' ) case $ac_var in *prefix ) continue;; esac;; |
| michael@0 | 2100 | esac |
| michael@0 | 2101 | - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" |
| michael@0 | 2102 | + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" |
| michael@0 | 2103 | done |
| michael@0 | 2104 | |
| michael@0 | 2105 | # There might be people who depend on the old broken behavior: `$host' |
| michael@0 | 2106 | # used to hold the argument of --host etc. |
| michael@0 | 2107 | # FIXME: To remove some day. |
| michael@0 | 2108 | build=$build_alias |
| michael@0 | 2109 | host=$host_alias |
| michael@0 | 2110 | target=$target_alias |
| michael@0 | 2111 | |
| michael@0 | 2112 | # FIXME: To remove some day. |
| michael@0 | 2113 | if test "x$host_alias" != x; then |
| michael@0 | 2114 | if test "x$build_alias" = x; then |
| michael@0 | 2115 | cross_compiling=maybe |
| michael@0 | 2116 | - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. |
| michael@0 | 2117 | - If a cross compiler is detected then cross compile mode will be used." >&2 |
| michael@0 | 2118 | + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. |
| michael@0 | 2119 | + If a cross compiler is detected then cross compile mode will be used" >&2 |
| michael@0 | 2120 | elif test "x$build_alias" != "x$host_alias"; then |
| michael@0 | 2121 | cross_compiling=yes |
| michael@0 | 2122 | fi |
| michael@0 | 2123 | fi |
| michael@0 | 2124 | |
| michael@0 | 2125 | ac_tool_prefix= |
| michael@0 | 2126 | test -n "$host_alias" && ac_tool_prefix=$host_alias- |
| michael@0 | 2127 | |
| michael@0 | 2128 | test "$silent" = yes && exec 6>/dev/null |
| michael@0 | 2129 | |
| michael@0 | 2130 | |
| michael@0 | 2131 | ac_pwd=`pwd` && test -n "$ac_pwd" && |
| michael@0 | 2132 | ac_ls_di=`ls -di .` && |
| michael@0 | 2133 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || |
| michael@0 | 2134 | - as_fn_error "working directory cannot be determined" |
| michael@0 | 2135 | + as_fn_error $? "working directory cannot be determined" |
| michael@0 | 2136 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || |
| michael@0 | 2137 | - as_fn_error "pwd does not report name of working directory" |
| michael@0 | 2138 | + as_fn_error $? "pwd does not report name of working directory" |
| michael@0 | 2139 | |
| michael@0 | 2140 | |
| michael@0 | 2141 | # Find the source files, if location was not specified. |
| michael@0 | 2142 | if test -z "$srcdir"; then |
| michael@0 | 2143 | ac_srcdir_defaulted=yes |
| michael@0 | 2144 | # Try the directory containing this script, then the parent directory. |
| michael@0 | 2145 | ac_confdir=`$as_dirname -- "$as_myself" || |
| michael@0 | 2146 | $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
| michael@0 | 2147 | @@ -1243,21 +1253,21 @@ |
| michael@0 | 2148 | if test ! -r "$srcdir/$ac_unique_file"; then |
| michael@0 | 2149 | srcdir=.. |
| michael@0 | 2150 | fi |
| michael@0 | 2151 | else |
| michael@0 | 2152 | ac_srcdir_defaulted=no |
| michael@0 | 2153 | fi |
| michael@0 | 2154 | if test ! -r "$srcdir/$ac_unique_file"; then |
| michael@0 | 2155 | test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." |
| michael@0 | 2156 | - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" |
| michael@0 | 2157 | + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" |
| michael@0 | 2158 | fi |
| michael@0 | 2159 | ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" |
| michael@0 | 2160 | ac_abs_confdir=`( |
| michael@0 | 2161 | - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" |
| michael@0 | 2162 | + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" |
| michael@0 | 2163 | pwd)` |
| michael@0 | 2164 | # When building in place, set srcdir=. |
| michael@0 | 2165 | if test "$ac_abs_confdir" = "$ac_pwd"; then |
| michael@0 | 2166 | srcdir=. |
| michael@0 | 2167 | fi |
| michael@0 | 2168 | # Remove unnecessary trailing slashes from srcdir. |
| michael@0 | 2169 | # Double slashes in file names in object file debugging info |
| michael@0 | 2170 | # mess up M-x gdb in Emacs. |
| michael@0 | 2171 | @@ -1287,17 +1297,17 @@ |
| michael@0 | 2172 | |
| michael@0 | 2173 | Defaults for the options are specified in brackets. |
| michael@0 | 2174 | |
| michael@0 | 2175 | Configuration: |
| michael@0 | 2176 | -h, --help display this help and exit |
| michael@0 | 2177 | --help=short display options specific to this package |
| michael@0 | 2178 | --help=recursive display the short help of all the included packages |
| michael@0 | 2179 | -V, --version display version information and exit |
| michael@0 | 2180 | - -q, --quiet, --silent do not print \`checking...' messages |
| michael@0 | 2181 | + -q, --quiet, --silent do not print \`checking ...' messages |
| michael@0 | 2182 | --cache-file=FILE cache test results in FILE [disabled] |
| michael@0 | 2183 | -C, --config-cache alias for \`--cache-file=config.cache' |
| michael@0 | 2184 | -n, --no-create do not create output files |
| michael@0 | 2185 | --srcdir=DIR find the sources in DIR [configure dir or \`..'] |
| michael@0 | 2186 | |
| michael@0 | 2187 | Installation directories: |
| michael@0 | 2188 | --prefix=PREFIX install architecture-independent files in PREFIX |
| michael@0 | 2189 | [$ac_default_prefix] |
| michael@0 | 2190 | @@ -1440,19 +1450,19 @@ |
| michael@0 | 2191 | cd "$ac_pwd" || { ac_status=$?; break; } |
| michael@0 | 2192 | done |
| michael@0 | 2193 | fi |
| michael@0 | 2194 | |
| michael@0 | 2195 | test -n "$ac_init_help" && exit $ac_status |
| michael@0 | 2196 | if $ac_init_version; then |
| michael@0 | 2197 | cat <<\_ACEOF |
| michael@0 | 2198 | breakpad configure 0.1 |
| michael@0 | 2199 | -generated by GNU Autoconf 2.65 |
| michael@0 | 2200 | - |
| michael@0 | 2201 | -Copyright (C) 2009 Free Software Foundation, Inc. |
| michael@0 | 2202 | +generated by GNU Autoconf 2.68 |
| michael@0 | 2203 | + |
| michael@0 | 2204 | +Copyright (C) 2010 Free Software Foundation, Inc. |
| michael@0 | 2205 | This configure script is free software; the Free Software Foundation |
| michael@0 | 2206 | gives unlimited permission to copy, distribute and modify it. |
| michael@0 | 2207 | _ACEOF |
| michael@0 | 2208 | exit |
| michael@0 | 2209 | fi |
| michael@0 | 2210 | |
| michael@0 | 2211 | ## ------------------------ ## |
| michael@0 | 2212 | ## Autoconf initialization. ## |
| michael@0 | 2213 | @@ -1486,17 +1496,17 @@ |
| michael@0 | 2214 | } && test -s conftest.$ac_objext; then : |
| michael@0 | 2215 | ac_retval=0 |
| michael@0 | 2216 | else |
| michael@0 | 2217 | $as_echo "$as_me: failed program was:" >&5 |
| michael@0 | 2218 | sed 's/^/| /' conftest.$ac_ext >&5 |
| michael@0 | 2219 | |
| michael@0 | 2220 | ac_retval=1 |
| michael@0 | 2221 | fi |
| michael@0 | 2222 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| michael@0 | 2223 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
| michael@0 | 2224 | as_fn_set_status $ac_retval |
| michael@0 | 2225 | |
| michael@0 | 2226 | } # ac_fn_c_try_compile |
| michael@0 | 2227 | |
| michael@0 | 2228 | # ac_fn_c_try_cpp LINENO |
| michael@0 | 2229 | # ---------------------- |
| michael@0 | 2230 | # Try to preprocess conftest.$ac_ext, and return whether this succeeded. |
| michael@0 | 2231 | ac_fn_c_try_cpp () |
| michael@0 | 2232 | @@ -1512,28 +1522,28 @@ |
| michael@0 | 2233 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err |
| michael@0 | 2234 | ac_status=$? |
| michael@0 | 2235 | if test -s conftest.err; then |
| michael@0 | 2236 | grep -v '^ *+' conftest.err >conftest.er1 |
| michael@0 | 2237 | cat conftest.er1 >&5 |
| michael@0 | 2238 | mv -f conftest.er1 conftest.err |
| michael@0 | 2239 | fi |
| michael@0 | 2240 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| michael@0 | 2241 | - test $ac_status = 0; } >/dev/null && { |
| michael@0 | 2242 | + test $ac_status = 0; } > conftest.i && { |
| michael@0 | 2243 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || |
| michael@0 | 2244 | test ! -s conftest.err |
| michael@0 | 2245 | }; then : |
| michael@0 | 2246 | ac_retval=0 |
| michael@0 | 2247 | else |
| michael@0 | 2248 | $as_echo "$as_me: failed program was:" >&5 |
| michael@0 | 2249 | sed 's/^/| /' conftest.$ac_ext >&5 |
| michael@0 | 2250 | |
| michael@0 | 2251 | ac_retval=1 |
| michael@0 | 2252 | fi |
| michael@0 | 2253 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| michael@0 | 2254 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
| michael@0 | 2255 | as_fn_set_status $ac_retval |
| michael@0 | 2256 | |
| michael@0 | 2257 | } # ac_fn_c_try_cpp |
| michael@0 | 2258 | |
| michael@0 | 2259 | # ac_fn_cxx_try_compile LINENO |
| michael@0 | 2260 | # ---------------------------- |
| michael@0 | 2261 | # Try to compile conftest.$ac_ext, and return whether this succeeded. |
| michael@0 | 2262 | ac_fn_cxx_try_compile () |
| michael@0 | 2263 | @@ -1561,17 +1571,17 @@ |
| michael@0 | 2264 | } && test -s conftest.$ac_objext; then : |
| michael@0 | 2265 | ac_retval=0 |
| michael@0 | 2266 | else |
| michael@0 | 2267 | $as_echo "$as_me: failed program was:" >&5 |
| michael@0 | 2268 | sed 's/^/| /' conftest.$ac_ext >&5 |
| michael@0 | 2269 | |
| michael@0 | 2270 | ac_retval=1 |
| michael@0 | 2271 | fi |
| michael@0 | 2272 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| michael@0 | 2273 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
| michael@0 | 2274 | as_fn_set_status $ac_retval |
| michael@0 | 2275 | |
| michael@0 | 2276 | } # ac_fn_cxx_try_compile |
| michael@0 | 2277 | |
| michael@0 | 2278 | # ac_fn_c_try_run LINENO |
| michael@0 | 2279 | # ---------------------- |
| michael@0 | 2280 | # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes |
| michael@0 | 2281 | # that executables *can* be run. |
| michael@0 | 2282 | @@ -1603,17 +1613,17 @@ |
| michael@0 | 2283 | else |
| michael@0 | 2284 | $as_echo "$as_me: program exited with status $ac_status" >&5 |
| michael@0 | 2285 | $as_echo "$as_me: failed program was:" >&5 |
| michael@0 | 2286 | sed 's/^/| /' conftest.$ac_ext >&5 |
| michael@0 | 2287 | |
| michael@0 | 2288 | ac_retval=$ac_status |
| michael@0 | 2289 | fi |
| michael@0 | 2290 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
| michael@0 | 2291 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| michael@0 | 2292 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
| michael@0 | 2293 | as_fn_set_status $ac_retval |
| michael@0 | 2294 | |
| michael@0 | 2295 | } # ac_fn_c_try_run |
| michael@0 | 2296 | |
| michael@0 | 2297 | # ac_fn_c_try_link LINENO |
| michael@0 | 2298 | # ----------------------- |
| michael@0 | 2299 | # Try to link conftest.$ac_ext, and return whether this succeeded. |
| michael@0 | 2300 | ac_fn_c_try_link () |
| michael@0 | 2301 | @@ -1649,33 +1659,33 @@ |
| michael@0 | 2302 | |
| michael@0 | 2303 | ac_retval=1 |
| michael@0 | 2304 | fi |
| michael@0 | 2305 | # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information |
| michael@0 | 2306 | # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would |
| michael@0 | 2307 | # interfere with the next link command; also delete a directory that is |
| michael@0 | 2308 | # left behind by Apple's compiler. We do this before executing the actions. |
| michael@0 | 2309 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
| michael@0 | 2310 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| michael@0 | 2311 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
| michael@0 | 2312 | as_fn_set_status $ac_retval |
| michael@0 | 2313 | |
| michael@0 | 2314 | } # ac_fn_c_try_link |
| michael@0 | 2315 | |
| michael@0 | 2316 | # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES |
| michael@0 | 2317 | # ------------------------------------------------------- |
| michael@0 | 2318 | # Tests whether HEADER exists, giving a warning if it cannot be compiled using |
| michael@0 | 2319 | # the include files in INCLUDES and setting the cache variable VAR |
| michael@0 | 2320 | # accordingly. |
| michael@0 | 2321 | ac_fn_c_check_header_mongrel () |
| michael@0 | 2322 | { |
| michael@0 | 2323 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
| michael@0 | 2324 | - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
| michael@0 | 2325 | + if eval \${$3+:} false; then : |
| michael@0 | 2326 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
| michael@0 | 2327 | $as_echo_n "checking for $2... " >&6; } |
| michael@0 | 2328 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
| michael@0 | 2329 | +if eval \${$3+:} false; then : |
| michael@0 | 2330 | $as_echo_n "(cached) " >&6 |
| michael@0 | 2331 | fi |
| michael@0 | 2332 | eval ac_res=\$$3 |
| michael@0 | 2333 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
| michael@0 | 2334 | $as_echo "$ac_res" >&6; } |
| michael@0 | 2335 | else |
| michael@0 | 2336 | # Is the header compilable? |
| michael@0 | 2337 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 |
| michael@0 | 2338 | @@ -1701,17 +1711,17 @@ |
| michael@0 | 2339 | /* end confdefs.h. */ |
| michael@0 | 2340 | #include <$2> |
| michael@0 | 2341 | _ACEOF |
| michael@0 | 2342 | if ac_fn_c_try_cpp "$LINENO"; then : |
| michael@0 | 2343 | ac_header_preproc=yes |
| michael@0 | 2344 | else |
| michael@0 | 2345 | ac_header_preproc=no |
| michael@0 | 2346 | fi |
| michael@0 | 2347 | -rm -f conftest.err conftest.$ac_ext |
| michael@0 | 2348 | +rm -f conftest.err conftest.i conftest.$ac_ext |
| michael@0 | 2349 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 |
| michael@0 | 2350 | $as_echo "$ac_header_preproc" >&6; } |
| michael@0 | 2351 | |
| michael@0 | 2352 | # So? What about this header? |
| michael@0 | 2353 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( |
| michael@0 | 2354 | yes:no: ) |
| michael@0 | 2355 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 |
| michael@0 | 2356 | $as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} |
| michael@0 | 2357 | @@ -1724,49 +1734,47 @@ |
| michael@0 | 2358 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 |
| michael@0 | 2359 | $as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} |
| michael@0 | 2360 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 |
| michael@0 | 2361 | $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} |
| michael@0 | 2362 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 |
| michael@0 | 2363 | $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} |
| michael@0 | 2364 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 |
| michael@0 | 2365 | $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} |
| michael@0 | 2366 | -( cat <<\_ASBOX |
| michael@0 | 2367 | -## --------------------------------------------------- ## |
| michael@0 | 2368 | +( $as_echo "## --------------------------------------------------- ## |
| michael@0 | 2369 | ## Report this to google-breakpad-dev@googlegroups.com ## |
| michael@0 | 2370 | -## --------------------------------------------------- ## |
| michael@0 | 2371 | -_ASBOX |
| michael@0 | 2372 | +## --------------------------------------------------- ##" |
| michael@0 | 2373 | ) | sed "s/^/$as_me: WARNING: /" >&2 |
| michael@0 | 2374 | ;; |
| michael@0 | 2375 | esac |
| michael@0 | 2376 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
| michael@0 | 2377 | $as_echo_n "checking for $2... " >&6; } |
| michael@0 | 2378 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
| michael@0 | 2379 | +if eval \${$3+:} false; then : |
| michael@0 | 2380 | $as_echo_n "(cached) " >&6 |
| michael@0 | 2381 | else |
| michael@0 | 2382 | eval "$3=\$ac_header_compiler" |
| michael@0 | 2383 | fi |
| michael@0 | 2384 | eval ac_res=\$$3 |
| michael@0 | 2385 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
| michael@0 | 2386 | $as_echo "$ac_res" >&6; } |
| michael@0 | 2387 | fi |
| michael@0 | 2388 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| michael@0 | 2389 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
| michael@0 | 2390 | |
| michael@0 | 2391 | } # ac_fn_c_check_header_mongrel |
| michael@0 | 2392 | |
| michael@0 | 2393 | # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES |
| michael@0 | 2394 | # ------------------------------------------------------- |
| michael@0 | 2395 | # Tests whether HEADER exists and can be compiled using the include files in |
| michael@0 | 2396 | # INCLUDES, setting the cache variable VAR accordingly. |
| michael@0 | 2397 | ac_fn_c_check_header_compile () |
| michael@0 | 2398 | { |
| michael@0 | 2399 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
| michael@0 | 2400 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
| michael@0 | 2401 | $as_echo_n "checking for $2... " >&6; } |
| michael@0 | 2402 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
| michael@0 | 2403 | +if eval \${$3+:} false; then : |
| michael@0 | 2404 | $as_echo_n "(cached) " >&6 |
| michael@0 | 2405 | else |
| michael@0 | 2406 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| michael@0 | 2407 | /* end confdefs.h. */ |
| michael@0 | 2408 | $4 |
| michael@0 | 2409 | #include <$2> |
| michael@0 | 2410 | _ACEOF |
| michael@0 | 2411 | if ac_fn_c_try_compile "$LINENO"; then : |
| michael@0 | 2412 | @@ -1774,25 +1782,25 @@ |
| michael@0 | 2413 | else |
| michael@0 | 2414 | eval "$3=no" |
| michael@0 | 2415 | fi |
| michael@0 | 2416 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| michael@0 | 2417 | fi |
| michael@0 | 2418 | eval ac_res=\$$3 |
| michael@0 | 2419 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
| michael@0 | 2420 | $as_echo "$ac_res" >&6; } |
| michael@0 | 2421 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| michael@0 | 2422 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
| michael@0 | 2423 | |
| michael@0 | 2424 | } # ac_fn_c_check_header_compile |
| michael@0 | 2425 | cat >config.log <<_ACEOF |
| michael@0 | 2426 | This file contains any messages produced by compilers while |
| michael@0 | 2427 | running configure, to aid debugging if configure makes a mistake. |
| michael@0 | 2428 | |
| michael@0 | 2429 | It was created by breakpad $as_me 0.1, which was |
| michael@0 | 2430 | -generated by GNU Autoconf 2.65. Invocation command line was |
| michael@0 | 2431 | +generated by GNU Autoconf 2.68. Invocation command line was |
| michael@0 | 2432 | |
| michael@0 | 2433 | $ $0 $@ |
| michael@0 | 2434 | |
| michael@0 | 2435 | _ACEOF |
| michael@0 | 2436 | exec 5>>config.log |
| michael@0 | 2437 | { |
| michael@0 | 2438 | cat <<_ASUNAME |
| michael@0 | 2439 | ## --------- ## |
| michael@0 | 2440 | @@ -1892,21 +1900,19 @@ |
| michael@0 | 2441 | # would cause problems or look ugly. |
| michael@0 | 2442 | # WARNING: Use '\'' to represent an apostrophe within the trap. |
| michael@0 | 2443 | # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. |
| michael@0 | 2444 | trap 'exit_status=$? |
| michael@0 | 2445 | # Save into config.log some information that might help in debugging. |
| michael@0 | 2446 | { |
| michael@0 | 2447 | echo |
| michael@0 | 2448 | |
| michael@0 | 2449 | - cat <<\_ASBOX |
| michael@0 | 2450 | -## ---------------- ## |
| michael@0 | 2451 | + $as_echo "## ---------------- ## |
| michael@0 | 2452 | ## Cache variables. ## |
| michael@0 | 2453 | -## ---------------- ## |
| michael@0 | 2454 | -_ASBOX |
| michael@0 | 2455 | +## ---------------- ##" |
| michael@0 | 2456 | echo |
| michael@0 | 2457 | # The following way of writing the cache mishandles newlines in values, |
| michael@0 | 2458 | ( |
| michael@0 | 2459 | for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do |
| michael@0 | 2460 | eval ac_val=\$$ac_var |
| michael@0 | 2461 | case $ac_val in #( |
| michael@0 | 2462 | *${as_nl}*) |
| michael@0 | 2463 | case $ac_var in #( |
| michael@0 | 2464 | @@ -1930,56 +1936,50 @@ |
| michael@0 | 2465 | *) |
| michael@0 | 2466 | sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" |
| michael@0 | 2467 | ;; |
| michael@0 | 2468 | esac | |
| michael@0 | 2469 | sort |
| michael@0 | 2470 | ) |
| michael@0 | 2471 | echo |
| michael@0 | 2472 | |
| michael@0 | 2473 | - cat <<\_ASBOX |
| michael@0 | 2474 | -## ----------------- ## |
| michael@0 | 2475 | + $as_echo "## ----------------- ## |
| michael@0 | 2476 | ## Output variables. ## |
| michael@0 | 2477 | -## ----------------- ## |
| michael@0 | 2478 | -_ASBOX |
| michael@0 | 2479 | +## ----------------- ##" |
| michael@0 | 2480 | echo |
| michael@0 | 2481 | for ac_var in $ac_subst_vars |
| michael@0 | 2482 | do |
| michael@0 | 2483 | eval ac_val=\$$ac_var |
| michael@0 | 2484 | case $ac_val in |
| michael@0 | 2485 | *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; |
| michael@0 | 2486 | esac |
| michael@0 | 2487 | $as_echo "$ac_var='\''$ac_val'\''" |
| michael@0 | 2488 | done | sort |
| michael@0 | 2489 | echo |
| michael@0 | 2490 | |
| michael@0 | 2491 | if test -n "$ac_subst_files"; then |
| michael@0 | 2492 | - cat <<\_ASBOX |
| michael@0 | 2493 | -## ------------------- ## |
| michael@0 | 2494 | + $as_echo "## ------------------- ## |
| michael@0 | 2495 | ## File substitutions. ## |
| michael@0 | 2496 | -## ------------------- ## |
| michael@0 | 2497 | -_ASBOX |
| michael@0 | 2498 | +## ------------------- ##" |
| michael@0 | 2499 | echo |
| michael@0 | 2500 | for ac_var in $ac_subst_files |
| michael@0 | 2501 | do |
| michael@0 | 2502 | eval ac_val=\$$ac_var |
| michael@0 | 2503 | case $ac_val in |
| michael@0 | 2504 | *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; |
| michael@0 | 2505 | esac |
| michael@0 | 2506 | $as_echo "$ac_var='\''$ac_val'\''" |
| michael@0 | 2507 | done | sort |
| michael@0 | 2508 | echo |
| michael@0 | 2509 | fi |
| michael@0 | 2510 | |
| michael@0 | 2511 | if test -s confdefs.h; then |
| michael@0 | 2512 | - cat <<\_ASBOX |
| michael@0 | 2513 | -## ----------- ## |
| michael@0 | 2514 | + $as_echo "## ----------- ## |
| michael@0 | 2515 | ## confdefs.h. ## |
| michael@0 | 2516 | -## ----------- ## |
| michael@0 | 2517 | -_ASBOX |
| michael@0 | 2518 | +## ----------- ##" |
| michael@0 | 2519 | echo |
| michael@0 | 2520 | cat confdefs.h |
| michael@0 | 2521 | echo |
| michael@0 | 2522 | fi |
| michael@0 | 2523 | test "$ac_signal" != 0 && |
| michael@0 | 2524 | $as_echo "$as_me: caught signal $ac_signal" |
| michael@0 | 2525 | $as_echo "$as_me: exit $exit_status" |
| michael@0 | 2526 | } >&5 |
| michael@0 | 2527 | @@ -2024,32 +2024,41 @@ |
| michael@0 | 2528 | _ACEOF |
| michael@0 | 2529 | |
| michael@0 | 2530 | |
| michael@0 | 2531 | # Let the site file select an alternate cache file if it wants to. |
| michael@0 | 2532 | # Prefer an explicitly selected file to automatically selected ones. |
| michael@0 | 2533 | ac_site_file1=NONE |
| michael@0 | 2534 | ac_site_file2=NONE |
| michael@0 | 2535 | if test -n "$CONFIG_SITE"; then |
| michael@0 | 2536 | - ac_site_file1=$CONFIG_SITE |
| michael@0 | 2537 | + # We do not want a PATH search for config.site. |
| michael@0 | 2538 | + case $CONFIG_SITE in #(( |
| michael@0 | 2539 | + -*) ac_site_file1=./$CONFIG_SITE;; |
| michael@0 | 2540 | + */*) ac_site_file1=$CONFIG_SITE;; |
| michael@0 | 2541 | + *) ac_site_file1=./$CONFIG_SITE;; |
| michael@0 | 2542 | + esac |
| michael@0 | 2543 | elif test "x$prefix" != xNONE; then |
| michael@0 | 2544 | ac_site_file1=$prefix/share/config.site |
| michael@0 | 2545 | ac_site_file2=$prefix/etc/config.site |
| michael@0 | 2546 | else |
| michael@0 | 2547 | ac_site_file1=$ac_default_prefix/share/config.site |
| michael@0 | 2548 | ac_site_file2=$ac_default_prefix/etc/config.site |
| michael@0 | 2549 | fi |
| michael@0 | 2550 | for ac_site_file in "$ac_site_file1" "$ac_site_file2" |
| michael@0 | 2551 | do |
| michael@0 | 2552 | test "x$ac_site_file" = xNONE && continue |
| michael@0 | 2553 | if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then |
| michael@0 | 2554 | { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 |
| michael@0 | 2555 | $as_echo "$as_me: loading site script $ac_site_file" >&6;} |
| michael@0 | 2556 | sed 's/^/| /' "$ac_site_file" >&5 |
| michael@0 | 2557 | - . "$ac_site_file" |
| michael@0 | 2558 | + . "$ac_site_file" \ |
| michael@0 | 2559 | + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| michael@0 | 2560 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| michael@0 | 2561 | +as_fn_error $? "failed to load site script $ac_site_file |
| michael@0 | 2562 | +See \`config.log' for more details" "$LINENO" 5; } |
| michael@0 | 2563 | fi |
| michael@0 | 2564 | done |
| michael@0 | 2565 | |
| michael@0 | 2566 | if test -r "$cache_file"; then |
| michael@0 | 2567 | # Some versions of bash will fail to source /dev/null (special files |
| michael@0 | 2568 | # actually), so we avoid doing that. DJGPP emulates it as a regular file. |
| michael@0 | 2569 | if test /dev/null != "$cache_file" && test -f "$cache_file"; then |
| michael@0 | 2570 | { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 |
| michael@0 | 2571 | @@ -2115,77 +2124,83 @@ |
| michael@0 | 2572 | esac |
| michael@0 | 2573 | fi |
| michael@0 | 2574 | done |
| michael@0 | 2575 | if $ac_cache_corrupted; then |
| michael@0 | 2576 | { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| michael@0 | 2577 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| michael@0 | 2578 | { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 |
| michael@0 | 2579 | $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} |
| michael@0 | 2580 | - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 |
| michael@0 | 2581 | + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 |
| michael@0 | 2582 | fi |
| michael@0 | 2583 | ## -------------------- ## |
| michael@0 | 2584 | ## Main body of script. ## |
| michael@0 | 2585 | ## -------------------- ## |
| michael@0 | 2586 | |
| michael@0 | 2587 | ac_ext=c |
| michael@0 | 2588 | ac_cpp='$CPP $CPPFLAGS' |
| michael@0 | 2589 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| michael@0 | 2590 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
| michael@0 | 2591 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| michael@0 | 2592 | |
| michael@0 | 2593 | |
| michael@0 | 2594 | |
| michael@0 | 2595 | ac_aux_dir= |
| michael@0 | 2596 | for ac_dir in autotools "$srcdir"/autotools; do |
| michael@0 | 2597 | - for ac_t in install-sh install.sh shtool; do |
| michael@0 | 2598 | - if test -f "$ac_dir/$ac_t"; then |
| michael@0 | 2599 | - ac_aux_dir=$ac_dir |
| michael@0 | 2600 | - ac_install_sh="$ac_aux_dir/$ac_t -c" |
| michael@0 | 2601 | - break 2 |
| michael@0 | 2602 | - fi |
| michael@0 | 2603 | - done |
| michael@0 | 2604 | + if test -f "$ac_dir/install-sh"; then |
| michael@0 | 2605 | + ac_aux_dir=$ac_dir |
| michael@0 | 2606 | + ac_install_sh="$ac_aux_dir/install-sh -c" |
| michael@0 | 2607 | + break |
| michael@0 | 2608 | + elif test -f "$ac_dir/install.sh"; then |
| michael@0 | 2609 | + ac_aux_dir=$ac_dir |
| michael@0 | 2610 | + ac_install_sh="$ac_aux_dir/install.sh -c" |
| michael@0 | 2611 | + break |
| michael@0 | 2612 | + elif test -f "$ac_dir/shtool"; then |
| michael@0 | 2613 | + ac_aux_dir=$ac_dir |
| michael@0 | 2614 | + ac_install_sh="$ac_aux_dir/shtool install -c" |
| michael@0 | 2615 | + break |
| michael@0 | 2616 | + fi |
| michael@0 | 2617 | done |
| michael@0 | 2618 | if test -z "$ac_aux_dir"; then |
| michael@0 | 2619 | - as_fn_error "cannot find install-sh, install.sh, or shtool in autotools \"$srcdir\"/autotools" "$LINENO" 5 |
| michael@0 | 2620 | + as_fn_error $? "cannot find install-sh, install.sh, or shtool in autotools \"$srcdir\"/autotools" "$LINENO" 5 |
| michael@0 | 2621 | fi |
| michael@0 | 2622 | |
| michael@0 | 2623 | # These three variables are undocumented and unsupported, |
| michael@0 | 2624 | # and are intended to be withdrawn in a future Autoconf release. |
| michael@0 | 2625 | # They can cause serious problems if a builder's source tree is in a directory |
| michael@0 | 2626 | # whose full name contains unusual characters. |
| michael@0 | 2627 | ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. |
| michael@0 | 2628 | ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. |
| michael@0 | 2629 | ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. |
| michael@0 | 2630 | |
| michael@0 | 2631 | |
| michael@0 | 2632 | |
| michael@0 | 2633 | # Make sure we can run config.sub. |
| michael@0 | 2634 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || |
| michael@0 | 2635 | - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 |
| michael@0 | 2636 | + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 |
| michael@0 | 2637 | |
| michael@0 | 2638 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 |
| michael@0 | 2639 | $as_echo_n "checking build system type... " >&6; } |
| michael@0 | 2640 | -if test "${ac_cv_build+set}" = set; then : |
| michael@0 | 2641 | +if ${ac_cv_build+:} false; then : |
| michael@0 | 2642 | $as_echo_n "(cached) " >&6 |
| michael@0 | 2643 | else |
| michael@0 | 2644 | ac_build_alias=$build_alias |
| michael@0 | 2645 | test "x$ac_build_alias" = x && |
| michael@0 | 2646 | ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` |
| michael@0 | 2647 | test "x$ac_build_alias" = x && |
| michael@0 | 2648 | - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 |
| michael@0 | 2649 | + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 |
| michael@0 | 2650 | ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || |
| michael@0 | 2651 | - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 |
| michael@0 | 2652 | + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 |
| michael@0 | 2653 | |
| michael@0 | 2654 | fi |
| michael@0 | 2655 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 |
| michael@0 | 2656 | $as_echo "$ac_cv_build" >&6; } |
| michael@0 | 2657 | case $ac_cv_build in |
| michael@0 | 2658 | *-*-*) ;; |
| michael@0 | 2659 | -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; |
| michael@0 | 2660 | +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; |
| michael@0 | 2661 | esac |
| michael@0 | 2662 | build=$ac_cv_build |
| michael@0 | 2663 | ac_save_IFS=$IFS; IFS='-' |
| michael@0 | 2664 | set x $ac_cv_build |
| michael@0 | 2665 | shift |
| michael@0 | 2666 | build_cpu=$1 |
| michael@0 | 2667 | build_vendor=$2 |
| michael@0 | 2668 | shift; shift |
| michael@0 | 2669 | @@ -2193,32 +2208,32 @@ |
| michael@0 | 2670 | # except with old shells: |
| michael@0 | 2671 | build_os=$* |
| michael@0 | 2672 | IFS=$ac_save_IFS |
| michael@0 | 2673 | case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac |
| michael@0 | 2674 | |
| michael@0 | 2675 | |
| michael@0 | 2676 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 |
| michael@0 | 2677 | $as_echo_n "checking host system type... " >&6; } |
| michael@0 | 2678 | -if test "${ac_cv_host+set}" = set; then : |
| michael@0 | 2679 | +if ${ac_cv_host+:} false; then : |
| michael@0 | 2680 | $as_echo_n "(cached) " >&6 |
| michael@0 | 2681 | else |
| michael@0 | 2682 | if test "x$host_alias" = x; then |
| michael@0 | 2683 | ac_cv_host=$ac_cv_build |
| michael@0 | 2684 | else |
| michael@0 | 2685 | ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || |
| michael@0 | 2686 | - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 |
| michael@0 | 2687 | + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 |
| michael@0 | 2688 | fi |
| michael@0 | 2689 | |
| michael@0 | 2690 | fi |
| michael@0 | 2691 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 |
| michael@0 | 2692 | $as_echo "$ac_cv_host" >&6; } |
| michael@0 | 2693 | case $ac_cv_host in |
| michael@0 | 2694 | *-*-*) ;; |
| michael@0 | 2695 | -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; |
| michael@0 | 2696 | +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; |
| michael@0 | 2697 | esac |
| michael@0 | 2698 | host=$ac_cv_host |
| michael@0 | 2699 | ac_save_IFS=$IFS; IFS='-' |
| michael@0 | 2700 | set x $ac_cv_host |
| michael@0 | 2701 | shift |
| michael@0 | 2702 | host_cpu=$1 |
| michael@0 | 2703 | host_vendor=$2 |
| michael@0 | 2704 | shift; shift |
| michael@0 | 2705 | @@ -2244,17 +2259,17 @@ |
| michael@0 | 2706 | # AFS /usr/afsws/bin/install, which mishandles nonexistent args |
| michael@0 | 2707 | # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" |
| michael@0 | 2708 | # OS/2's system install, which has a completely different semantic |
| michael@0 | 2709 | # ./install, which can be erroneously created by make from ./install.sh. |
| michael@0 | 2710 | # Reject install programs that cannot install multiple files. |
| michael@0 | 2711 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 |
| michael@0 | 2712 | $as_echo_n "checking for a BSD-compatible install... " >&6; } |
| michael@0 | 2713 | if test -z "$INSTALL"; then |
| michael@0 | 2714 | -if test "${ac_cv_path_install+set}" = set; then : |
| michael@0 | 2715 | +if ${ac_cv_path_install+:} false; then : |
| michael@0 | 2716 | $as_echo_n "(cached) " >&6 |
| michael@0 | 2717 | else |
| michael@0 | 2718 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 2719 | for as_dir in $PATH |
| michael@0 | 2720 | do |
| michael@0 | 2721 | IFS=$as_save_IFS |
| michael@0 | 2722 | test -z "$as_dir" && as_dir=. |
| michael@0 | 2723 | # Account for people who put trailing slashes in PATH elements. |
| michael@0 | 2724 | @@ -2331,21 +2346,21 @@ |
| michael@0 | 2725 | sleep 1 |
| michael@0 | 2726 | echo timestamp > conftest.file |
| michael@0 | 2727 | # Reject unsafe characters in $srcdir or the absolute working directory |
| michael@0 | 2728 | # name. Accept space and tab only in the latter. |
| michael@0 | 2729 | am_lf=' |
| michael@0 | 2730 | ' |
| michael@0 | 2731 | case `pwd` in |
| michael@0 | 2732 | *[\\\"\#\$\&\'\`$am_lf]*) |
| michael@0 | 2733 | - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; |
| michael@0 | 2734 | + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; |
| michael@0 | 2735 | esac |
| michael@0 | 2736 | case $srcdir in |
| michael@0 | 2737 | *[\\\"\#\$\&\'\`$am_lf\ \ ]*) |
| michael@0 | 2738 | - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; |
| michael@0 | 2739 | + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; |
| michael@0 | 2740 | esac |
| michael@0 | 2741 | |
| michael@0 | 2742 | # Do `set' in a subshell so we don't clobber the current shell's |
| michael@0 | 2743 | # arguments. Must try -L first in case configure is actually a |
| michael@0 | 2744 | # symlink; some systems play weird games with the mod time of symlinks |
| michael@0 | 2745 | # (eg FreeBSD returns the mod time of the symlink's containing |
| michael@0 | 2746 | # directory). |
| michael@0 | 2747 | if ( |
| michael@0 | 2748 | @@ -2357,27 +2372,27 @@ |
| michael@0 | 2749 | rm -f conftest.file |
| michael@0 | 2750 | if test "$*" != "X $srcdir/configure conftest.file" \ |
| michael@0 | 2751 | && test "$*" != "X conftest.file $srcdir/configure"; then |
| michael@0 | 2752 | |
| michael@0 | 2753 | # If neither matched, then we have a broken ls. This can happen |
| michael@0 | 2754 | # if, for instance, CONFIG_SHELL is bash and it inherits a |
| michael@0 | 2755 | # broken ls alias from the environment. This has actually |
| michael@0 | 2756 | # happened. Such a system could not be considered "sane". |
| michael@0 | 2757 | - as_fn_error "ls -t appears to fail. Make sure there is not a broken |
| michael@0 | 2758 | + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken |
| michael@0 | 2759 | alias in your environment" "$LINENO" 5 |
| michael@0 | 2760 | fi |
| michael@0 | 2761 | |
| michael@0 | 2762 | test "$2" = conftest.file |
| michael@0 | 2763 | ) |
| michael@0 | 2764 | then |
| michael@0 | 2765 | # Ok. |
| michael@0 | 2766 | : |
| michael@0 | 2767 | else |
| michael@0 | 2768 | - as_fn_error "newly created file is older than distributed files! |
| michael@0 | 2769 | + as_fn_error $? "newly created file is older than distributed files! |
| michael@0 | 2770 | Check your system clock" "$LINENO" 5 |
| michael@0 | 2771 | fi |
| michael@0 | 2772 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
| michael@0 | 2773 | $as_echo "yes" >&6; } |
| michael@0 | 2774 | test "$program_prefix" != NONE && |
| michael@0 | 2775 | program_transform_name="s&^&$program_prefix&;$program_transform_name" |
| michael@0 | 2776 | # Use a double $ so make ignores it. |
| michael@0 | 2777 | test "$program_suffix" != NONE && |
| michael@0 | 2778 | @@ -2421,17 +2436,17 @@ |
| michael@0 | 2779 | # tool to use in cross-compilation environments, therefore Automake |
| michael@0 | 2780 | # will honor the `STRIP' environment variable to overrule this program. |
| michael@0 | 2781 | if test "$cross_compiling" != no; then |
| michael@0 | 2782 | if test -n "$ac_tool_prefix"; then |
| michael@0 | 2783 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
| michael@0 | 2784 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
| michael@0 | 2785 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 2786 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 2787 | -if test "${ac_cv_prog_STRIP+set}" = set; then : |
| michael@0 | 2788 | +if ${ac_cv_prog_STRIP+:} false; then : |
| michael@0 | 2789 | $as_echo_n "(cached) " >&6 |
| michael@0 | 2790 | else |
| michael@0 | 2791 | if test -n "$STRIP"; then |
| michael@0 | 2792 | ac_cv_prog_STRIP="$STRIP" # Let the user override the test. |
| michael@0 | 2793 | else |
| michael@0 | 2794 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 2795 | for as_dir in $PATH |
| michael@0 | 2796 | do |
| michael@0 | 2797 | @@ -2461,17 +2476,17 @@ |
| michael@0 | 2798 | |
| michael@0 | 2799 | fi |
| michael@0 | 2800 | if test -z "$ac_cv_prog_STRIP"; then |
| michael@0 | 2801 | ac_ct_STRIP=$STRIP |
| michael@0 | 2802 | # Extract the first word of "strip", so it can be a program name with args. |
| michael@0 | 2803 | set dummy strip; ac_word=$2 |
| michael@0 | 2804 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 2805 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 2806 | -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : |
| michael@0 | 2807 | +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : |
| michael@0 | 2808 | $as_echo_n "(cached) " >&6 |
| michael@0 | 2809 | else |
| michael@0 | 2810 | if test -n "$ac_ct_STRIP"; then |
| michael@0 | 2811 | ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. |
| michael@0 | 2812 | else |
| michael@0 | 2813 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 2814 | for as_dir in $PATH |
| michael@0 | 2815 | do |
| michael@0 | 2816 | @@ -2514,17 +2529,17 @@ |
| michael@0 | 2817 | fi |
| michael@0 | 2818 | |
| michael@0 | 2819 | fi |
| michael@0 | 2820 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
| michael@0 | 2821 | |
| michael@0 | 2822 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 |
| michael@0 | 2823 | $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } |
| michael@0 | 2824 | if test -z "$MKDIR_P"; then |
| michael@0 | 2825 | - if test "${ac_cv_path_mkdir+set}" = set; then : |
| michael@0 | 2826 | + if ${ac_cv_path_mkdir+:} false; then : |
| michael@0 | 2827 | $as_echo_n "(cached) " >&6 |
| michael@0 | 2828 | else |
| michael@0 | 2829 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 2830 | for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin |
| michael@0 | 2831 | do |
| michael@0 | 2832 | IFS=$as_save_IFS |
| michael@0 | 2833 | test -z "$as_dir" && as_dir=. |
| michael@0 | 2834 | for ac_prog in mkdir gmkdir; do |
| michael@0 | 2835 | @@ -2565,17 +2580,17 @@ |
| michael@0 | 2836 | esac |
| michael@0 | 2837 | |
| michael@0 | 2838 | for ac_prog in gawk mawk nawk awk |
| michael@0 | 2839 | do |
| michael@0 | 2840 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
| michael@0 | 2841 | set dummy $ac_prog; ac_word=$2 |
| michael@0 | 2842 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 2843 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 2844 | -if test "${ac_cv_prog_AWK+set}" = set; then : |
| michael@0 | 2845 | +if ${ac_cv_prog_AWK+:} false; then : |
| michael@0 | 2846 | $as_echo_n "(cached) " >&6 |
| michael@0 | 2847 | else |
| michael@0 | 2848 | if test -n "$AWK"; then |
| michael@0 | 2849 | ac_cv_prog_AWK="$AWK" # Let the user override the test. |
| michael@0 | 2850 | else |
| michael@0 | 2851 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 2852 | for as_dir in $PATH |
| michael@0 | 2853 | do |
| michael@0 | 2854 | @@ -2605,25 +2620,25 @@ |
| michael@0 | 2855 | |
| michael@0 | 2856 | test -n "$AWK" && break |
| michael@0 | 2857 | done |
| michael@0 | 2858 | |
| michael@0 | 2859 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 |
| michael@0 | 2860 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } |
| michael@0 | 2861 | set x ${MAKE-make} |
| michael@0 | 2862 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` |
| michael@0 | 2863 | -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : |
| michael@0 | 2864 | +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : |
| michael@0 | 2865 | $as_echo_n "(cached) " >&6 |
| michael@0 | 2866 | else |
| michael@0 | 2867 | cat >conftest.make <<\_ACEOF |
| michael@0 | 2868 | SHELL = /bin/sh |
| michael@0 | 2869 | all: |
| michael@0 | 2870 | @echo '@@@%%%=$(MAKE)=@@@%%%' |
| michael@0 | 2871 | _ACEOF |
| michael@0 | 2872 | -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. |
| michael@0 | 2873 | +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. |
| michael@0 | 2874 | case `${MAKE-make} -f conftest.make 2>/dev/null` in |
| michael@0 | 2875 | *@@@%%%=?*=@@@%%%*) |
| michael@0 | 2876 | eval ac_cv_prog_make_${ac_make}_set=yes;; |
| michael@0 | 2877 | *) |
| michael@0 | 2878 | eval ac_cv_prog_make_${ac_make}_set=no;; |
| michael@0 | 2879 | esac |
| michael@0 | 2880 | rm -f conftest.make |
| michael@0 | 2881 | fi |
| michael@0 | 2882 | @@ -2647,17 +2662,17 @@ |
| michael@0 | 2883 | rmdir .tst 2>/dev/null |
| michael@0 | 2884 | |
| michael@0 | 2885 | if test "`cd $srcdir && pwd`" != "`pwd`"; then |
| michael@0 | 2886 | # Use -I$(srcdir) only when $(srcdir) != ., so that make's output |
| michael@0 | 2887 | # is not polluted with repeated "-I." |
| michael@0 | 2888 | am__isrc=' -I$(srcdir)' |
| michael@0 | 2889 | # test to see if srcdir already configured |
| michael@0 | 2890 | if test -f $srcdir/config.status; then |
| michael@0 | 2891 | - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 |
| michael@0 | 2892 | + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 |
| michael@0 | 2893 | fi |
| michael@0 | 2894 | fi |
| michael@0 | 2895 | |
| michael@0 | 2896 | # test whether we have cygpath |
| michael@0 | 2897 | if test -z "$CYGPATH_W"; then |
| michael@0 | 2898 | if (cygpath --version) >/dev/null 2>/dev/null; then |
| michael@0 | 2899 | CYGPATH_W='cygpath -w' |
| michael@0 | 2900 | else |
| michael@0 | 2901 | @@ -2693,19 +2708,19 @@ |
| michael@0 | 2902 | |
| michael@0 | 2903 | AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} |
| michael@0 | 2904 | |
| michael@0 | 2905 | |
| michael@0 | 2906 | MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} |
| michael@0 | 2907 | |
| michael@0 | 2908 | # We need awk for the "check" target. The system "awk" is bad on |
| michael@0 | 2909 | # some platforms. |
| michael@0 | 2910 | -# Always define AMTAR for backward compatibility. |
| michael@0 | 2911 | - |
| michael@0 | 2912 | -AMTAR=${AMTAR-"${am_missing_run}tar"} |
| michael@0 | 2913 | +# Always define AMTAR for backward compatibility. Yes, it's still used |
| michael@0 | 2914 | +# in the wild :-( We should find a proper way to deprecate it ... |
| michael@0 | 2915 | +AMTAR='$${TAR-tar}' |
| michael@0 | 2916 | |
| michael@0 | 2917 | |
| michael@0 | 2918 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 |
| michael@0 | 2919 | $as_echo_n "checking how to create a ustar tar archive... " >&6; } |
| michael@0 | 2920 | # Loop over all known methods to create a tar archive until one works. |
| michael@0 | 2921 | _am_tools='gnutar plaintar pax cpio none' |
| michael@0 | 2922 | _am_tools=${am_cv_prog_tar_ustar-$_am_tools} |
| michael@0 | 2923 | # Do not fold the above two line into one, because Tru64 sh and |
| michael@0 | 2924 | @@ -2771,17 +2786,17 @@ |
| michael@0 | 2925 | ac_status=$? |
| michael@0 | 2926 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| michael@0 | 2927 | (exit $ac_status); } |
| michael@0 | 2928 | grep GrepMe conftest.dir/file >/dev/null 2>&1 && break |
| michael@0 | 2929 | fi |
| michael@0 | 2930 | done |
| michael@0 | 2931 | rm -rf conftest.dir |
| michael@0 | 2932 | |
| michael@0 | 2933 | -if test "${am_cv_prog_tar_ustar+set}" = set; then : |
| michael@0 | 2934 | +if ${am_cv_prog_tar_ustar+:} false; then : |
| michael@0 | 2935 | $as_echo_n "(cached) " >&6 |
| michael@0 | 2936 | else |
| michael@0 | 2937 | am_cv_prog_tar_ustar=$_am_tool |
| michael@0 | 2938 | fi |
| michael@0 | 2939 | |
| michael@0 | 2940 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 |
| michael@0 | 2941 | $as_echo "$am_cv_prog_tar_ustar" >&6; } |
| michael@0 | 2942 | |
| michael@0 | 2943 | @@ -2839,16 +2854,17 @@ |
| michael@0 | 2944 | # Check whether --enable-dependency-tracking was given. |
| michael@0 | 2945 | if test "${enable_dependency_tracking+set}" = set; then : |
| michael@0 | 2946 | enableval=$enable_dependency_tracking; |
| michael@0 | 2947 | fi |
| michael@0 | 2948 | |
| michael@0 | 2949 | if test "x$enable_dependency_tracking" != xno; then |
| michael@0 | 2950 | am_depcomp="$ac_aux_dir/depcomp" |
| michael@0 | 2951 | AMDEPBACKSLASH='\' |
| michael@0 | 2952 | + am__nodep='_no' |
| michael@0 | 2953 | fi |
| michael@0 | 2954 | if test "x$enable_dependency_tracking" != xno; then |
| michael@0 | 2955 | AMDEP_TRUE= |
| michael@0 | 2956 | AMDEP_FALSE='#' |
| michael@0 | 2957 | else |
| michael@0 | 2958 | AMDEP_TRUE='#' |
| michael@0 | 2959 | AMDEP_FALSE= |
| michael@0 | 2960 | fi |
| michael@0 | 2961 | @@ -2859,17 +2875,17 @@ |
| michael@0 | 2962 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| michael@0 | 2963 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
| michael@0 | 2964 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| michael@0 | 2965 | if test -n "$ac_tool_prefix"; then |
| michael@0 | 2966 | # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. |
| michael@0 | 2967 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 |
| michael@0 | 2968 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 2969 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 2970 | -if test "${ac_cv_prog_CC+set}" = set; then : |
| michael@0 | 2971 | +if ${ac_cv_prog_CC+:} false; then : |
| michael@0 | 2972 | $as_echo_n "(cached) " >&6 |
| michael@0 | 2973 | else |
| michael@0 | 2974 | if test -n "$CC"; then |
| michael@0 | 2975 | ac_cv_prog_CC="$CC" # Let the user override the test. |
| michael@0 | 2976 | else |
| michael@0 | 2977 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 2978 | for as_dir in $PATH |
| michael@0 | 2979 | do |
| michael@0 | 2980 | @@ -2899,17 +2915,17 @@ |
| michael@0 | 2981 | |
| michael@0 | 2982 | fi |
| michael@0 | 2983 | if test -z "$ac_cv_prog_CC"; then |
| michael@0 | 2984 | ac_ct_CC=$CC |
| michael@0 | 2985 | # Extract the first word of "gcc", so it can be a program name with args. |
| michael@0 | 2986 | set dummy gcc; ac_word=$2 |
| michael@0 | 2987 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 2988 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 2989 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
| michael@0 | 2990 | +if ${ac_cv_prog_ac_ct_CC+:} false; then : |
| michael@0 | 2991 | $as_echo_n "(cached) " >&6 |
| michael@0 | 2992 | else |
| michael@0 | 2993 | if test -n "$ac_ct_CC"; then |
| michael@0 | 2994 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. |
| michael@0 | 2995 | else |
| michael@0 | 2996 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 2997 | for as_dir in $PATH |
| michael@0 | 2998 | do |
| michael@0 | 2999 | @@ -2952,17 +2968,17 @@ |
| michael@0 | 3000 | fi |
| michael@0 | 3001 | |
| michael@0 | 3002 | if test -z "$CC"; then |
| michael@0 | 3003 | if test -n "$ac_tool_prefix"; then |
| michael@0 | 3004 | # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. |
| michael@0 | 3005 | set dummy ${ac_tool_prefix}cc; ac_word=$2 |
| michael@0 | 3006 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 3007 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 3008 | -if test "${ac_cv_prog_CC+set}" = set; then : |
| michael@0 | 3009 | +if ${ac_cv_prog_CC+:} false; then : |
| michael@0 | 3010 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3011 | else |
| michael@0 | 3012 | if test -n "$CC"; then |
| michael@0 | 3013 | ac_cv_prog_CC="$CC" # Let the user override the test. |
| michael@0 | 3014 | else |
| michael@0 | 3015 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 3016 | for as_dir in $PATH |
| michael@0 | 3017 | do |
| michael@0 | 3018 | @@ -2992,17 +3008,17 @@ |
| michael@0 | 3019 | |
| michael@0 | 3020 | fi |
| michael@0 | 3021 | fi |
| michael@0 | 3022 | if test -z "$CC"; then |
| michael@0 | 3023 | # Extract the first word of "cc", so it can be a program name with args. |
| michael@0 | 3024 | set dummy cc; ac_word=$2 |
| michael@0 | 3025 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 3026 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 3027 | -if test "${ac_cv_prog_CC+set}" = set; then : |
| michael@0 | 3028 | +if ${ac_cv_prog_CC+:} false; then : |
| michael@0 | 3029 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3030 | else |
| michael@0 | 3031 | if test -n "$CC"; then |
| michael@0 | 3032 | ac_cv_prog_CC="$CC" # Let the user override the test. |
| michael@0 | 3033 | else |
| michael@0 | 3034 | ac_prog_rejected=no |
| michael@0 | 3035 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 3036 | for as_dir in $PATH |
| michael@0 | 3037 | @@ -3051,17 +3067,17 @@ |
| michael@0 | 3038 | if test -z "$CC"; then |
| michael@0 | 3039 | if test -n "$ac_tool_prefix"; then |
| michael@0 | 3040 | for ac_prog in cl.exe |
| michael@0 | 3041 | do |
| michael@0 | 3042 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| michael@0 | 3043 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| michael@0 | 3044 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 3045 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 3046 | -if test "${ac_cv_prog_CC+set}" = set; then : |
| michael@0 | 3047 | +if ${ac_cv_prog_CC+:} false; then : |
| michael@0 | 3048 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3049 | else |
| michael@0 | 3050 | if test -n "$CC"; then |
| michael@0 | 3051 | ac_cv_prog_CC="$CC" # Let the user override the test. |
| michael@0 | 3052 | else |
| michael@0 | 3053 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 3054 | for as_dir in $PATH |
| michael@0 | 3055 | do |
| michael@0 | 3056 | @@ -3095,17 +3111,17 @@ |
| michael@0 | 3057 | if test -z "$CC"; then |
| michael@0 | 3058 | ac_ct_CC=$CC |
| michael@0 | 3059 | for ac_prog in cl.exe |
| michael@0 | 3060 | do |
| michael@0 | 3061 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
| michael@0 | 3062 | set dummy $ac_prog; ac_word=$2 |
| michael@0 | 3063 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 3064 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 3065 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
| michael@0 | 3066 | +if ${ac_cv_prog_ac_ct_CC+:} false; then : |
| michael@0 | 3067 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3068 | else |
| michael@0 | 3069 | if test -n "$ac_ct_CC"; then |
| michael@0 | 3070 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. |
| michael@0 | 3071 | else |
| michael@0 | 3072 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 3073 | for as_dir in $PATH |
| michael@0 | 3074 | do |
| michael@0 | 3075 | @@ -3149,18 +3165,18 @@ |
| michael@0 | 3076 | fi |
| michael@0 | 3077 | fi |
| michael@0 | 3078 | |
| michael@0 | 3079 | fi |
| michael@0 | 3080 | |
| michael@0 | 3081 | |
| michael@0 | 3082 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| michael@0 | 3083 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| michael@0 | 3084 | -as_fn_error "no acceptable C compiler found in \$PATH |
| michael@0 | 3085 | -See \`config.log' for more details." "$LINENO" 5; } |
| michael@0 | 3086 | +as_fn_error $? "no acceptable C compiler found in \$PATH |
| michael@0 | 3087 | +See \`config.log' for more details" "$LINENO" 5; } |
| michael@0 | 3088 | |
| michael@0 | 3089 | # Provide some information about the compiler. |
| michael@0 | 3090 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
| michael@0 | 3091 | set X $ac_compile |
| michael@0 | 3092 | ac_compiler=$2 |
| michael@0 | 3093 | for ac_option in --version -v -V -qversion; do |
| michael@0 | 3094 | { { ac_try="$ac_compiler $ac_option >&5" |
| michael@0 | 3095 | case "(($ac_try" in |
| michael@0 | 3096 | @@ -3264,19 +3280,18 @@ |
| michael@0 | 3097 | if test -z "$ac_file"; then : |
| michael@0 | 3098 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| michael@0 | 3099 | $as_echo "no" >&6; } |
| michael@0 | 3100 | $as_echo "$as_me: failed program was:" >&5 |
| michael@0 | 3101 | sed 's/^/| /' conftest.$ac_ext >&5 |
| michael@0 | 3102 | |
| michael@0 | 3103 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| michael@0 | 3104 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| michael@0 | 3105 | -{ as_fn_set_status 77 |
| michael@0 | 3106 | -as_fn_error "C compiler cannot create executables |
| michael@0 | 3107 | -See \`config.log' for more details." "$LINENO" 5; }; } |
| michael@0 | 3108 | +as_fn_error 77 "C compiler cannot create executables |
| michael@0 | 3109 | +See \`config.log' for more details" "$LINENO" 5; } |
| michael@0 | 3110 | else |
| michael@0 | 3111 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
| michael@0 | 3112 | $as_echo "yes" >&6; } |
| michael@0 | 3113 | fi |
| michael@0 | 3114 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 |
| michael@0 | 3115 | $as_echo_n "checking for C compiler default output file name... " >&6; } |
| michael@0 | 3116 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 |
| michael@0 | 3117 | $as_echo "$ac_file" >&6; } |
| michael@0 | 3118 | @@ -3308,18 +3323,18 @@ |
| michael@0 | 3119 | *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` |
| michael@0 | 3120 | break;; |
| michael@0 | 3121 | * ) break;; |
| michael@0 | 3122 | esac |
| michael@0 | 3123 | done |
| michael@0 | 3124 | else |
| michael@0 | 3125 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| michael@0 | 3126 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| michael@0 | 3127 | -as_fn_error "cannot compute suffix of executables: cannot compile and link |
| michael@0 | 3128 | -See \`config.log' for more details." "$LINENO" 5; } |
| michael@0 | 3129 | +as_fn_error $? "cannot compute suffix of executables: cannot compile and link |
| michael@0 | 3130 | +See \`config.log' for more details" "$LINENO" 5; } |
| michael@0 | 3131 | fi |
| michael@0 | 3132 | rm -f conftest conftest$ac_cv_exeext |
| michael@0 | 3133 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 |
| michael@0 | 3134 | $as_echo "$ac_cv_exeext" >&6; } |
| michael@0 | 3135 | |
| michael@0 | 3136 | rm -f conftest.$ac_ext |
| michael@0 | 3137 | EXEEXT=$ac_cv_exeext |
| michael@0 | 3138 | ac_exeext=$EXEEXT |
| michael@0 | 3139 | @@ -3366,30 +3381,30 @@ |
| michael@0 | 3140 | test $ac_status = 0; }; }; then |
| michael@0 | 3141 | cross_compiling=no |
| michael@0 | 3142 | else |
| michael@0 | 3143 | if test "$cross_compiling" = maybe; then |
| michael@0 | 3144 | cross_compiling=yes |
| michael@0 | 3145 | else |
| michael@0 | 3146 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| michael@0 | 3147 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| michael@0 | 3148 | -as_fn_error "cannot run C compiled programs. |
| michael@0 | 3149 | +as_fn_error $? "cannot run C compiled programs. |
| michael@0 | 3150 | If you meant to cross compile, use \`--host'. |
| michael@0 | 3151 | -See \`config.log' for more details." "$LINENO" 5; } |
| michael@0 | 3152 | +See \`config.log' for more details" "$LINENO" 5; } |
| michael@0 | 3153 | fi |
| michael@0 | 3154 | fi |
| michael@0 | 3155 | fi |
| michael@0 | 3156 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 |
| michael@0 | 3157 | $as_echo "$cross_compiling" >&6; } |
| michael@0 | 3158 | |
| michael@0 | 3159 | rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out |
| michael@0 | 3160 | ac_clean_files=$ac_clean_files_save |
| michael@0 | 3161 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 |
| michael@0 | 3162 | $as_echo_n "checking for suffix of object files... " >&6; } |
| michael@0 | 3163 | -if test "${ac_cv_objext+set}" = set; then : |
| michael@0 | 3164 | +if ${ac_cv_objext+:} false; then : |
| michael@0 | 3165 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3166 | else |
| michael@0 | 3167 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| michael@0 | 3168 | /* end confdefs.h. */ |
| michael@0 | 3169 | |
| michael@0 | 3170 | int |
| michael@0 | 3171 | main () |
| michael@0 | 3172 | { |
| michael@0 | 3173 | @@ -3419,28 +3434,28 @@ |
| michael@0 | 3174 | esac |
| michael@0 | 3175 | done |
| michael@0 | 3176 | else |
| michael@0 | 3177 | $as_echo "$as_me: failed program was:" >&5 |
| michael@0 | 3178 | sed 's/^/| /' conftest.$ac_ext >&5 |
| michael@0 | 3179 | |
| michael@0 | 3180 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| michael@0 | 3181 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| michael@0 | 3182 | -as_fn_error "cannot compute suffix of object files: cannot compile |
| michael@0 | 3183 | -See \`config.log' for more details." "$LINENO" 5; } |
| michael@0 | 3184 | +as_fn_error $? "cannot compute suffix of object files: cannot compile |
| michael@0 | 3185 | +See \`config.log' for more details" "$LINENO" 5; } |
| michael@0 | 3186 | fi |
| michael@0 | 3187 | rm -f conftest.$ac_cv_objext conftest.$ac_ext |
| michael@0 | 3188 | fi |
| michael@0 | 3189 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 |
| michael@0 | 3190 | $as_echo "$ac_cv_objext" >&6; } |
| michael@0 | 3191 | OBJEXT=$ac_cv_objext |
| michael@0 | 3192 | ac_objext=$OBJEXT |
| michael@0 | 3193 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 |
| michael@0 | 3194 | $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } |
| michael@0 | 3195 | -if test "${ac_cv_c_compiler_gnu+set}" = set; then : |
| michael@0 | 3196 | +if ${ac_cv_c_compiler_gnu+:} false; then : |
| michael@0 | 3197 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3198 | else |
| michael@0 | 3199 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| michael@0 | 3200 | /* end confdefs.h. */ |
| michael@0 | 3201 | |
| michael@0 | 3202 | int |
| michael@0 | 3203 | main () |
| michael@0 | 3204 | { |
| michael@0 | 3205 | @@ -3467,17 +3482,17 @@ |
| michael@0 | 3206 | GCC=yes |
| michael@0 | 3207 | else |
| michael@0 | 3208 | GCC= |
| michael@0 | 3209 | fi |
| michael@0 | 3210 | ac_test_CFLAGS=${CFLAGS+set} |
| michael@0 | 3211 | ac_save_CFLAGS=$CFLAGS |
| michael@0 | 3212 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 |
| michael@0 | 3213 | $as_echo_n "checking whether $CC accepts -g... " >&6; } |
| michael@0 | 3214 | -if test "${ac_cv_prog_cc_g+set}" = set; then : |
| michael@0 | 3215 | +if ${ac_cv_prog_cc_g+:} false; then : |
| michael@0 | 3216 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3217 | else |
| michael@0 | 3218 | ac_save_c_werror_flag=$ac_c_werror_flag |
| michael@0 | 3219 | ac_c_werror_flag=yes |
| michael@0 | 3220 | ac_cv_prog_cc_g=no |
| michael@0 | 3221 | CFLAGS="-g" |
| michael@0 | 3222 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| michael@0 | 3223 | /* end confdefs.h. */ |
| michael@0 | 3224 | @@ -3545,17 +3560,17 @@ |
| michael@0 | 3225 | if test "$GCC" = yes; then |
| michael@0 | 3226 | CFLAGS="-O2" |
| michael@0 | 3227 | else |
| michael@0 | 3228 | CFLAGS= |
| michael@0 | 3229 | fi |
| michael@0 | 3230 | fi |
| michael@0 | 3231 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 |
| michael@0 | 3232 | $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } |
| michael@0 | 3233 | -if test "${ac_cv_prog_cc_c89+set}" = set; then : |
| michael@0 | 3234 | +if ${ac_cv_prog_cc_c89+:} false; then : |
| michael@0 | 3235 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3236 | else |
| michael@0 | 3237 | ac_cv_prog_cc_c89=no |
| michael@0 | 3238 | ac_save_CC=$CC |
| michael@0 | 3239 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| michael@0 | 3240 | /* end confdefs.h. */ |
| michael@0 | 3241 | #include <stdarg.h> |
| michael@0 | 3242 | #include <stdio.h> |
| michael@0 | 3243 | @@ -3644,25 +3659,26 @@ |
| michael@0 | 3244 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| michael@0 | 3245 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
| michael@0 | 3246 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| michael@0 | 3247 | |
| michael@0 | 3248 | depcc="$CC" am_compiler_list= |
| michael@0 | 3249 | |
| michael@0 | 3250 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
| michael@0 | 3251 | $as_echo_n "checking dependency style of $depcc... " >&6; } |
| michael@0 | 3252 | -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : |
| michael@0 | 3253 | +if ${am_cv_CC_dependencies_compiler_type+:} false; then : |
| michael@0 | 3254 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3255 | else |
| michael@0 | 3256 | if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
| michael@0 | 3257 | # We make a subdir and do the tests there. Otherwise we can end up |
| michael@0 | 3258 | # making bogus files that we don't know about and never remove. For |
| michael@0 | 3259 | # instance it was reported that on HP-UX the gcc test will end up |
| michael@0 | 3260 | # making a dummy file named `D' -- because `-MD' means `put the output |
| michael@0 | 3261 | # in D'. |
| michael@0 | 3262 | + rm -rf conftest.dir |
| michael@0 | 3263 | mkdir conftest.dir |
| michael@0 | 3264 | # Copy depcomp to subdir because otherwise we won't find it if we're |
| michael@0 | 3265 | # using a relative directory. |
| michael@0 | 3266 | cp "$am_depcomp" conftest.dir |
| michael@0 | 3267 | cd conftest.dir |
| michael@0 | 3268 | # We will build objects and dependencies in a subdirectory because |
| michael@0 | 3269 | # it helps to detect inapplicable dependency modes. For instance |
| michael@0 | 3270 | # both Tru64's cc and ICC support -MD to output dependencies as a |
| michael@0 | 3271 | @@ -3712,17 +3728,17 @@ |
| michael@0 | 3272 | # after this tag, mechanisms are not by side-effect, so they'll |
| michael@0 | 3273 | # only be used when explicitly requested |
| michael@0 | 3274 | if test "x$enable_dependency_tracking" = xyes; then |
| michael@0 | 3275 | continue |
| michael@0 | 3276 | else |
| michael@0 | 3277 | break |
| michael@0 | 3278 | fi |
| michael@0 | 3279 | ;; |
| michael@0 | 3280 | - msvisualcpp | msvcmsys) |
| michael@0 | 3281 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
| michael@0 | 3282 | # This compiler won't grok `-c -o', but also, the minuso test has |
| michael@0 | 3283 | # not run yet. These depmodes are late enough in the game, and |
| michael@0 | 3284 | # so weak that their functioning should not be impacted. |
| michael@0 | 3285 | am__obj=conftest.${OBJEXT-o} |
| michael@0 | 3286 | am__minus_obj= |
| michael@0 | 3287 | ;; |
| michael@0 | 3288 | none) break ;; |
| michael@0 | 3289 | esac |
| michael@0 | 3290 | @@ -3778,25 +3794,26 @@ |
| michael@0 | 3291 | test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS |
| michael@0 | 3292 | |
| michael@0 | 3293 | |
| michael@0 | 3294 | |
| michael@0 | 3295 | depcc="$CCAS" am_compiler_list= |
| michael@0 | 3296 | |
| michael@0 | 3297 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
| michael@0 | 3298 | $as_echo_n "checking dependency style of $depcc... " >&6; } |
| michael@0 | 3299 | -if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then : |
| michael@0 | 3300 | +if ${am_cv_CCAS_dependencies_compiler_type+:} false; then : |
| michael@0 | 3301 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3302 | else |
| michael@0 | 3303 | if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
| michael@0 | 3304 | # We make a subdir and do the tests there. Otherwise we can end up |
| michael@0 | 3305 | # making bogus files that we don't know about and never remove. For |
| michael@0 | 3306 | # instance it was reported that on HP-UX the gcc test will end up |
| michael@0 | 3307 | # making a dummy file named `D' -- because `-MD' means `put the output |
| michael@0 | 3308 | # in D'. |
| michael@0 | 3309 | + rm -rf conftest.dir |
| michael@0 | 3310 | mkdir conftest.dir |
| michael@0 | 3311 | # Copy depcomp to subdir because otherwise we won't find it if we're |
| michael@0 | 3312 | # using a relative directory. |
| michael@0 | 3313 | cp "$am_depcomp" conftest.dir |
| michael@0 | 3314 | cd conftest.dir |
| michael@0 | 3315 | # We will build objects and dependencies in a subdirectory because |
| michael@0 | 3316 | # it helps to detect inapplicable dependency modes. For instance |
| michael@0 | 3317 | # both Tru64's cc and ICC support -MD to output dependencies as a |
| michael@0 | 3318 | @@ -3844,17 +3861,17 @@ |
| michael@0 | 3319 | # after this tag, mechanisms are not by side-effect, so they'll |
| michael@0 | 3320 | # only be used when explicitly requested |
| michael@0 | 3321 | if test "x$enable_dependency_tracking" = xyes; then |
| michael@0 | 3322 | continue |
| michael@0 | 3323 | else |
| michael@0 | 3324 | break |
| michael@0 | 3325 | fi |
| michael@0 | 3326 | ;; |
| michael@0 | 3327 | - msvisualcpp | msvcmsys) |
| michael@0 | 3328 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
| michael@0 | 3329 | # This compiler won't grok `-c -o', but also, the minuso test has |
| michael@0 | 3330 | # not run yet. These depmodes are late enough in the game, and |
| michael@0 | 3331 | # so weak that their functioning should not be impacted. |
| michael@0 | 3332 | am__obj=conftest.${OBJEXT-o} |
| michael@0 | 3333 | am__minus_obj= |
| michael@0 | 3334 | ;; |
| michael@0 | 3335 | none) break ;; |
| michael@0 | 3336 | esac |
| michael@0 | 3337 | @@ -3909,17 +3926,17 @@ |
| michael@0 | 3338 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| michael@0 | 3339 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
| michael@0 | 3340 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| michael@0 | 3341 | if test -n "$ac_tool_prefix"; then |
| michael@0 | 3342 | # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. |
| michael@0 | 3343 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 |
| michael@0 | 3344 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 3345 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 3346 | -if test "${ac_cv_prog_CC+set}" = set; then : |
| michael@0 | 3347 | +if ${ac_cv_prog_CC+:} false; then : |
| michael@0 | 3348 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3349 | else |
| michael@0 | 3350 | if test -n "$CC"; then |
| michael@0 | 3351 | ac_cv_prog_CC="$CC" # Let the user override the test. |
| michael@0 | 3352 | else |
| michael@0 | 3353 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 3354 | for as_dir in $PATH |
| michael@0 | 3355 | do |
| michael@0 | 3356 | @@ -3949,17 +3966,17 @@ |
| michael@0 | 3357 | |
| michael@0 | 3358 | fi |
| michael@0 | 3359 | if test -z "$ac_cv_prog_CC"; then |
| michael@0 | 3360 | ac_ct_CC=$CC |
| michael@0 | 3361 | # Extract the first word of "gcc", so it can be a program name with args. |
| michael@0 | 3362 | set dummy gcc; ac_word=$2 |
| michael@0 | 3363 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 3364 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 3365 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
| michael@0 | 3366 | +if ${ac_cv_prog_ac_ct_CC+:} false; then : |
| michael@0 | 3367 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3368 | else |
| michael@0 | 3369 | if test -n "$ac_ct_CC"; then |
| michael@0 | 3370 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. |
| michael@0 | 3371 | else |
| michael@0 | 3372 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 3373 | for as_dir in $PATH |
| michael@0 | 3374 | do |
| michael@0 | 3375 | @@ -4002,17 +4019,17 @@ |
| michael@0 | 3376 | fi |
| michael@0 | 3377 | |
| michael@0 | 3378 | if test -z "$CC"; then |
| michael@0 | 3379 | if test -n "$ac_tool_prefix"; then |
| michael@0 | 3380 | # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. |
| michael@0 | 3381 | set dummy ${ac_tool_prefix}cc; ac_word=$2 |
| michael@0 | 3382 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 3383 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 3384 | -if test "${ac_cv_prog_CC+set}" = set; then : |
| michael@0 | 3385 | +if ${ac_cv_prog_CC+:} false; then : |
| michael@0 | 3386 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3387 | else |
| michael@0 | 3388 | if test -n "$CC"; then |
| michael@0 | 3389 | ac_cv_prog_CC="$CC" # Let the user override the test. |
| michael@0 | 3390 | else |
| michael@0 | 3391 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 3392 | for as_dir in $PATH |
| michael@0 | 3393 | do |
| michael@0 | 3394 | @@ -4042,17 +4059,17 @@ |
| michael@0 | 3395 | |
| michael@0 | 3396 | fi |
| michael@0 | 3397 | fi |
| michael@0 | 3398 | if test -z "$CC"; then |
| michael@0 | 3399 | # Extract the first word of "cc", so it can be a program name with args. |
| michael@0 | 3400 | set dummy cc; ac_word=$2 |
| michael@0 | 3401 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 3402 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 3403 | -if test "${ac_cv_prog_CC+set}" = set; then : |
| michael@0 | 3404 | +if ${ac_cv_prog_CC+:} false; then : |
| michael@0 | 3405 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3406 | else |
| michael@0 | 3407 | if test -n "$CC"; then |
| michael@0 | 3408 | ac_cv_prog_CC="$CC" # Let the user override the test. |
| michael@0 | 3409 | else |
| michael@0 | 3410 | ac_prog_rejected=no |
| michael@0 | 3411 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 3412 | for as_dir in $PATH |
| michael@0 | 3413 | @@ -4101,17 +4118,17 @@ |
| michael@0 | 3414 | if test -z "$CC"; then |
| michael@0 | 3415 | if test -n "$ac_tool_prefix"; then |
| michael@0 | 3416 | for ac_prog in cl.exe |
| michael@0 | 3417 | do |
| michael@0 | 3418 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| michael@0 | 3419 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| michael@0 | 3420 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 3421 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 3422 | -if test "${ac_cv_prog_CC+set}" = set; then : |
| michael@0 | 3423 | +if ${ac_cv_prog_CC+:} false; then : |
| michael@0 | 3424 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3425 | else |
| michael@0 | 3426 | if test -n "$CC"; then |
| michael@0 | 3427 | ac_cv_prog_CC="$CC" # Let the user override the test. |
| michael@0 | 3428 | else |
| michael@0 | 3429 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 3430 | for as_dir in $PATH |
| michael@0 | 3431 | do |
| michael@0 | 3432 | @@ -4145,17 +4162,17 @@ |
| michael@0 | 3433 | if test -z "$CC"; then |
| michael@0 | 3434 | ac_ct_CC=$CC |
| michael@0 | 3435 | for ac_prog in cl.exe |
| michael@0 | 3436 | do |
| michael@0 | 3437 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
| michael@0 | 3438 | set dummy $ac_prog; ac_word=$2 |
| michael@0 | 3439 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 3440 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 3441 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
| michael@0 | 3442 | +if ${ac_cv_prog_ac_ct_CC+:} false; then : |
| michael@0 | 3443 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3444 | else |
| michael@0 | 3445 | if test -n "$ac_ct_CC"; then |
| michael@0 | 3446 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. |
| michael@0 | 3447 | else |
| michael@0 | 3448 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 3449 | for as_dir in $PATH |
| michael@0 | 3450 | do |
| michael@0 | 3451 | @@ -4199,18 +4216,18 @@ |
| michael@0 | 3452 | fi |
| michael@0 | 3453 | fi |
| michael@0 | 3454 | |
| michael@0 | 3455 | fi |
| michael@0 | 3456 | |
| michael@0 | 3457 | |
| michael@0 | 3458 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| michael@0 | 3459 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| michael@0 | 3460 | -as_fn_error "no acceptable C compiler found in \$PATH |
| michael@0 | 3461 | -See \`config.log' for more details." "$LINENO" 5; } |
| michael@0 | 3462 | +as_fn_error $? "no acceptable C compiler found in \$PATH |
| michael@0 | 3463 | +See \`config.log' for more details" "$LINENO" 5; } |
| michael@0 | 3464 | |
| michael@0 | 3465 | # Provide some information about the compiler. |
| michael@0 | 3466 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
| michael@0 | 3467 | set X $ac_compile |
| michael@0 | 3468 | ac_compiler=$2 |
| michael@0 | 3469 | for ac_option in --version -v -V -qversion; do |
| michael@0 | 3470 | { { ac_try="$ac_compiler $ac_option >&5" |
| michael@0 | 3471 | case "(($ac_try" in |
| michael@0 | 3472 | @@ -4229,17 +4246,17 @@ |
| michael@0 | 3473 | fi |
| michael@0 | 3474 | rm -f conftest.er1 conftest.err |
| michael@0 | 3475 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| michael@0 | 3476 | test $ac_status = 0; } |
| michael@0 | 3477 | done |
| michael@0 | 3478 | |
| michael@0 | 3479 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 |
| michael@0 | 3480 | $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } |
| michael@0 | 3481 | -if test "${ac_cv_c_compiler_gnu+set}" = set; then : |
| michael@0 | 3482 | +if ${ac_cv_c_compiler_gnu+:} false; then : |
| michael@0 | 3483 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3484 | else |
| michael@0 | 3485 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| michael@0 | 3486 | /* end confdefs.h. */ |
| michael@0 | 3487 | |
| michael@0 | 3488 | int |
| michael@0 | 3489 | main () |
| michael@0 | 3490 | { |
| michael@0 | 3491 | @@ -4266,17 +4283,17 @@ |
| michael@0 | 3492 | GCC=yes |
| michael@0 | 3493 | else |
| michael@0 | 3494 | GCC= |
| michael@0 | 3495 | fi |
| michael@0 | 3496 | ac_test_CFLAGS=${CFLAGS+set} |
| michael@0 | 3497 | ac_save_CFLAGS=$CFLAGS |
| michael@0 | 3498 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 |
| michael@0 | 3499 | $as_echo_n "checking whether $CC accepts -g... " >&6; } |
| michael@0 | 3500 | -if test "${ac_cv_prog_cc_g+set}" = set; then : |
| michael@0 | 3501 | +if ${ac_cv_prog_cc_g+:} false; then : |
| michael@0 | 3502 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3503 | else |
| michael@0 | 3504 | ac_save_c_werror_flag=$ac_c_werror_flag |
| michael@0 | 3505 | ac_c_werror_flag=yes |
| michael@0 | 3506 | ac_cv_prog_cc_g=no |
| michael@0 | 3507 | CFLAGS="-g" |
| michael@0 | 3508 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| michael@0 | 3509 | /* end confdefs.h. */ |
| michael@0 | 3510 | @@ -4344,17 +4361,17 @@ |
| michael@0 | 3511 | if test "$GCC" = yes; then |
| michael@0 | 3512 | CFLAGS="-O2" |
| michael@0 | 3513 | else |
| michael@0 | 3514 | CFLAGS= |
| michael@0 | 3515 | fi |
| michael@0 | 3516 | fi |
| michael@0 | 3517 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 |
| michael@0 | 3518 | $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } |
| michael@0 | 3519 | -if test "${ac_cv_prog_cc_c89+set}" = set; then : |
| michael@0 | 3520 | +if ${ac_cv_prog_cc_c89+:} false; then : |
| michael@0 | 3521 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3522 | else |
| michael@0 | 3523 | ac_cv_prog_cc_c89=no |
| michael@0 | 3524 | ac_save_CC=$CC |
| michael@0 | 3525 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| michael@0 | 3526 | /* end confdefs.h. */ |
| michael@0 | 3527 | #include <stdarg.h> |
| michael@0 | 3528 | #include <stdio.h> |
| michael@0 | 3529 | @@ -4443,25 +4460,26 @@ |
| michael@0 | 3530 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| michael@0 | 3531 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
| michael@0 | 3532 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| michael@0 | 3533 | |
| michael@0 | 3534 | depcc="$CC" am_compiler_list= |
| michael@0 | 3535 | |
| michael@0 | 3536 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
| michael@0 | 3537 | $as_echo_n "checking dependency style of $depcc... " >&6; } |
| michael@0 | 3538 | -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : |
| michael@0 | 3539 | +if ${am_cv_CC_dependencies_compiler_type+:} false; then : |
| michael@0 | 3540 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3541 | else |
| michael@0 | 3542 | if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
| michael@0 | 3543 | # We make a subdir and do the tests there. Otherwise we can end up |
| michael@0 | 3544 | # making bogus files that we don't know about and never remove. For |
| michael@0 | 3545 | # instance it was reported that on HP-UX the gcc test will end up |
| michael@0 | 3546 | # making a dummy file named `D' -- because `-MD' means `put the output |
| michael@0 | 3547 | # in D'. |
| michael@0 | 3548 | + rm -rf conftest.dir |
| michael@0 | 3549 | mkdir conftest.dir |
| michael@0 | 3550 | # Copy depcomp to subdir because otherwise we won't find it if we're |
| michael@0 | 3551 | # using a relative directory. |
| michael@0 | 3552 | cp "$am_depcomp" conftest.dir |
| michael@0 | 3553 | cd conftest.dir |
| michael@0 | 3554 | # We will build objects and dependencies in a subdirectory because |
| michael@0 | 3555 | # it helps to detect inapplicable dependency modes. For instance |
| michael@0 | 3556 | # both Tru64's cc and ICC support -MD to output dependencies as a |
| michael@0 | 3557 | @@ -4511,17 +4529,17 @@ |
| michael@0 | 3558 | # after this tag, mechanisms are not by side-effect, so they'll |
| michael@0 | 3559 | # only be used when explicitly requested |
| michael@0 | 3560 | if test "x$enable_dependency_tracking" = xyes; then |
| michael@0 | 3561 | continue |
| michael@0 | 3562 | else |
| michael@0 | 3563 | break |
| michael@0 | 3564 | fi |
| michael@0 | 3565 | ;; |
| michael@0 | 3566 | - msvisualcpp | msvcmsys) |
| michael@0 | 3567 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
| michael@0 | 3568 | # This compiler won't grok `-c -o', but also, the minuso test has |
| michael@0 | 3569 | # not run yet. These depmodes are late enough in the game, and |
| michael@0 | 3570 | # so weak that their functioning should not be impacted. |
| michael@0 | 3571 | am__obj=conftest.${OBJEXT-o} |
| michael@0 | 3572 | am__minus_obj= |
| michael@0 | 3573 | ;; |
| michael@0 | 3574 | none) break ;; |
| michael@0 | 3575 | esac |
| michael@0 | 3576 | @@ -4575,17 +4593,17 @@ |
| michael@0 | 3577 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 |
| michael@0 | 3578 | $as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } |
| michael@0 | 3579 | else |
| michael@0 | 3580 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 |
| michael@0 | 3581 | $as_echo_n "checking whether cc understands -c and -o together... " >&6; } |
| michael@0 | 3582 | fi |
| michael@0 | 3583 | set dummy $CC; ac_cc=`$as_echo "$2" | |
| michael@0 | 3584 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` |
| michael@0 | 3585 | -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : |
| michael@0 | 3586 | +if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : |
| michael@0 | 3587 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3588 | else |
| michael@0 | 3589 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| michael@0 | 3590 | /* end confdefs.h. */ |
| michael@0 | 3591 | |
| michael@0 | 3592 | int |
| michael@0 | 3593 | main () |
| michael@0 | 3594 | { |
| michael@0 | 3595 | @@ -4704,17 +4722,17 @@ |
| michael@0 | 3596 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| michael@0 | 3597 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 |
| michael@0 | 3598 | $as_echo_n "checking how to run the C preprocessor... " >&6; } |
| michael@0 | 3599 | # On Suns, sometimes $CPP names a directory. |
| michael@0 | 3600 | if test -n "$CPP" && test -d "$CPP"; then |
| michael@0 | 3601 | CPP= |
| michael@0 | 3602 | fi |
| michael@0 | 3603 | if test -z "$CPP"; then |
| michael@0 | 3604 | - if test "${ac_cv_prog_CPP+set}" = set; then : |
| michael@0 | 3605 | + if ${ac_cv_prog_CPP+:} false; then : |
| michael@0 | 3606 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3607 | else |
| michael@0 | 3608 | # Double quotes because CPP needs to be expanded |
| michael@0 | 3609 | for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" |
| michael@0 | 3610 | do |
| michael@0 | 3611 | ac_preproc_ok=false |
| michael@0 | 3612 | for ac_c_preproc_warn_flag in '' yes |
| michael@0 | 3613 | do |
| michael@0 | 3614 | @@ -4734,37 +4752,37 @@ |
| michael@0 | 3615 | Syntax error |
| michael@0 | 3616 | _ACEOF |
| michael@0 | 3617 | if ac_fn_c_try_cpp "$LINENO"; then : |
| michael@0 | 3618 | |
| michael@0 | 3619 | else |
| michael@0 | 3620 | # Broken: fails on valid input. |
| michael@0 | 3621 | continue |
| michael@0 | 3622 | fi |
| michael@0 | 3623 | -rm -f conftest.err conftest.$ac_ext |
| michael@0 | 3624 | +rm -f conftest.err conftest.i conftest.$ac_ext |
| michael@0 | 3625 | |
| michael@0 | 3626 | # OK, works on sane cases. Now check whether nonexistent headers |
| michael@0 | 3627 | # can be detected and how. |
| michael@0 | 3628 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| michael@0 | 3629 | /* end confdefs.h. */ |
| michael@0 | 3630 | #include <ac_nonexistent.h> |
| michael@0 | 3631 | _ACEOF |
| michael@0 | 3632 | if ac_fn_c_try_cpp "$LINENO"; then : |
| michael@0 | 3633 | # Broken: success on invalid input. |
| michael@0 | 3634 | continue |
| michael@0 | 3635 | else |
| michael@0 | 3636 | # Passes both tests. |
| michael@0 | 3637 | ac_preproc_ok=: |
| michael@0 | 3638 | break |
| michael@0 | 3639 | fi |
| michael@0 | 3640 | -rm -f conftest.err conftest.$ac_ext |
| michael@0 | 3641 | +rm -f conftest.err conftest.i conftest.$ac_ext |
| michael@0 | 3642 | |
| michael@0 | 3643 | done |
| michael@0 | 3644 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
| michael@0 | 3645 | -rm -f conftest.err conftest.$ac_ext |
| michael@0 | 3646 | +rm -f conftest.i conftest.err conftest.$ac_ext |
| michael@0 | 3647 | if $ac_preproc_ok; then : |
| michael@0 | 3648 | break |
| michael@0 | 3649 | fi |
| michael@0 | 3650 | |
| michael@0 | 3651 | done |
| michael@0 | 3652 | ac_cv_prog_CPP=$CPP |
| michael@0 | 3653 | |
| michael@0 | 3654 | fi |
| michael@0 | 3655 | @@ -4793,44 +4811,44 @@ |
| michael@0 | 3656 | Syntax error |
| michael@0 | 3657 | _ACEOF |
| michael@0 | 3658 | if ac_fn_c_try_cpp "$LINENO"; then : |
| michael@0 | 3659 | |
| michael@0 | 3660 | else |
| michael@0 | 3661 | # Broken: fails on valid input. |
| michael@0 | 3662 | continue |
| michael@0 | 3663 | fi |
| michael@0 | 3664 | -rm -f conftest.err conftest.$ac_ext |
| michael@0 | 3665 | +rm -f conftest.err conftest.i conftest.$ac_ext |
| michael@0 | 3666 | |
| michael@0 | 3667 | # OK, works on sane cases. Now check whether nonexistent headers |
| michael@0 | 3668 | # can be detected and how. |
| michael@0 | 3669 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| michael@0 | 3670 | /* end confdefs.h. */ |
| michael@0 | 3671 | #include <ac_nonexistent.h> |
| michael@0 | 3672 | _ACEOF |
| michael@0 | 3673 | if ac_fn_c_try_cpp "$LINENO"; then : |
| michael@0 | 3674 | # Broken: success on invalid input. |
| michael@0 | 3675 | continue |
| michael@0 | 3676 | else |
| michael@0 | 3677 | # Passes both tests. |
| michael@0 | 3678 | ac_preproc_ok=: |
| michael@0 | 3679 | break |
| michael@0 | 3680 | fi |
| michael@0 | 3681 | -rm -f conftest.err conftest.$ac_ext |
| michael@0 | 3682 | +rm -f conftest.err conftest.i conftest.$ac_ext |
| michael@0 | 3683 | |
| michael@0 | 3684 | done |
| michael@0 | 3685 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
| michael@0 | 3686 | -rm -f conftest.err conftest.$ac_ext |
| michael@0 | 3687 | +rm -f conftest.i conftest.err conftest.$ac_ext |
| michael@0 | 3688 | if $ac_preproc_ok; then : |
| michael@0 | 3689 | |
| michael@0 | 3690 | else |
| michael@0 | 3691 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| michael@0 | 3692 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| michael@0 | 3693 | -as_fn_error "C preprocessor \"$CPP\" fails sanity check |
| michael@0 | 3694 | -See \`config.log' for more details." "$LINENO" 5; } |
| michael@0 | 3695 | +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check |
| michael@0 | 3696 | +See \`config.log' for more details" "$LINENO" 5; } |
| michael@0 | 3697 | fi |
| michael@0 | 3698 | |
| michael@0 | 3699 | ac_ext=c |
| michael@0 | 3700 | ac_cpp='$CPP $CPPFLAGS' |
| michael@0 | 3701 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| michael@0 | 3702 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
| michael@0 | 3703 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| michael@0 | 3704 | |
| michael@0 | 3705 | @@ -4845,17 +4863,17 @@ |
| michael@0 | 3706 | else |
| michael@0 | 3707 | if test -n "$ac_tool_prefix"; then |
| michael@0 | 3708 | for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC |
| michael@0 | 3709 | do |
| michael@0 | 3710 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| michael@0 | 3711 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| michael@0 | 3712 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 3713 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 3714 | -if test "${ac_cv_prog_CXX+set}" = set; then : |
| michael@0 | 3715 | +if ${ac_cv_prog_CXX+:} false; then : |
| michael@0 | 3716 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3717 | else |
| michael@0 | 3718 | if test -n "$CXX"; then |
| michael@0 | 3719 | ac_cv_prog_CXX="$CXX" # Let the user override the test. |
| michael@0 | 3720 | else |
| michael@0 | 3721 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 3722 | for as_dir in $PATH |
| michael@0 | 3723 | do |
| michael@0 | 3724 | @@ -4889,17 +4907,17 @@ |
| michael@0 | 3725 | if test -z "$CXX"; then |
| michael@0 | 3726 | ac_ct_CXX=$CXX |
| michael@0 | 3727 | for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC |
| michael@0 | 3728 | do |
| michael@0 | 3729 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
| michael@0 | 3730 | set dummy $ac_prog; ac_word=$2 |
| michael@0 | 3731 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 3732 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 3733 | -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : |
| michael@0 | 3734 | +if ${ac_cv_prog_ac_ct_CXX+:} false; then : |
| michael@0 | 3735 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3736 | else |
| michael@0 | 3737 | if test -n "$ac_ct_CXX"; then |
| michael@0 | 3738 | ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. |
| michael@0 | 3739 | else |
| michael@0 | 3740 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 3741 | for as_dir in $PATH |
| michael@0 | 3742 | do |
| michael@0 | 3743 | @@ -4967,17 +4985,17 @@ |
| michael@0 | 3744 | fi |
| michael@0 | 3745 | rm -f conftest.er1 conftest.err |
| michael@0 | 3746 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| michael@0 | 3747 | test $ac_status = 0; } |
| michael@0 | 3748 | done |
| michael@0 | 3749 | |
| michael@0 | 3750 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 |
| michael@0 | 3751 | $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } |
| michael@0 | 3752 | -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : |
| michael@0 | 3753 | +if ${ac_cv_cxx_compiler_gnu+:} false; then : |
| michael@0 | 3754 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3755 | else |
| michael@0 | 3756 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| michael@0 | 3757 | /* end confdefs.h. */ |
| michael@0 | 3758 | |
| michael@0 | 3759 | int |
| michael@0 | 3760 | main () |
| michael@0 | 3761 | { |
| michael@0 | 3762 | @@ -5004,17 +5022,17 @@ |
| michael@0 | 3763 | GXX=yes |
| michael@0 | 3764 | else |
| michael@0 | 3765 | GXX= |
| michael@0 | 3766 | fi |
| michael@0 | 3767 | ac_test_CXXFLAGS=${CXXFLAGS+set} |
| michael@0 | 3768 | ac_save_CXXFLAGS=$CXXFLAGS |
| michael@0 | 3769 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 |
| michael@0 | 3770 | $as_echo_n "checking whether $CXX accepts -g... " >&6; } |
| michael@0 | 3771 | -if test "${ac_cv_prog_cxx_g+set}" = set; then : |
| michael@0 | 3772 | +if ${ac_cv_prog_cxx_g+:} false; then : |
| michael@0 | 3773 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3774 | else |
| michael@0 | 3775 | ac_save_cxx_werror_flag=$ac_cxx_werror_flag |
| michael@0 | 3776 | ac_cxx_werror_flag=yes |
| michael@0 | 3777 | ac_cv_prog_cxx_g=no |
| michael@0 | 3778 | CXXFLAGS="-g" |
| michael@0 | 3779 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| michael@0 | 3780 | /* end confdefs.h. */ |
| michael@0 | 3781 | @@ -5090,25 +5108,26 @@ |
| michael@0 | 3782 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| michael@0 | 3783 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
| michael@0 | 3784 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| michael@0 | 3785 | |
| michael@0 | 3786 | depcc="$CXX" am_compiler_list= |
| michael@0 | 3787 | |
| michael@0 | 3788 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
| michael@0 | 3789 | $as_echo_n "checking dependency style of $depcc... " >&6; } |
| michael@0 | 3790 | -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : |
| michael@0 | 3791 | +if ${am_cv_CXX_dependencies_compiler_type+:} false; then : |
| michael@0 | 3792 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3793 | else |
| michael@0 | 3794 | if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
| michael@0 | 3795 | # We make a subdir and do the tests there. Otherwise we can end up |
| michael@0 | 3796 | # making bogus files that we don't know about and never remove. For |
| michael@0 | 3797 | # instance it was reported that on HP-UX the gcc test will end up |
| michael@0 | 3798 | # making a dummy file named `D' -- because `-MD' means `put the output |
| michael@0 | 3799 | # in D'. |
| michael@0 | 3800 | + rm -rf conftest.dir |
| michael@0 | 3801 | mkdir conftest.dir |
| michael@0 | 3802 | # Copy depcomp to subdir because otherwise we won't find it if we're |
| michael@0 | 3803 | # using a relative directory. |
| michael@0 | 3804 | cp "$am_depcomp" conftest.dir |
| michael@0 | 3805 | cd conftest.dir |
| michael@0 | 3806 | # We will build objects and dependencies in a subdirectory because |
| michael@0 | 3807 | # it helps to detect inapplicable dependency modes. For instance |
| michael@0 | 3808 | # both Tru64's cc and ICC support -MD to output dependencies as a |
| michael@0 | 3809 | @@ -5158,17 +5177,17 @@ |
| michael@0 | 3810 | # after this tag, mechanisms are not by side-effect, so they'll |
| michael@0 | 3811 | # only be used when explicitly requested |
| michael@0 | 3812 | if test "x$enable_dependency_tracking" = xyes; then |
| michael@0 | 3813 | continue |
| michael@0 | 3814 | else |
| michael@0 | 3815 | break |
| michael@0 | 3816 | fi |
| michael@0 | 3817 | ;; |
| michael@0 | 3818 | - msvisualcpp | msvcmsys) |
| michael@0 | 3819 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
| michael@0 | 3820 | # This compiler won't grok `-c -o', but also, the minuso test has |
| michael@0 | 3821 | # not run yet. These depmodes are late enough in the game, and |
| michael@0 | 3822 | # so weak that their functioning should not be impacted. |
| michael@0 | 3823 | am__obj=conftest.${OBJEXT-o} |
| michael@0 | 3824 | am__minus_obj= |
| michael@0 | 3825 | ;; |
| michael@0 | 3826 | none) break ;; |
| michael@0 | 3827 | esac |
| michael@0 | 3828 | @@ -5218,17 +5237,17 @@ |
| michael@0 | 3829 | fi |
| michael@0 | 3830 | |
| michael@0 | 3831 | |
| michael@0 | 3832 | if test -n "$ac_tool_prefix"; then |
| michael@0 | 3833 | # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. |
| michael@0 | 3834 | set dummy ${ac_tool_prefix}ranlib; ac_word=$2 |
| michael@0 | 3835 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 3836 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 3837 | -if test "${ac_cv_prog_RANLIB+set}" = set; then : |
| michael@0 | 3838 | +if ${ac_cv_prog_RANLIB+:} false; then : |
| michael@0 | 3839 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3840 | else |
| michael@0 | 3841 | if test -n "$RANLIB"; then |
| michael@0 | 3842 | ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. |
| michael@0 | 3843 | else |
| michael@0 | 3844 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 3845 | for as_dir in $PATH |
| michael@0 | 3846 | do |
| michael@0 | 3847 | @@ -5258,17 +5277,17 @@ |
| michael@0 | 3848 | |
| michael@0 | 3849 | fi |
| michael@0 | 3850 | if test -z "$ac_cv_prog_RANLIB"; then |
| michael@0 | 3851 | ac_ct_RANLIB=$RANLIB |
| michael@0 | 3852 | # Extract the first word of "ranlib", so it can be a program name with args. |
| michael@0 | 3853 | set dummy ranlib; ac_word=$2 |
| michael@0 | 3854 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 3855 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 3856 | -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : |
| michael@0 | 3857 | +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : |
| michael@0 | 3858 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3859 | else |
| michael@0 | 3860 | if test -n "$ac_ct_RANLIB"; then |
| michael@0 | 3861 | ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. |
| michael@0 | 3862 | else |
| michael@0 | 3863 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 3864 | for as_dir in $PATH |
| michael@0 | 3865 | do |
| michael@0 | 3866 | @@ -5318,17 +5337,17 @@ |
| michael@0 | 3867 | GCC_FALSE= |
| michael@0 | 3868 | fi |
| michael@0 | 3869 | # let the Makefile know if we're gcc |
| michael@0 | 3870 | |
| michael@0 | 3871 | |
| michael@0 | 3872 | |
| michael@0 | 3873 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 |
| michael@0 | 3874 | $as_echo_n "checking for grep that handles long lines and -e... " >&6; } |
| michael@0 | 3875 | -if test "${ac_cv_path_GREP+set}" = set; then : |
| michael@0 | 3876 | +if ${ac_cv_path_GREP+:} false; then : |
| michael@0 | 3877 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3878 | else |
| michael@0 | 3879 | if test -z "$GREP"; then |
| michael@0 | 3880 | ac_path_GREP_found=false |
| michael@0 | 3881 | # Loop through the user's path and test for each of PROGNAME-LIST |
| michael@0 | 3882 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 3883 | for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin |
| michael@0 | 3884 | do |
| michael@0 | 3885 | @@ -5367,31 +5386,31 @@ |
| michael@0 | 3886 | esac |
| michael@0 | 3887 | |
| michael@0 | 3888 | $ac_path_GREP_found && break 3 |
| michael@0 | 3889 | done |
| michael@0 | 3890 | done |
| michael@0 | 3891 | done |
| michael@0 | 3892 | IFS=$as_save_IFS |
| michael@0 | 3893 | if test -z "$ac_cv_path_GREP"; then |
| michael@0 | 3894 | - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
| michael@0 | 3895 | + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
| michael@0 | 3896 | fi |
| michael@0 | 3897 | else |
| michael@0 | 3898 | ac_cv_path_GREP=$GREP |
| michael@0 | 3899 | fi |
| michael@0 | 3900 | |
| michael@0 | 3901 | fi |
| michael@0 | 3902 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 |
| michael@0 | 3903 | $as_echo "$ac_cv_path_GREP" >&6; } |
| michael@0 | 3904 | GREP="$ac_cv_path_GREP" |
| michael@0 | 3905 | |
| michael@0 | 3906 | |
| michael@0 | 3907 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 |
| michael@0 | 3908 | $as_echo_n "checking for egrep... " >&6; } |
| michael@0 | 3909 | -if test "${ac_cv_path_EGREP+set}" = set; then : |
| michael@0 | 3910 | +if ${ac_cv_path_EGREP+:} false; then : |
| michael@0 | 3911 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3912 | else |
| michael@0 | 3913 | if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 |
| michael@0 | 3914 | then ac_cv_path_EGREP="$GREP -E" |
| michael@0 | 3915 | else |
| michael@0 | 3916 | if test -z "$EGREP"; then |
| michael@0 | 3917 | ac_path_EGREP_found=false |
| michael@0 | 3918 | # Loop through the user's path and test for each of PROGNAME-LIST |
| michael@0 | 3919 | @@ -5433,32 +5452,32 @@ |
| michael@0 | 3920 | esac |
| michael@0 | 3921 | |
| michael@0 | 3922 | $ac_path_EGREP_found && break 3 |
| michael@0 | 3923 | done |
| michael@0 | 3924 | done |
| michael@0 | 3925 | done |
| michael@0 | 3926 | IFS=$as_save_IFS |
| michael@0 | 3927 | if test -z "$ac_cv_path_EGREP"; then |
| michael@0 | 3928 | - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
| michael@0 | 3929 | + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
| michael@0 | 3930 | fi |
| michael@0 | 3931 | else |
| michael@0 | 3932 | ac_cv_path_EGREP=$EGREP |
| michael@0 | 3933 | fi |
| michael@0 | 3934 | |
| michael@0 | 3935 | fi |
| michael@0 | 3936 | fi |
| michael@0 | 3937 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 |
| michael@0 | 3938 | $as_echo "$ac_cv_path_EGREP" >&6; } |
| michael@0 | 3939 | EGREP="$ac_cv_path_EGREP" |
| michael@0 | 3940 | |
| michael@0 | 3941 | |
| michael@0 | 3942 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 |
| michael@0 | 3943 | $as_echo_n "checking for ANSI C header files... " >&6; } |
| michael@0 | 3944 | -if test "${ac_cv_header_stdc+set}" = set; then : |
| michael@0 | 3945 | +if ${ac_cv_header_stdc+:} false; then : |
| michael@0 | 3946 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3947 | else |
| michael@0 | 3948 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| michael@0 | 3949 | /* end confdefs.h. */ |
| michael@0 | 3950 | #include <stdlib.h> |
| michael@0 | 3951 | #include <stdarg.h> |
| michael@0 | 3952 | #include <string.h> |
| michael@0 | 3953 | #include <float.h> |
| michael@0 | 3954 | @@ -5785,17 +5804,17 @@ |
| michael@0 | 3955 | PTHREAD_CFLAGS="$flag" |
| michael@0 | 3956 | ;; |
| michael@0 | 3957 | |
| michael@0 | 3958 | pthread-config) |
| michael@0 | 3959 | # Extract the first word of "pthread-config", so it can be a program name with args. |
| michael@0 | 3960 | set dummy pthread-config; ac_word=$2 |
| michael@0 | 3961 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 3962 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 3963 | -if test "${ac_cv_prog_ax_pthread_config+set}" = set; then : |
| michael@0 | 3964 | +if ${ac_cv_prog_ax_pthread_config+:} false; then : |
| michael@0 | 3965 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3966 | else |
| michael@0 | 3967 | if test -n "$ax_pthread_config"; then |
| michael@0 | 3968 | ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test. |
| michael@0 | 3969 | else |
| michael@0 | 3970 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 3971 | for as_dir in $PATH |
| michael@0 | 3972 | do |
| michael@0 | 3973 | @@ -5946,17 +5965,17 @@ |
| michael@0 | 3974 | # More AIX lossage: must compile with xlc_r or cc_r |
| michael@0 | 3975 | if test x"$GCC" != xyes; then |
| michael@0 | 3976 | for ac_prog in xlc_r cc_r |
| michael@0 | 3977 | do |
| michael@0 | 3978 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
| michael@0 | 3979 | set dummy $ac_prog; ac_word=$2 |
| michael@0 | 3980 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| michael@0 | 3981 | $as_echo_n "checking for $ac_word... " >&6; } |
| michael@0 | 3982 | -if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then : |
| michael@0 | 3983 | +if ${ac_cv_prog_PTHREAD_CC+:} false; then : |
| michael@0 | 3984 | $as_echo_n "(cached) " >&6 |
| michael@0 | 3985 | else |
| michael@0 | 3986 | if test -n "$PTHREAD_CC"; then |
| michael@0 | 3987 | ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test. |
| michael@0 | 3988 | else |
| michael@0 | 3989 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 3990 | for as_dir in $PATH |
| michael@0 | 3991 | do |
| michael@0 | 3992 | @@ -6018,31 +6037,30 @@ |
| michael@0 | 3993 | |
| michael@0 | 3994 | # On IRIX 5.3, sys/types and inttypes.h are conflicting. |
| michael@0 | 3995 | for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ |
| michael@0 | 3996 | inttypes.h stdint.h unistd.h |
| michael@0 | 3997 | do : |
| michael@0 | 3998 | as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
| michael@0 | 3999 | ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default |
| michael@0 | 4000 | " |
| michael@0 | 4001 | -eval as_val=\$$as_ac_Header |
| michael@0 | 4002 | - if test "x$as_val" = x""yes; then : |
| michael@0 | 4003 | +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : |
| michael@0 | 4004 | cat >>confdefs.h <<_ACEOF |
| michael@0 | 4005 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| michael@0 | 4006 | _ACEOF |
| michael@0 | 4007 | |
| michael@0 | 4008 | fi |
| michael@0 | 4009 | |
| michael@0 | 4010 | done |
| michael@0 | 4011 | |
| michael@0 | 4012 | |
| michael@0 | 4013 | for ac_header in a.out.h |
| michael@0 | 4014 | do : |
| michael@0 | 4015 | ac_fn_c_check_header_mongrel "$LINENO" "a.out.h" "ac_cv_header_a_out_h" "$ac_includes_default" |
| michael@0 | 4016 | -if test "x$ac_cv_header_a_out_h" = x""yes; then : |
| michael@0 | 4017 | +if test "x$ac_cv_header_a_out_h" = xyes; then : |
| michael@0 | 4018 | cat >>confdefs.h <<_ACEOF |
| michael@0 | 4019 | #define HAVE_A_OUT_H 1 |
| michael@0 | 4020 | _ACEOF |
| michael@0 | 4021 | |
| michael@0 | 4022 | fi |
| michael@0 | 4023 | |
| michael@0 | 4024 | done |
| michael@0 | 4025 | |
| michael@0 | 4026 | @@ -6084,17 +6102,17 @@ |
| michael@0 | 4027 | CFLAGS="${CFLAGS} -m32" |
| michael@0 | 4028 | CXXFLAGS="${CXXFLAGS} -m32" |
| michael@0 | 4029 | usem32=true |
| michael@0 | 4030 | ;; |
| michael@0 | 4031 | no) |
| michael@0 | 4032 | usem32=false |
| michael@0 | 4033 | ;; |
| michael@0 | 4034 | *) |
| michael@0 | 4035 | - as_fn_error "bad value ${enableval} for --enable-m32" "$LINENO" 5 |
| michael@0 | 4036 | + as_fn_error $? "bad value ${enableval} for --enable-m32" "$LINENO" 5 |
| michael@0 | 4037 | ;; |
| michael@0 | 4038 | esac |
| michael@0 | 4039 | else |
| michael@0 | 4040 | usem32=false |
| michael@0 | 4041 | fi |
| michael@0 | 4042 | |
| michael@0 | 4043 | |
| michael@0 | 4044 | # Check whether --enable-processor was given. |
| michael@0 | 4045 | @@ -6102,17 +6120,17 @@ |
| michael@0 | 4046 | enableval=$enable_processor; case "${enableval}" in |
| michael@0 | 4047 | yes) |
| michael@0 | 4048 | disable_processor=false |
| michael@0 | 4049 | ;; |
| michael@0 | 4050 | no) |
| michael@0 | 4051 | disable_processor=true |
| michael@0 | 4052 | ;; |
| michael@0 | 4053 | *) |
| michael@0 | 4054 | - as_fn_error "bad value ${enableval} for --disable-processor" "$LINENO" 5 |
| michael@0 | 4055 | + as_fn_error $? "bad value ${enableval} for --disable-processor" "$LINENO" 5 |
| michael@0 | 4056 | ;; |
| michael@0 | 4057 | esac |
| michael@0 | 4058 | else |
| michael@0 | 4059 | disable_processor=false |
| michael@0 | 4060 | fi |
| michael@0 | 4061 | |
| michael@0 | 4062 | if test x$disable_processor = xtrue; then |
| michael@0 | 4063 | DISABLE_PROCESSOR_TRUE= |
| michael@0 | 4064 | @@ -6128,47 +6146,47 @@ |
| michael@0 | 4065 | enableval=$enable_tools; case "${enableval}" in |
| michael@0 | 4066 | yes) |
| michael@0 | 4067 | disable_tools=false |
| michael@0 | 4068 | ;; |
| michael@0 | 4069 | no) |
| michael@0 | 4070 | disable_tools=true |
| michael@0 | 4071 | ;; |
| michael@0 | 4072 | *) |
| michael@0 | 4073 | - as_fn_error "bad value ${enableval} for --disable-tools" "$LINENO" 5 |
| michael@0 | 4074 | + as_fn_error $? "bad value ${enableval} for --disable-tools" "$LINENO" 5 |
| michael@0 | 4075 | ;; |
| michael@0 | 4076 | esac |
| michael@0 | 4077 | else |
| michael@0 | 4078 | disable_tools=false |
| michael@0 | 4079 | fi |
| michael@0 | 4080 | |
| michael@0 | 4081 | if test x$disable_tools = xtrue; then |
| michael@0 | 4082 | DISABLE_TOOLS_TRUE= |
| michael@0 | 4083 | DISABLE_TOOLS_FALSE='#' |
| michael@0 | 4084 | else |
| michael@0 | 4085 | DISABLE_TOOLS_TRUE='#' |
| michael@0 | 4086 | DISABLE_TOOLS_FALSE= |
| michael@0 | 4087 | fi |
| michael@0 | 4088 | |
| michael@0 | 4089 | |
| michael@0 | 4090 | if test x$LINUX_HOST = xfalse -a x$disable_processor = xtrue -a x$disable_tools = xtrue; then |
| michael@0 | 4091 | - as_fn_error "--disable-processor and --disable-tools were specified, and not building for Linux. Nothing to build!" "$LINENO" 5 |
| michael@0 | 4092 | + as_fn_error $? "--disable-processor and --disable-tools were specified, and not building for Linux. Nothing to build!" "$LINENO" 5 |
| michael@0 | 4093 | fi |
| michael@0 | 4094 | |
| michael@0 | 4095 | # Check whether --enable-selftest was given. |
| michael@0 | 4096 | if test "${enable_selftest+set}" = set; then : |
| michael@0 | 4097 | enableval=$enable_selftest; case "${enableval}" in |
| michael@0 | 4098 | yes) |
| michael@0 | 4099 | selftest=true |
| michael@0 | 4100 | ;; |
| michael@0 | 4101 | no) |
| michael@0 | 4102 | selftest=false |
| michael@0 | 4103 | ;; |
| michael@0 | 4104 | *) |
| michael@0 | 4105 | - as_fn_error "bad value ${enableval} for --enable-selftest" "$LINENO" 5 |
| michael@0 | 4106 | + as_fn_error $? "bad value ${enableval} for --enable-selftest" "$LINENO" 5 |
| michael@0 | 4107 | ;; |
| michael@0 | 4108 | esac |
| michael@0 | 4109 | else |
| michael@0 | 4110 | selftest=false |
| michael@0 | 4111 | fi |
| michael@0 | 4112 | |
| michael@0 | 4113 | if test x$selftest = xtrue; then |
| michael@0 | 4114 | SELFTEST_TRUE= |
| michael@0 | 4115 | @@ -6240,35 +6258,47 @@ |
| michael@0 | 4116 | t clear |
| michael@0 | 4117 | :clear |
| michael@0 | 4118 | s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ |
| michael@0 | 4119 | t end |
| michael@0 | 4120 | s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ |
| michael@0 | 4121 | :end' >>confcache |
| michael@0 | 4122 | if diff "$cache_file" confcache >/dev/null 2>&1; then :; else |
| michael@0 | 4123 | if test -w "$cache_file"; then |
| michael@0 | 4124 | - test "x$cache_file" != "x/dev/null" && |
| michael@0 | 4125 | + if test "x$cache_file" != "x/dev/null"; then |
| michael@0 | 4126 | { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 |
| michael@0 | 4127 | $as_echo "$as_me: updating cache $cache_file" >&6;} |
| michael@0 | 4128 | - cat confcache >$cache_file |
| michael@0 | 4129 | + if test ! -f "$cache_file" || test -h "$cache_file"; then |
| michael@0 | 4130 | + cat confcache >"$cache_file" |
| michael@0 | 4131 | + else |
| michael@0 | 4132 | + case $cache_file in #( |
| michael@0 | 4133 | + */* | ?:*) |
| michael@0 | 4134 | + mv -f confcache "$cache_file"$$ && |
| michael@0 | 4135 | + mv -f "$cache_file"$$ "$cache_file" ;; #( |
| michael@0 | 4136 | + *) |
| michael@0 | 4137 | + mv -f confcache "$cache_file" ;; |
| michael@0 | 4138 | + esac |
| michael@0 | 4139 | + fi |
| michael@0 | 4140 | + fi |
| michael@0 | 4141 | else |
| michael@0 | 4142 | { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 |
| michael@0 | 4143 | $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} |
| michael@0 | 4144 | fi |
| michael@0 | 4145 | fi |
| michael@0 | 4146 | rm -f confcache |
| michael@0 | 4147 | |
| michael@0 | 4148 | test "x$prefix" = xNONE && prefix=$ac_default_prefix |
| michael@0 | 4149 | # Let make expand exec_prefix. |
| michael@0 | 4150 | test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' |
| michael@0 | 4151 | |
| michael@0 | 4152 | DEFS=-DHAVE_CONFIG_H |
| michael@0 | 4153 | |
| michael@0 | 4154 | ac_libobjs= |
| michael@0 | 4155 | ac_ltlibobjs= |
| michael@0 | 4156 | +U= |
| michael@0 | 4157 | for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue |
| michael@0 | 4158 | # 1. Remove the extension, and $U if already installed. |
| michael@0 | 4159 | ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' |
| michael@0 | 4160 | ac_i=`$as_echo "$ac_i" | sed "$ac_script"` |
| michael@0 | 4161 | # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR |
| michael@0 | 4162 | # will be set to the directory where LIBOBJS objects are built. |
| michael@0 | 4163 | as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" |
| michael@0 | 4164 | as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' |
| michael@0 | 4165 | @@ -6282,61 +6312,61 @@ |
| michael@0 | 4166 | am__EXEEXT_TRUE= |
| michael@0 | 4167 | am__EXEEXT_FALSE='#' |
| michael@0 | 4168 | else |
| michael@0 | 4169 | am__EXEEXT_TRUE='#' |
| michael@0 | 4170 | am__EXEEXT_FALSE= |
| michael@0 | 4171 | fi |
| michael@0 | 4172 | |
| michael@0 | 4173 | if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then |
| michael@0 | 4174 | - as_fn_error "conditional \"AMDEP\" was never defined. |
| michael@0 | 4175 | + as_fn_error $? "conditional \"AMDEP\" was never defined. |
| michael@0 | 4176 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| michael@0 | 4177 | fi |
| michael@0 | 4178 | if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then |
| michael@0 | 4179 | - as_fn_error "conditional \"am__fastdepCC\" was never defined. |
| michael@0 | 4180 | + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. |
| michael@0 | 4181 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| michael@0 | 4182 | fi |
| michael@0 | 4183 | if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then |
| michael@0 | 4184 | - as_fn_error "conditional \"am__fastdepCCAS\" was never defined. |
| michael@0 | 4185 | + as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined. |
| michael@0 | 4186 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| michael@0 | 4187 | fi |
| michael@0 | 4188 | if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then |
| michael@0 | 4189 | - as_fn_error "conditional \"am__fastdepCC\" was never defined. |
| michael@0 | 4190 | + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. |
| michael@0 | 4191 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| michael@0 | 4192 | fi |
| michael@0 | 4193 | if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then |
| michael@0 | 4194 | - as_fn_error "conditional \"am__fastdepCXX\" was never defined. |
| michael@0 | 4195 | + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. |
| michael@0 | 4196 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| michael@0 | 4197 | fi |
| michael@0 | 4198 | if test -z "${GCC_TRUE}" && test -z "${GCC_FALSE}"; then |
| michael@0 | 4199 | - as_fn_error "conditional \"GCC\" was never defined. |
| michael@0 | 4200 | + as_fn_error $? "conditional \"GCC\" was never defined. |
| michael@0 | 4201 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| michael@0 | 4202 | fi |
| michael@0 | 4203 | if test -z "${LINUX_HOST_TRUE}" && test -z "${LINUX_HOST_FALSE}"; then |
| michael@0 | 4204 | - as_fn_error "conditional \"LINUX_HOST\" was never defined. |
| michael@0 | 4205 | + as_fn_error $? "conditional \"LINUX_HOST\" was never defined. |
| michael@0 | 4206 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| michael@0 | 4207 | fi |
| michael@0 | 4208 | if test -z "${ANDROID_HOST_TRUE}" && test -z "${ANDROID_HOST_FALSE}"; then |
| michael@0 | 4209 | - as_fn_error "conditional \"ANDROID_HOST\" was never defined. |
| michael@0 | 4210 | + as_fn_error $? "conditional \"ANDROID_HOST\" was never defined. |
| michael@0 | 4211 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| michael@0 | 4212 | fi |
| michael@0 | 4213 | if test -z "${DISABLE_PROCESSOR_TRUE}" && test -z "${DISABLE_PROCESSOR_FALSE}"; then |
| michael@0 | 4214 | - as_fn_error "conditional \"DISABLE_PROCESSOR\" was never defined. |
| michael@0 | 4215 | + as_fn_error $? "conditional \"DISABLE_PROCESSOR\" was never defined. |
| michael@0 | 4216 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| michael@0 | 4217 | fi |
| michael@0 | 4218 | if test -z "${DISABLE_TOOLS_TRUE}" && test -z "${DISABLE_TOOLS_FALSE}"; then |
| michael@0 | 4219 | - as_fn_error "conditional \"DISABLE_TOOLS\" was never defined. |
| michael@0 | 4220 | + as_fn_error $? "conditional \"DISABLE_TOOLS\" was never defined. |
| michael@0 | 4221 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| michael@0 | 4222 | fi |
| michael@0 | 4223 | if test -z "${SELFTEST_TRUE}" && test -z "${SELFTEST_FALSE}"; then |
| michael@0 | 4224 | - as_fn_error "conditional \"SELFTEST\" was never defined. |
| michael@0 | 4225 | + as_fn_error $? "conditional \"SELFTEST\" was never defined. |
| michael@0 | 4226 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| michael@0 | 4227 | fi |
| michael@0 | 4228 | |
| michael@0 | 4229 | -: ${CONFIG_STATUS=./config.status} |
| michael@0 | 4230 | +: "${CONFIG_STATUS=./config.status}" |
| michael@0 | 4231 | ac_write_fail=0 |
| michael@0 | 4232 | ac_clean_files_save=$ac_clean_files |
| michael@0 | 4233 | ac_clean_files="$ac_clean_files $CONFIG_STATUS" |
| michael@0 | 4234 | { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 |
| michael@0 | 4235 | $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} |
| michael@0 | 4236 | as_write_fail=0 |
| michael@0 | 4237 | cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 |
| michael@0 | 4238 | #! $SHELL |
| michael@0 | 4239 | @@ -6427,16 +6457,17 @@ |
| michael@0 | 4240 | # IFS |
| michael@0 | 4241 | # We need space, tab and new line, in precisely that order. Quoting is |
| michael@0 | 4242 | # there to prevent editors from complaining about space-tab. |
| michael@0 | 4243 | # (If _AS_PATH_WALK were called with IFS unset, it would disable word |
| michael@0 | 4244 | # splitting by setting IFS to empty value.) |
| michael@0 | 4245 | IFS=" "" $as_nl" |
| michael@0 | 4246 | |
| michael@0 | 4247 | # Find who we are. Look in the path if we contain no directory separator. |
| michael@0 | 4248 | +as_myself= |
| michael@0 | 4249 | case $0 in #(( |
| michael@0 | 4250 | *[\\/]* ) as_myself=$0 ;; |
| michael@0 | 4251 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| michael@0 | 4252 | for as_dir in $PATH |
| michael@0 | 4253 | do |
| michael@0 | 4254 | IFS=$as_save_IFS |
| michael@0 | 4255 | test -z "$as_dir" && as_dir=. |
| michael@0 | 4256 | test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break |
| michael@0 | 4257 | @@ -6472,29 +6503,29 @@ |
| michael@0 | 4258 | export LC_ALL |
| michael@0 | 4259 | LANGUAGE=C |
| michael@0 | 4260 | export LANGUAGE |
| michael@0 | 4261 | |
| michael@0 | 4262 | # CDPATH. |
| michael@0 | 4263 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
| michael@0 | 4264 | |
| michael@0 | 4265 | |
| michael@0 | 4266 | -# as_fn_error ERROR [LINENO LOG_FD] |
| michael@0 | 4267 | -# --------------------------------- |
| michael@0 | 4268 | +# as_fn_error STATUS ERROR [LINENO LOG_FD] |
| michael@0 | 4269 | +# ---------------------------------------- |
| michael@0 | 4270 | # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are |
| michael@0 | 4271 | # provided, also output the error to LOG_FD, referencing LINENO. Then exit the |
| michael@0 | 4272 | -# script with status $?, using 1 if that was 0. |
| michael@0 | 4273 | +# script with STATUS, using 1 if that was 0. |
| michael@0 | 4274 | as_fn_error () |
| michael@0 | 4275 | { |
| michael@0 | 4276 | - as_status=$?; test $as_status -eq 0 && as_status=1 |
| michael@0 | 4277 | - if test "$3"; then |
| michael@0 | 4278 | - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
| michael@0 | 4279 | - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 |
| michael@0 | 4280 | + as_status=$1; test $as_status -eq 0 && as_status=1 |
| michael@0 | 4281 | + if test "$4"; then |
| michael@0 | 4282 | + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
| michael@0 | 4283 | + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 |
| michael@0 | 4284 | fi |
| michael@0 | 4285 | - $as_echo "$as_me: error: $1" >&2 |
| michael@0 | 4286 | + $as_echo "$as_me: error: $2" >&2 |
| michael@0 | 4287 | as_fn_exit $as_status |
| michael@0 | 4288 | } # as_fn_error |
| michael@0 | 4289 | |
| michael@0 | 4290 | |
| michael@0 | 4291 | # as_fn_set_status STATUS |
| michael@0 | 4292 | # ----------------------- |
| michael@0 | 4293 | # Set $? to STATUS, without forking. |
| michael@0 | 4294 | as_fn_set_status () |
| michael@0 | 4295 | @@ -6680,17 +6711,17 @@ |
| michael@0 | 4296 | /^X\(\/\).*/{ |
| michael@0 | 4297 | s//\1/ |
| michael@0 | 4298 | q |
| michael@0 | 4299 | } |
| michael@0 | 4300 | s/.*/./; q'` |
| michael@0 | 4301 | test -d "$as_dir" && break |
| michael@0 | 4302 | done |
| michael@0 | 4303 | test -z "$as_dirs" || eval "mkdir $as_dirs" |
| michael@0 | 4304 | - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" |
| michael@0 | 4305 | + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" |
| michael@0 | 4306 | |
| michael@0 | 4307 | |
| michael@0 | 4308 | } # as_fn_mkdir_p |
| michael@0 | 4309 | if mkdir -p . 2>/dev/null; then |
| michael@0 | 4310 | as_mkdir_p='mkdir -p "$as_dir"' |
| michael@0 | 4311 | else |
| michael@0 | 4312 | test -d ./-p && rmdir ./-p |
| michael@0 | 4313 | as_mkdir_p=false |
| michael@0 | 4314 | @@ -6734,17 +6765,17 @@ |
| michael@0 | 4315 | test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 |
| michael@0 | 4316 | |
| michael@0 | 4317 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
| michael@0 | 4318 | # Save the log message, to keep $0 and so on meaningful, and to |
| michael@0 | 4319 | # report actual input values of CONFIG_FILES etc. instead of their |
| michael@0 | 4320 | # values after options handling. |
| michael@0 | 4321 | ac_log=" |
| michael@0 | 4322 | This file was extended by breakpad $as_me 0.1, which was |
| michael@0 | 4323 | -generated by GNU Autoconf 2.65. Invocation command line was |
| michael@0 | 4324 | +generated by GNU Autoconf 2.68. Invocation command line was |
| michael@0 | 4325 | |
| michael@0 | 4326 | CONFIG_FILES = $CONFIG_FILES |
| michael@0 | 4327 | CONFIG_HEADERS = $CONFIG_HEADERS |
| michael@0 | 4328 | CONFIG_LINKS = $CONFIG_LINKS |
| michael@0 | 4329 | CONFIG_COMMANDS = $CONFIG_COMMANDS |
| michael@0 | 4330 | $ $0 $@ |
| michael@0 | 4331 | |
| michael@0 | 4332 | on `(hostname || uname -n) 2>/dev/null | sed 1q` |
| michael@0 | 4333 | @@ -6800,20 +6831,20 @@ |
| michael@0 | 4334 | |
| michael@0 | 4335 | Report bugs to <google-breakpad-dev@googlegroups.com>." |
| michael@0 | 4336 | |
| michael@0 | 4337 | _ACEOF |
| michael@0 | 4338 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| michael@0 | 4339 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
| michael@0 | 4340 | ac_cs_version="\\ |
| michael@0 | 4341 | breakpad config.status 0.1 |
| michael@0 | 4342 | -configured by $0, generated by GNU Autoconf 2.65, |
| michael@0 | 4343 | +configured by $0, generated by GNU Autoconf 2.68, |
| michael@0 | 4344 | with options \\"\$ac_cs_config\\" |
| michael@0 | 4345 | |
| michael@0 | 4346 | -Copyright (C) 2009 Free Software Foundation, Inc. |
| michael@0 | 4347 | +Copyright (C) 2010 Free Software Foundation, Inc. |
| michael@0 | 4348 | This config.status script is free software; the Free Software Foundation |
| michael@0 | 4349 | gives unlimited permission to copy, distribute and modify it." |
| michael@0 | 4350 | |
| michael@0 | 4351 | ac_pwd='$ac_pwd' |
| michael@0 | 4352 | srcdir='$srcdir' |
| michael@0 | 4353 | INSTALL='$INSTALL' |
| michael@0 | 4354 | MKDIR_P='$MKDIR_P' |
| michael@0 | 4355 | AWK='$AWK' |
| michael@0 | 4356 | @@ -6821,21 +6852,26 @@ |
| michael@0 | 4357 | _ACEOF |
| michael@0 | 4358 | |
| michael@0 | 4359 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
| michael@0 | 4360 | # The default lists apply if the user does not specify any file. |
| michael@0 | 4361 | ac_need_defaults=: |
| michael@0 | 4362 | while test $# != 0 |
| michael@0 | 4363 | do |
| michael@0 | 4364 | case $1 in |
| michael@0 | 4365 | - --*=*) |
| michael@0 | 4366 | + --*=?*) |
| michael@0 | 4367 | ac_option=`expr "X$1" : 'X\([^=]*\)='` |
| michael@0 | 4368 | ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` |
| michael@0 | 4369 | ac_shift=: |
| michael@0 | 4370 | ;; |
| michael@0 | 4371 | + --*=) |
| michael@0 | 4372 | + ac_option=`expr "X$1" : 'X\([^=]*\)='` |
| michael@0 | 4373 | + ac_optarg= |
| michael@0 | 4374 | + ac_shift=: |
| michael@0 | 4375 | + ;; |
| michael@0 | 4376 | *) |
| michael@0 | 4377 | ac_option=$1 |
| michael@0 | 4378 | ac_optarg=$2 |
| michael@0 | 4379 | ac_shift=shift |
| michael@0 | 4380 | ;; |
| michael@0 | 4381 | esac |
| michael@0 | 4382 | |
| michael@0 | 4383 | case $ac_option in |
| michael@0 | 4384 | @@ -6847,38 +6883,39 @@ |
| michael@0 | 4385 | --config | --confi | --conf | --con | --co | --c ) |
| michael@0 | 4386 | $as_echo "$ac_cs_config"; exit ;; |
| michael@0 | 4387 | --debug | --debu | --deb | --de | --d | -d ) |
| michael@0 | 4388 | debug=: ;; |
| michael@0 | 4389 | --file | --fil | --fi | --f ) |
| michael@0 | 4390 | $ac_shift |
| michael@0 | 4391 | case $ac_optarg in |
| michael@0 | 4392 | *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; |
| michael@0 | 4393 | + '') as_fn_error $? "missing file argument" ;; |
| michael@0 | 4394 | esac |
| michael@0 | 4395 | as_fn_append CONFIG_FILES " '$ac_optarg'" |
| michael@0 | 4396 | ac_need_defaults=false;; |
| michael@0 | 4397 | --header | --heade | --head | --hea ) |
| michael@0 | 4398 | $ac_shift |
| michael@0 | 4399 | case $ac_optarg in |
| michael@0 | 4400 | *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; |
| michael@0 | 4401 | esac |
| michael@0 | 4402 | as_fn_append CONFIG_HEADERS " '$ac_optarg'" |
| michael@0 | 4403 | ac_need_defaults=false;; |
| michael@0 | 4404 | --he | --h) |
| michael@0 | 4405 | # Conflict between --help and --header |
| michael@0 | 4406 | - as_fn_error "ambiguous option: \`$1' |
| michael@0 | 4407 | + as_fn_error $? "ambiguous option: \`$1' |
| michael@0 | 4408 | Try \`$0 --help' for more information.";; |
| michael@0 | 4409 | --help | --hel | -h ) |
| michael@0 | 4410 | $as_echo "$ac_cs_usage"; exit ;; |
| michael@0 | 4411 | -q | -quiet | --quiet | --quie | --qui | --qu | --q \ |
| michael@0 | 4412 | | -silent | --silent | --silen | --sile | --sil | --si | --s) |
| michael@0 | 4413 | ac_cs_silent=: ;; |
| michael@0 | 4414 | |
| michael@0 | 4415 | # This is an error. |
| michael@0 | 4416 | - -*) as_fn_error "unrecognized option: \`$1' |
| michael@0 | 4417 | + -*) as_fn_error $? "unrecognized option: \`$1' |
| michael@0 | 4418 | Try \`$0 --help' for more information." ;; |
| michael@0 | 4419 | |
| michael@0 | 4420 | *) as_fn_append ac_config_targets " $1" |
| michael@0 | 4421 | ac_need_defaults=false ;; |
| michael@0 | 4422 | |
| michael@0 | 4423 | esac |
| michael@0 | 4424 | shift |
| michael@0 | 4425 | done |
| michael@0 | 4426 | @@ -6926,17 +6963,17 @@ |
| michael@0 | 4427 | # Handling of arguments. |
| michael@0 | 4428 | for ac_config_target in $ac_config_targets |
| michael@0 | 4429 | do |
| michael@0 | 4430 | case $ac_config_target in |
| michael@0 | 4431 | "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;; |
| michael@0 | 4432 | "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; |
| michael@0 | 4433 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
| michael@0 | 4434 | |
| michael@0 | 4435 | - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
| michael@0 | 4436 | + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
| michael@0 | 4437 | esac |
| michael@0 | 4438 | done |
| michael@0 | 4439 | |
| michael@0 | 4440 | |
| michael@0 | 4441 | # If the user did not use the arguments to specify the items to instantiate, |
| michael@0 | 4442 | # then the envvar interface is used. Set only those that are not. |
| michael@0 | 4443 | # We use the long form for the default assignment because of an extremely |
| michael@0 | 4444 | # bizarre bug on SunOS 4.1.3. |
| michael@0 | 4445 | @@ -6949,82 +6986,84 @@ |
| michael@0 | 4446 | # Have a temporary directory for convenience. Make it in the build tree |
| michael@0 | 4447 | # simply because there is no reason against having it here, and in addition, |
| michael@0 | 4448 | # creating and moving files from /tmp can sometimes cause problems. |
| michael@0 | 4449 | # Hook for its removal unless debugging. |
| michael@0 | 4450 | # Note that there is a small window in which the directory will not be cleaned: |
| michael@0 | 4451 | # after its creation but before its name has been assigned to `$tmp'. |
| michael@0 | 4452 | $debug || |
| michael@0 | 4453 | { |
| michael@0 | 4454 | - tmp= |
| michael@0 | 4455 | + tmp= ac_tmp= |
| michael@0 | 4456 | trap 'exit_status=$? |
| michael@0 | 4457 | - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status |
| michael@0 | 4458 | + : "${ac_tmp:=$tmp}" |
| michael@0 | 4459 | + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status |
| michael@0 | 4460 | ' 0 |
| michael@0 | 4461 | trap 'as_fn_exit 1' 1 2 13 15 |
| michael@0 | 4462 | } |
| michael@0 | 4463 | # Create a (secure) tmp directory for tmp files. |
| michael@0 | 4464 | |
| michael@0 | 4465 | { |
| michael@0 | 4466 | tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && |
| michael@0 | 4467 | - test -n "$tmp" && test -d "$tmp" |
| michael@0 | 4468 | + test -d "$tmp" |
| michael@0 | 4469 | } || |
| michael@0 | 4470 | { |
| michael@0 | 4471 | tmp=./conf$$-$RANDOM |
| michael@0 | 4472 | (umask 077 && mkdir "$tmp") |
| michael@0 | 4473 | -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 |
| michael@0 | 4474 | +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 |
| michael@0 | 4475 | +ac_tmp=$tmp |
| michael@0 | 4476 | |
| michael@0 | 4477 | # Set up the scripts for CONFIG_FILES section. |
| michael@0 | 4478 | # No need to generate them if there are no CONFIG_FILES. |
| michael@0 | 4479 | # This happens for instance with `./config.status config.h'. |
| michael@0 | 4480 | if test -n "$CONFIG_FILES"; then |
| michael@0 | 4481 | |
| michael@0 | 4482 | |
| michael@0 | 4483 | ac_cr=`echo X | tr X '\015'` |
| michael@0 | 4484 | # On cygwin, bash can eat \r inside `` if the user requested igncr. |
| michael@0 | 4485 | # But we know of no other shell where ac_cr would be empty at this |
| michael@0 | 4486 | # point, so we can use a bashism as a fallback. |
| michael@0 | 4487 | if test "x$ac_cr" = x; then |
| michael@0 | 4488 | eval ac_cr=\$\'\\r\' |
| michael@0 | 4489 | fi |
| michael@0 | 4490 | ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` |
| michael@0 | 4491 | if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then |
| michael@0 | 4492 | - ac_cs_awk_cr='\r' |
| michael@0 | 4493 | + ac_cs_awk_cr='\\r' |
| michael@0 | 4494 | else |
| michael@0 | 4495 | ac_cs_awk_cr=$ac_cr |
| michael@0 | 4496 | fi |
| michael@0 | 4497 | |
| michael@0 | 4498 | -echo 'BEGIN {' >"$tmp/subs1.awk" && |
| michael@0 | 4499 | +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && |
| michael@0 | 4500 | _ACEOF |
| michael@0 | 4501 | |
| michael@0 | 4502 | |
| michael@0 | 4503 | { |
| michael@0 | 4504 | echo "cat >conf$$subs.awk <<_ACEOF" && |
| michael@0 | 4505 | echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && |
| michael@0 | 4506 | echo "_ACEOF" |
| michael@0 | 4507 | } >conf$$subs.sh || |
| michael@0 | 4508 | - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 |
| michael@0 | 4509 | -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` |
| michael@0 | 4510 | + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 |
| michael@0 | 4511 | +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` |
| michael@0 | 4512 | ac_delim='%!_!# ' |
| michael@0 | 4513 | for ac_last_try in false false false false false :; do |
| michael@0 | 4514 | . ./conf$$subs.sh || |
| michael@0 | 4515 | - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 |
| michael@0 | 4516 | + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 |
| michael@0 | 4517 | |
| michael@0 | 4518 | ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` |
| michael@0 | 4519 | if test $ac_delim_n = $ac_delim_num; then |
| michael@0 | 4520 | break |
| michael@0 | 4521 | elif $ac_last_try; then |
| michael@0 | 4522 | - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 |
| michael@0 | 4523 | + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 |
| michael@0 | 4524 | else |
| michael@0 | 4525 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " |
| michael@0 | 4526 | fi |
| michael@0 | 4527 | done |
| michael@0 | 4528 | rm -f conf$$subs.sh |
| michael@0 | 4529 | |
| michael@0 | 4530 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| michael@0 | 4531 | -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && |
| michael@0 | 4532 | +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && |
| michael@0 | 4533 | _ACEOF |
| michael@0 | 4534 | sed -n ' |
| michael@0 | 4535 | h |
| michael@0 | 4536 | s/^/S["/; s/!.*/"]=/ |
| michael@0 | 4537 | p |
| michael@0 | 4538 | g |
| michael@0 | 4539 | s/^[^!]*!// |
| michael@0 | 4540 | :repl |
| michael@0 | 4541 | @@ -7062,17 +7101,17 @@ |
| michael@0 | 4542 | /^[^""]/{ |
| michael@0 | 4543 | N |
| michael@0 | 4544 | s/\n// |
| michael@0 | 4545 | } |
| michael@0 | 4546 | ' >>$CONFIG_STATUS || ac_write_fail=1 |
| michael@0 | 4547 | rm -f conf$$subs.awk |
| michael@0 | 4548 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| michael@0 | 4549 | _ACAWK |
| michael@0 | 4550 | -cat >>"\$tmp/subs1.awk" <<_ACAWK && |
| michael@0 | 4551 | +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && |
| michael@0 | 4552 | for (key in S) S_is_set[key] = 1 |
| michael@0 | 4553 | FS = "" |
| michael@0 | 4554 | |
| michael@0 | 4555 | } |
| michael@0 | 4556 | { |
| michael@0 | 4557 | line = $ 0 |
| michael@0 | 4558 | nfields = split(line, field, "@") |
| michael@0 | 4559 | substed = 0 |
| michael@0 | 4560 | @@ -7094,59 +7133,67 @@ |
| michael@0 | 4561 | |
| michael@0 | 4562 | _ACAWK |
| michael@0 | 4563 | _ACEOF |
| michael@0 | 4564 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
| michael@0 | 4565 | if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then |
| michael@0 | 4566 | sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" |
| michael@0 | 4567 | else |
| michael@0 | 4568 | cat |
| michael@0 | 4569 | -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ |
| michael@0 | 4570 | - || as_fn_error "could not setup config files machinery" "$LINENO" 5 |
| michael@0 | 4571 | +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ |
| michael@0 | 4572 | + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 |
| michael@0 | 4573 | _ACEOF |
| michael@0 | 4574 | |
| michael@0 | 4575 | -# VPATH may cause trouble with some makes, so we remove $(srcdir), |
| michael@0 | 4576 | -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and |
| michael@0 | 4577 | +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), |
| michael@0 | 4578 | +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and |
| michael@0 | 4579 | # trailing colons and then remove the whole line if VPATH becomes empty |
| michael@0 | 4580 | # (actually we leave an empty line to preserve line numbers). |
| michael@0 | 4581 | if test "x$srcdir" = x.; then |
| michael@0 | 4582 | - ac_vpsub='/^[ ]*VPATH[ ]*=/{ |
| michael@0 | 4583 | -s/:*\$(srcdir):*/:/ |
| michael@0 | 4584 | -s/:*\${srcdir}:*/:/ |
| michael@0 | 4585 | -s/:*@srcdir@:*/:/ |
| michael@0 | 4586 | -s/^\([^=]*=[ ]*\):*/\1/ |
| michael@0 | 4587 | + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ |
| michael@0 | 4588 | +h |
| michael@0 | 4589 | +s/// |
| michael@0 | 4590 | +s/^/:/ |
| michael@0 | 4591 | +s/[ ]*$/:/ |
| michael@0 | 4592 | +s/:\$(srcdir):/:/g |
| michael@0 | 4593 | +s/:\${srcdir}:/:/g |
| michael@0 | 4594 | +s/:@srcdir@:/:/g |
| michael@0 | 4595 | +s/^:*// |
| michael@0 | 4596 | s/:*$// |
| michael@0 | 4597 | +x |
| michael@0 | 4598 | +s/\(=[ ]*\).*/\1/ |
| michael@0 | 4599 | +G |
| michael@0 | 4600 | +s/\n// |
| michael@0 | 4601 | s/^[^=]*=[ ]*$// |
| michael@0 | 4602 | }' |
| michael@0 | 4603 | fi |
| michael@0 | 4604 | |
| michael@0 | 4605 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
| michael@0 | 4606 | fi # test -n "$CONFIG_FILES" |
| michael@0 | 4607 | |
| michael@0 | 4608 | # Set up the scripts for CONFIG_HEADERS section. |
| michael@0 | 4609 | # No need to generate them if there are no CONFIG_HEADERS. |
| michael@0 | 4610 | # This happens for instance with `./config.status Makefile'. |
| michael@0 | 4611 | if test -n "$CONFIG_HEADERS"; then |
| michael@0 | 4612 | -cat >"$tmp/defines.awk" <<\_ACAWK || |
| michael@0 | 4613 | +cat >"$ac_tmp/defines.awk" <<\_ACAWK || |
| michael@0 | 4614 | BEGIN { |
| michael@0 | 4615 | _ACEOF |
| michael@0 | 4616 | |
| michael@0 | 4617 | # Transform confdefs.h into an awk script `defines.awk', embedded as |
| michael@0 | 4618 | # here-document in config.status, that substitutes the proper values into |
| michael@0 | 4619 | # config.h.in to produce config.h. |
| michael@0 | 4620 | |
| michael@0 | 4621 | # Create a delimiter string that does not exist in confdefs.h, to ease |
| michael@0 | 4622 | # handling of long lines. |
| michael@0 | 4623 | ac_delim='%!_!# ' |
| michael@0 | 4624 | for ac_last_try in false false :; do |
| michael@0 | 4625 | - ac_t=`sed -n "/$ac_delim/p" confdefs.h` |
| michael@0 | 4626 | - if test -z "$ac_t"; then |
| michael@0 | 4627 | + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` |
| michael@0 | 4628 | + if test -z "$ac_tt"; then |
| michael@0 | 4629 | break |
| michael@0 | 4630 | elif $ac_last_try; then |
| michael@0 | 4631 | - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 |
| michael@0 | 4632 | + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 |
| michael@0 | 4633 | else |
| michael@0 | 4634 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " |
| michael@0 | 4635 | fi |
| michael@0 | 4636 | done |
| michael@0 | 4637 | |
| michael@0 | 4638 | # For the awk script, D is an array of macro values keyed by name, |
| michael@0 | 4639 | # likewise P contains macro parameters if any. Preserve backslash |
| michael@0 | 4640 | # newline sequences. |
| michael@0 | 4641 | @@ -7221,30 +7268,30 @@ |
| michael@0 | 4642 | next |
| michael@0 | 4643 | } |
| michael@0 | 4644 | } |
| michael@0 | 4645 | } |
| michael@0 | 4646 | { print } |
| michael@0 | 4647 | _ACAWK |
| michael@0 | 4648 | _ACEOF |
| michael@0 | 4649 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
| michael@0 | 4650 | - as_fn_error "could not setup config headers machinery" "$LINENO" 5 |
| michael@0 | 4651 | + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 |
| michael@0 | 4652 | fi # test -n "$CONFIG_HEADERS" |
| michael@0 | 4653 | |
| michael@0 | 4654 | |
| michael@0 | 4655 | eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" |
| michael@0 | 4656 | shift |
| michael@0 | 4657 | for ac_tag |
| michael@0 | 4658 | do |
| michael@0 | 4659 | case $ac_tag in |
| michael@0 | 4660 | :[FHLC]) ac_mode=$ac_tag; continue;; |
| michael@0 | 4661 | esac |
| michael@0 | 4662 | case $ac_mode$ac_tag in |
| michael@0 | 4663 | :[FHL]*:*);; |
| michael@0 | 4664 | - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; |
| michael@0 | 4665 | + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; |
| michael@0 | 4666 | :[FH]-) ac_tag=-:-;; |
| michael@0 | 4667 | :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; |
| michael@0 | 4668 | esac |
| michael@0 | 4669 | ac_save_IFS=$IFS |
| michael@0 | 4670 | IFS=: |
| michael@0 | 4671 | set x $ac_tag |
| michael@0 | 4672 | IFS=$ac_save_IFS |
| michael@0 | 4673 | shift |
| michael@0 | 4674 | @@ -7253,26 +7300,26 @@ |
| michael@0 | 4675 | |
| michael@0 | 4676 | case $ac_mode in |
| michael@0 | 4677 | :L) ac_source=$1;; |
| michael@0 | 4678 | :[FH]) |
| michael@0 | 4679 | ac_file_inputs= |
| michael@0 | 4680 | for ac_f |
| michael@0 | 4681 | do |
| michael@0 | 4682 | case $ac_f in |
| michael@0 | 4683 | - -) ac_f="$tmp/stdin";; |
| michael@0 | 4684 | + -) ac_f="$ac_tmp/stdin";; |
| michael@0 | 4685 | *) # Look for the file first in the build tree, then in the source tree |
| michael@0 | 4686 | # (if the path is not absolute). The absolute path cannot be DOS-style, |
| michael@0 | 4687 | # because $ac_f cannot contain `:'. |
| michael@0 | 4688 | test -f "$ac_f" || |
| michael@0 | 4689 | case $ac_f in |
| michael@0 | 4690 | [\\/$]*) false;; |
| michael@0 | 4691 | *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; |
| michael@0 | 4692 | esac || |
| michael@0 | 4693 | - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; |
| michael@0 | 4694 | + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; |
| michael@0 | 4695 | esac |
| michael@0 | 4696 | case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac |
| michael@0 | 4697 | as_fn_append ac_file_inputs " '$ac_f'" |
| michael@0 | 4698 | done |
| michael@0 | 4699 | |
| michael@0 | 4700 | # Let's still pretend it is `configure' which instantiates (i.e., don't |
| michael@0 | 4701 | # use $as_me), people would be surprised to read: |
| michael@0 | 4702 | # /* config.h. Generated by config.status. */ |
| michael@0 | 4703 | @@ -7288,18 +7335,18 @@ |
| michael@0 | 4704 | case $configure_input in #( |
| michael@0 | 4705 | *\&* | *\|* | *\\* ) |
| michael@0 | 4706 | ac_sed_conf_input=`$as_echo "$configure_input" | |
| michael@0 | 4707 | sed 's/[\\\\&|]/\\\\&/g'`;; #( |
| michael@0 | 4708 | *) ac_sed_conf_input=$configure_input;; |
| michael@0 | 4709 | esac |
| michael@0 | 4710 | |
| michael@0 | 4711 | case $ac_tag in |
| michael@0 | 4712 | - *:-:* | *:-) cat >"$tmp/stdin" \ |
| michael@0 | 4713 | - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; |
| michael@0 | 4714 | + *:-:* | *:-) cat >"$ac_tmp/stdin" \ |
| michael@0 | 4715 | + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; |
| michael@0 | 4716 | esac |
| michael@0 | 4717 | ;; |
| michael@0 | 4718 | esac |
| michael@0 | 4719 | |
| michael@0 | 4720 | ac_dir=`$as_dirname -- "$ac_file" || |
| michael@0 | 4721 | $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
| michael@0 | 4722 | X"$ac_file" : 'X\(//\)[^/]' \| \ |
| michael@0 | 4723 | X"$ac_file" : 'X\(//\)$' \| \ |
| michael@0 | 4724 | @@ -7425,56 +7472,57 @@ |
| michael@0 | 4725 | s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t |
| michael@0 | 4726 | s&@builddir@&$ac_builddir&;t t |
| michael@0 | 4727 | s&@abs_builddir@&$ac_abs_builddir&;t t |
| michael@0 | 4728 | s&@abs_top_builddir@&$ac_abs_top_builddir&;t t |
| michael@0 | 4729 | s&@INSTALL@&$ac_INSTALL&;t t |
| michael@0 | 4730 | s&@MKDIR_P@&$ac_MKDIR_P&;t t |
| michael@0 | 4731 | $ac_datarootdir_hack |
| michael@0 | 4732 | " |
| michael@0 | 4733 | -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ |
| michael@0 | 4734 | - || as_fn_error "could not create $ac_file" "$LINENO" 5 |
| michael@0 | 4735 | +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ |
| michael@0 | 4736 | + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
| michael@0 | 4737 | |
| michael@0 | 4738 | test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && |
| michael@0 | 4739 | - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && |
| michael@0 | 4740 | - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && |
| michael@0 | 4741 | + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && |
| michael@0 | 4742 | + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ |
| michael@0 | 4743 | + "$ac_tmp/out"`; test -z "$ac_out"; } && |
| michael@0 | 4744 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
| michael@0 | 4745 | -which seems to be undefined. Please make sure it is defined." >&5 |
| michael@0 | 4746 | +which seems to be undefined. Please make sure it is defined" >&5 |
| michael@0 | 4747 | $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
| michael@0 | 4748 | -which seems to be undefined. Please make sure it is defined." >&2;} |
| michael@0 | 4749 | - |
| michael@0 | 4750 | - rm -f "$tmp/stdin" |
| michael@0 | 4751 | +which seems to be undefined. Please make sure it is defined" >&2;} |
| michael@0 | 4752 | + |
| michael@0 | 4753 | + rm -f "$ac_tmp/stdin" |
| michael@0 | 4754 | case $ac_file in |
| michael@0 | 4755 | - -) cat "$tmp/out" && rm -f "$tmp/out";; |
| michael@0 | 4756 | - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; |
| michael@0 | 4757 | + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; |
| michael@0 | 4758 | + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; |
| michael@0 | 4759 | esac \ |
| michael@0 | 4760 | - || as_fn_error "could not create $ac_file" "$LINENO" 5 |
| michael@0 | 4761 | + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
| michael@0 | 4762 | ;; |
| michael@0 | 4763 | :H) |
| michael@0 | 4764 | # |
| michael@0 | 4765 | # CONFIG_HEADER |
| michael@0 | 4766 | # |
| michael@0 | 4767 | if test x"$ac_file" != x-; then |
| michael@0 | 4768 | { |
| michael@0 | 4769 | $as_echo "/* $configure_input */" \ |
| michael@0 | 4770 | - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" |
| michael@0 | 4771 | - } >"$tmp/config.h" \ |
| michael@0 | 4772 | - || as_fn_error "could not create $ac_file" "$LINENO" 5 |
| michael@0 | 4773 | - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then |
| michael@0 | 4774 | + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" |
| michael@0 | 4775 | + } >"$ac_tmp/config.h" \ |
| michael@0 | 4776 | + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
| michael@0 | 4777 | + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then |
| michael@0 | 4778 | { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 |
| michael@0 | 4779 | $as_echo "$as_me: $ac_file is unchanged" >&6;} |
| michael@0 | 4780 | else |
| michael@0 | 4781 | rm -f "$ac_file" |
| michael@0 | 4782 | - mv "$tmp/config.h" "$ac_file" \ |
| michael@0 | 4783 | - || as_fn_error "could not create $ac_file" "$LINENO" 5 |
| michael@0 | 4784 | + mv "$ac_tmp/config.h" "$ac_file" \ |
| michael@0 | 4785 | + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
| michael@0 | 4786 | fi |
| michael@0 | 4787 | else |
| michael@0 | 4788 | $as_echo "/* $configure_input */" \ |
| michael@0 | 4789 | - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ |
| michael@0 | 4790 | - || as_fn_error "could not create -" "$LINENO" 5 |
| michael@0 | 4791 | + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ |
| michael@0 | 4792 | + || as_fn_error $? "could not create -" "$LINENO" 5 |
| michael@0 | 4793 | fi |
| michael@0 | 4794 | # Compute "$ac_file"'s index in $config_headers. |
| michael@0 | 4795 | _am_arg="$ac_file" |
| michael@0 | 4796 | _am_stamp_count=1 |
| michael@0 | 4797 | for _am_header in $config_headers :; do |
| michael@0 | 4798 | case $_am_header in |
| michael@0 | 4799 | $_am_arg | $_am_arg:* ) |
| michael@0 | 4800 | break ;; |
| michael@0 | 4801 | @@ -7614,17 +7662,17 @@ |
| michael@0 | 4802 | done # for ac_tag |
| michael@0 | 4803 | |
| michael@0 | 4804 | |
| michael@0 | 4805 | as_fn_exit 0 |
| michael@0 | 4806 | _ACEOF |
| michael@0 | 4807 | ac_clean_files=$ac_clean_files_save |
| michael@0 | 4808 | |
| michael@0 | 4809 | test $ac_write_fail = 0 || |
| michael@0 | 4810 | - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 |
| michael@0 | 4811 | + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 |
| michael@0 | 4812 | |
| michael@0 | 4813 | |
| michael@0 | 4814 | # configure is writing to config.log, and then calls config.status. |
| michael@0 | 4815 | # config.status does its own redirection, appending to config.log. |
| michael@0 | 4816 | # Unfortunately, on DOS this fails, as config.log is still kept open |
| michael@0 | 4817 | # by configure, so config.status won't be able to write to it; its |
| michael@0 | 4818 | # output is simply discarded. So we exec the FD to /dev/null, |
| michael@0 | 4819 | # effectively closing config.log, so it can be properly (re)opened and |
| michael@0 | 4820 | @@ -7635,15 +7683,15 @@ |
| michael@0 | 4821 | ac_config_status_args= |
| michael@0 | 4822 | test "$silent" = yes && |
| michael@0 | 4823 | ac_config_status_args="$ac_config_status_args --quiet" |
| michael@0 | 4824 | exec 5>/dev/null |
| michael@0 | 4825 | $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false |
| michael@0 | 4826 | exec 5>>config.log |
| michael@0 | 4827 | # Use ||, not &&, to avoid exiting from the if with $? = 1, which |
| michael@0 | 4828 | # would make configure fail if this is the last instruction. |
| michael@0 | 4829 | - $ac_cs_success || as_fn_exit $? |
| michael@0 | 4830 | + $ac_cs_success || as_fn_exit 1 |
| michael@0 | 4831 | fi |
| michael@0 | 4832 | if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then |
| michael@0 | 4833 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 |
| michael@0 | 4834 | $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} |
| michael@0 | 4835 | fi |
| michael@0 | 4836 | |
| michael@0 | 4837 | diff --git a/src/common/dwarf_cfi_to_module.cc b/src/common/dwarf_cfi_to_module.cc |
| michael@0 | 4838 | --- a/src/common/dwarf_cfi_to_module.cc |
| michael@0 | 4839 | +++ b/src/common/dwarf_cfi_to_module.cc |
| michael@0 | 4840 | @@ -122,17 +122,18 @@ |
| michael@0 | 4841 | return_address_ = return_address; |
| michael@0 | 4842 | |
| michael@0 | 4843 | // Breakpad STACK CFI records must provide a .ra rule, but DWARF CFI |
| michael@0 | 4844 | // may not establish any rule for .ra if the return address column |
| michael@0 | 4845 | // is an ordinary register, and that register holds the return |
| michael@0 | 4846 | // address on entry to the function. So establish an initial .ra |
| michael@0 | 4847 | // rule citing the return address register. |
| michael@0 | 4848 | if (return_address_ < register_names_.size()) |
| michael@0 | 4849 | - entry_->initial_rules[ra_name_] = register_names_[return_address_]; |
| michael@0 | 4850 | + entry_->initial_rules[ra_name_] |
| michael@0 | 4851 | + = Module::Expr(register_names_[return_address_], 0, false); |
| michael@0 | 4852 | |
| michael@0 | 4853 | return true; |
| michael@0 | 4854 | } |
| michael@0 | 4855 | |
| michael@0 | 4856 | string DwarfCFIToModule::RegisterName(int i) { |
| michael@0 | 4857 | assert(entry_); |
| michael@0 | 4858 | if (i < 0) { |
| michael@0 | 4859 | assert(i == kCFARegister); |
| michael@0 | 4860 | @@ -148,69 +149,65 @@ |
| michael@0 | 4861 | |
| michael@0 | 4862 | reporter_->UnnamedRegister(entry_offset_, reg); |
| michael@0 | 4863 | char buf[30]; |
| michael@0 | 4864 | sprintf(buf, "unnamed_register%u", reg); |
| michael@0 | 4865 | return buf; |
| michael@0 | 4866 | } |
| michael@0 | 4867 | |
| michael@0 | 4868 | void DwarfCFIToModule::Record(Module::Address address, int reg, |
| michael@0 | 4869 | - const string &rule) { |
| michael@0 | 4870 | + const Module::Expr &rule) { |
| michael@0 | 4871 | assert(entry_); |
| michael@0 | 4872 | |
| michael@0 | 4873 | - // Place the name in our global set of strings, and then use the string |
| michael@0 | 4874 | - // from the set. Even though the assignment looks like a copy, all the |
| michael@0 | 4875 | - // major std::string implementations use reference counting internally, |
| michael@0 | 4876 | - // so the effect is to have all our data structures share copies of rules |
| michael@0 | 4877 | - // whenever possible. Since register names are drawn from a |
| michael@0 | 4878 | - // vector<string>, register names are already shared. |
| michael@0 | 4879 | - string shared_rule = *common_strings_.insert(rule).first; |
| michael@0 | 4880 | - |
| michael@0 | 4881 | // Is this one of this entry's initial rules? |
| michael@0 | 4882 | if (address == entry_->address) |
| michael@0 | 4883 | - entry_->initial_rules[RegisterName(reg)] = shared_rule; |
| michael@0 | 4884 | + entry_->initial_rules[RegisterName(reg)] = rule; |
| michael@0 | 4885 | // File it under the appropriate address. |
| michael@0 | 4886 | else |
| michael@0 | 4887 | - entry_->rule_changes[address][RegisterName(reg)] = shared_rule; |
| michael@0 | 4888 | + entry_->rule_changes[address][RegisterName(reg)] = rule; |
| michael@0 | 4889 | } |
| michael@0 | 4890 | |
| michael@0 | 4891 | bool DwarfCFIToModule::UndefinedRule(uint64 address, int reg) { |
| michael@0 | 4892 | reporter_->UndefinedNotSupported(entry_offset_, RegisterName(reg)); |
| michael@0 | 4893 | // Treat this as a non-fatal error. |
| michael@0 | 4894 | return true; |
| michael@0 | 4895 | } |
| michael@0 | 4896 | |
| michael@0 | 4897 | bool DwarfCFIToModule::SameValueRule(uint64 address, int reg) { |
| michael@0 | 4898 | - ostringstream s; |
| michael@0 | 4899 | - s << RegisterName(reg); |
| michael@0 | 4900 | - Record(address, reg, s.str()); |
| michael@0 | 4901 | + // reg + 0 |
| michael@0 | 4902 | + Module::Expr rule |
| michael@0 | 4903 | + = Module::Expr(RegisterName(reg), 0, false); |
| michael@0 | 4904 | + Record(address, reg, rule); |
| michael@0 | 4905 | return true; |
| michael@0 | 4906 | } |
| michael@0 | 4907 | |
| michael@0 | 4908 | bool DwarfCFIToModule::OffsetRule(uint64 address, int reg, |
| michael@0 | 4909 | int base_register, long offset) { |
| michael@0 | 4910 | - ostringstream s; |
| michael@0 | 4911 | - s << RegisterName(base_register) << " " << offset << " + ^"; |
| michael@0 | 4912 | - Record(address, reg, s.str()); |
| michael@0 | 4913 | + // *(base_register + offset) |
| michael@0 | 4914 | + Module::Expr rule |
| michael@0 | 4915 | + = Module::Expr(RegisterName(base_register), offset, true); |
| michael@0 | 4916 | + Record(address, reg, rule); |
| michael@0 | 4917 | return true; |
| michael@0 | 4918 | } |
| michael@0 | 4919 | |
| michael@0 | 4920 | bool DwarfCFIToModule::ValOffsetRule(uint64 address, int reg, |
| michael@0 | 4921 | int base_register, long offset) { |
| michael@0 | 4922 | - ostringstream s; |
| michael@0 | 4923 | - s << RegisterName(base_register) << " " << offset << " +"; |
| michael@0 | 4924 | - Record(address, reg, s.str()); |
| michael@0 | 4925 | + // base_register + offset |
| michael@0 | 4926 | + Module::Expr rule |
| michael@0 | 4927 | + = Module::Expr(RegisterName(base_register), offset, false); |
| michael@0 | 4928 | + Record(address, reg, rule); |
| michael@0 | 4929 | return true; |
| michael@0 | 4930 | } |
| michael@0 | 4931 | |
| michael@0 | 4932 | bool DwarfCFIToModule::RegisterRule(uint64 address, int reg, |
| michael@0 | 4933 | int base_register) { |
| michael@0 | 4934 | - ostringstream s; |
| michael@0 | 4935 | - s << RegisterName(base_register); |
| michael@0 | 4936 | - Record(address, reg, s.str()); |
| michael@0 | 4937 | + // base_register + 0 |
| michael@0 | 4938 | + Module::Expr rule |
| michael@0 | 4939 | + = Module::Expr(RegisterName(base_register), 0, false); |
| michael@0 | 4940 | + Record(address, reg, rule); |
| michael@0 | 4941 | return true; |
| michael@0 | 4942 | } |
| michael@0 | 4943 | |
| michael@0 | 4944 | bool DwarfCFIToModule::ExpressionRule(uint64 address, int reg, |
| michael@0 | 4945 | const string &expression) { |
| michael@0 | 4946 | reporter_->ExpressionsNotSupported(entry_offset_, RegisterName(reg)); |
| michael@0 | 4947 | // Treat this as a non-fatal error. |
| michael@0 | 4948 | return true; |
| michael@0 | 4949 | diff --git a/src/common/dwarf_cfi_to_module.h b/src/common/dwarf_cfi_to_module.h |
| michael@0 | 4950 | --- a/src/common/dwarf_cfi_to_module.h |
| michael@0 | 4951 | +++ b/src/common/dwarf_cfi_to_module.h |
| michael@0 | 4952 | @@ -147,17 +147,17 @@ |
| michael@0 | 4953 | const string &expression); |
| michael@0 | 4954 | virtual bool End(); |
| michael@0 | 4955 | |
| michael@0 | 4956 | private: |
| michael@0 | 4957 | // Return the name to use for register REG. |
| michael@0 | 4958 | string RegisterName(int i); |
| michael@0 | 4959 | |
| michael@0 | 4960 | // Record RULE for register REG at ADDRESS. |
| michael@0 | 4961 | - void Record(Module::Address address, int reg, const string &rule); |
| michael@0 | 4962 | + void Record(Module::Address address, int reg, const Module::Expr &rule); |
| michael@0 | 4963 | |
| michael@0 | 4964 | // The module to which we should add entries. |
| michael@0 | 4965 | Module *module_; |
| michael@0 | 4966 | |
| michael@0 | 4967 | // Map from register numbers to register names. |
| michael@0 | 4968 | const vector<string> ®ister_names_; |
| michael@0 | 4969 | |
| michael@0 | 4970 | // The reporter to use to report problems. |
| michael@0 | 4971 | diff --git a/src/common/dwarf_cfi_to_module_unittest.cc b/src/common/dwarf_cfi_to_module_unittest.cc |
| michael@0 | 4972 | --- a/src/common/dwarf_cfi_to_module_unittest.cc |
| michael@0 | 4973 | +++ b/src/common/dwarf_cfi_to_module_unittest.cc |
| michael@0 | 4974 | @@ -153,69 +153,71 @@ |
| michael@0 | 4975 | } |
| michael@0 | 4976 | |
| michael@0 | 4977 | TEST_F(Rule, SameValueRule) { |
| michael@0 | 4978 | StartEntry(); |
| michael@0 | 4979 | ASSERT_TRUE(handler.SameValueRule(entry_address, 6)); |
| michael@0 | 4980 | ASSERT_TRUE(handler.End()); |
| michael@0 | 4981 | CheckEntry(); |
| michael@0 | 4982 | Module::RuleMap expected_initial; |
| michael@0 | 4983 | - expected_initial["reg6"] = "reg6"; |
| michael@0 | 4984 | + expected_initial["reg6"] = Module::Expr("reg6", 0, false); |
| michael@0 | 4985 | EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial)); |
| michael@0 | 4986 | EXPECT_EQ(0U, entries[0]->rule_changes.size()); |
| michael@0 | 4987 | } |
| michael@0 | 4988 | |
| michael@0 | 4989 | TEST_F(Rule, OffsetRule) { |
| michael@0 | 4990 | StartEntry(); |
| michael@0 | 4991 | ASSERT_TRUE(handler.OffsetRule(entry_address + 1, return_reg, |
| michael@0 | 4992 | DwarfCFIToModule::kCFARegister, |
| michael@0 | 4993 | 16927065)); |
| michael@0 | 4994 | ASSERT_TRUE(handler.End()); |
| michael@0 | 4995 | CheckEntry(); |
| michael@0 | 4996 | EXPECT_EQ(0U, entries[0]->initial_rules.size()); |
| michael@0 | 4997 | Module::RuleChangeMap expected_changes; |
| michael@0 | 4998 | - expected_changes[entry_address + 1][".ra"] = ".cfa 16927065 + ^"; |
| michael@0 | 4999 | + expected_changes[entry_address + 1][".ra"] = |
| michael@0 | 5000 | + Module::Expr(".cfa", 16927065, true); |
| michael@0 | 5001 | EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes)); |
| michael@0 | 5002 | } |
| michael@0 | 5003 | |
| michael@0 | 5004 | TEST_F(Rule, OffsetRuleNegative) { |
| michael@0 | 5005 | StartEntry(); |
| michael@0 | 5006 | ASSERT_TRUE(handler.OffsetRule(entry_address + 1, |
| michael@0 | 5007 | DwarfCFIToModule::kCFARegister, 4, -34530721)); |
| michael@0 | 5008 | ASSERT_TRUE(handler.End()); |
| michael@0 | 5009 | CheckEntry(); |
| michael@0 | 5010 | EXPECT_EQ(0U, entries[0]->initial_rules.size()); |
| michael@0 | 5011 | Module::RuleChangeMap expected_changes; |
| michael@0 | 5012 | - expected_changes[entry_address + 1][".cfa"] = "reg4 -34530721 + ^"; |
| michael@0 | 5013 | + expected_changes[entry_address + 1][".cfa"] = |
| michael@0 | 5014 | + Module::Expr("reg4", -34530721, true); |
| michael@0 | 5015 | EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes)); |
| michael@0 | 5016 | } |
| michael@0 | 5017 | |
| michael@0 | 5018 | TEST_F(Rule, ValOffsetRule) { |
| michael@0 | 5019 | // Use an unnamed register number, to exercise that branch of RegisterName. |
| michael@0 | 5020 | EXPECT_CALL(reporter, UnnamedRegister(_, 11)); |
| michael@0 | 5021 | StartEntry(); |
| michael@0 | 5022 | ASSERT_TRUE(handler.ValOffsetRule(entry_address + 0x5ab7, |
| michael@0 | 5023 | DwarfCFIToModule::kCFARegister, |
| michael@0 | 5024 | 11, 61812979)); |
| michael@0 | 5025 | ASSERT_TRUE(handler.End()); |
| michael@0 | 5026 | CheckEntry(); |
| michael@0 | 5027 | EXPECT_EQ(0U, entries[0]->initial_rules.size()); |
| michael@0 | 5028 | Module::RuleChangeMap expected_changes; |
| michael@0 | 5029 | expected_changes[entry_address + 0x5ab7][".cfa"] = |
| michael@0 | 5030 | - "unnamed_register11 61812979 +"; |
| michael@0 | 5031 | + Module::Expr("unnamed_register11", 61812979, false); |
| michael@0 | 5032 | EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes)); |
| michael@0 | 5033 | } |
| michael@0 | 5034 | |
| michael@0 | 5035 | TEST_F(Rule, RegisterRule) { |
| michael@0 | 5036 | StartEntry(); |
| michael@0 | 5037 | ASSERT_TRUE(handler.RegisterRule(entry_address, return_reg, 3)); |
| michael@0 | 5038 | ASSERT_TRUE(handler.End()); |
| michael@0 | 5039 | CheckEntry(); |
| michael@0 | 5040 | Module::RuleMap expected_initial; |
| michael@0 | 5041 | - expected_initial[".ra"] = "reg3"; |
| michael@0 | 5042 | + expected_initial[".ra"] = Module::Expr("reg3", 0, false); |
| michael@0 | 5043 | EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial)); |
| michael@0 | 5044 | EXPECT_EQ(0U, entries[0]->rule_changes.size()); |
| michael@0 | 5045 | } |
| michael@0 | 5046 | |
| michael@0 | 5047 | TEST_F(Rule, ExpressionRule) { |
| michael@0 | 5048 | EXPECT_CALL(reporter, ExpressionsNotSupported(_, "reg2")); |
| michael@0 | 5049 | StartEntry(); |
| michael@0 | 5050 | ASSERT_TRUE(handler.ExpressionRule(entry_address + 0xf326, 2, |
| michael@0 | 5051 | @@ -239,45 +241,46 @@ |
| michael@0 | 5052 | |
| michael@0 | 5053 | TEST_F(Rule, DefaultReturnAddressRule) { |
| michael@0 | 5054 | return_reg = 2; |
| michael@0 | 5055 | StartEntry(); |
| michael@0 | 5056 | ASSERT_TRUE(handler.RegisterRule(entry_address, 0, 1)); |
| michael@0 | 5057 | ASSERT_TRUE(handler.End()); |
| michael@0 | 5058 | CheckEntry(); |
| michael@0 | 5059 | Module::RuleMap expected_initial; |
| michael@0 | 5060 | - expected_initial[".ra"] = "reg2"; |
| michael@0 | 5061 | - expected_initial["reg0"] = "reg1"; |
| michael@0 | 5062 | + expected_initial[".ra"] = Module::Expr("reg2", 0, false); |
| michael@0 | 5063 | + expected_initial["reg0"] = Module::Expr("reg1", 0, false); |
| michael@0 | 5064 | EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial)); |
| michael@0 | 5065 | EXPECT_EQ(0U, entries[0]->rule_changes.size()); |
| michael@0 | 5066 | } |
| michael@0 | 5067 | |
| michael@0 | 5068 | TEST_F(Rule, DefaultReturnAddressRuleOverride) { |
| michael@0 | 5069 | return_reg = 2; |
| michael@0 | 5070 | StartEntry(); |
| michael@0 | 5071 | ASSERT_TRUE(handler.RegisterRule(entry_address, return_reg, 1)); |
| michael@0 | 5072 | ASSERT_TRUE(handler.End()); |
| michael@0 | 5073 | CheckEntry(); |
| michael@0 | 5074 | Module::RuleMap expected_initial; |
| michael@0 | 5075 | - expected_initial[".ra"] = "reg1"; |
| michael@0 | 5076 | + expected_initial[".ra"] = Module::Expr("reg1", 0, false); |
| michael@0 | 5077 | EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial)); |
| michael@0 | 5078 | EXPECT_EQ(0U, entries[0]->rule_changes.size()); |
| michael@0 | 5079 | } |
| michael@0 | 5080 | |
| michael@0 | 5081 | TEST_F(Rule, DefaultReturnAddressRuleLater) { |
| michael@0 | 5082 | return_reg = 2; |
| michael@0 | 5083 | StartEntry(); |
| michael@0 | 5084 | ASSERT_TRUE(handler.RegisterRule(entry_address + 1, return_reg, 1)); |
| michael@0 | 5085 | ASSERT_TRUE(handler.End()); |
| michael@0 | 5086 | CheckEntry(); |
| michael@0 | 5087 | Module::RuleMap expected_initial; |
| michael@0 | 5088 | - expected_initial[".ra"] = "reg2"; |
| michael@0 | 5089 | + expected_initial[".ra"] = Module::Expr("reg2", 0, false); |
| michael@0 | 5090 | EXPECT_THAT(entries[0]->initial_rules, ContainerEq(expected_initial)); |
| michael@0 | 5091 | Module::RuleChangeMap expected_changes; |
| michael@0 | 5092 | - expected_changes[entry_address + 1][".ra"] = "reg1"; |
| michael@0 | 5093 | + expected_changes[entry_address + 1][".ra"] = |
| michael@0 | 5094 | + Module::Expr("reg1", 0, false); |
| michael@0 | 5095 | EXPECT_THAT(entries[0]->rule_changes, ContainerEq(expected_changes)); |
| michael@0 | 5096 | } |
| michael@0 | 5097 | |
| michael@0 | 5098 | TEST(RegisterNames, I386) { |
| michael@0 | 5099 | vector<string> names = DwarfCFIToModule::RegisterNames::I386(); |
| michael@0 | 5100 | |
| michael@0 | 5101 | EXPECT_EQ("$eax", names[0]); |
| michael@0 | 5102 | EXPECT_EQ("$ecx", names[1]); |
| michael@0 | 5103 | diff --git a/src/common/module.cc b/src/common/module.cc |
| michael@0 | 5104 | --- a/src/common/module.cc |
| michael@0 | 5105 | +++ b/src/common/module.cc |
| michael@0 | 5106 | @@ -251,16 +251,34 @@ |
| michael@0 | 5107 | } |
| michael@0 | 5108 | |
| michael@0 | 5109 | bool Module::ReportError() { |
| michael@0 | 5110 | fprintf(stderr, "error writing symbol file: %s\n", |
| michael@0 | 5111 | strerror(errno)); |
| michael@0 | 5112 | return false; |
| michael@0 | 5113 | } |
| michael@0 | 5114 | |
| michael@0 | 5115 | +std::ostream& operator<<(std::ostream& stream, const Module::Expr& expr) { |
| michael@0 | 5116 | + assert(!expr.invalid()); |
| michael@0 | 5117 | + switch (expr.how_) { |
| michael@0 | 5118 | + case Module::kExprSimple: |
| michael@0 | 5119 | + stream << expr.ident_ << " " << expr.offset_ << " +"; |
| michael@0 | 5120 | + break; |
| michael@0 | 5121 | + case Module::kExprSimpleMem: |
| michael@0 | 5122 | + stream << expr.ident_ << " " << expr.offset_ << " + ^"; |
| michael@0 | 5123 | + break; |
| michael@0 | 5124 | + case Module::kExprPostfix: |
| michael@0 | 5125 | + stream << expr.postfix_; break; |
| michael@0 | 5126 | + case Module::kExprInvalid: |
| michael@0 | 5127 | + default: |
| michael@0 | 5128 | + break; |
| michael@0 | 5129 | + } |
| michael@0 | 5130 | + return stream; |
| michael@0 | 5131 | +} |
| michael@0 | 5132 | + |
| michael@0 | 5133 | bool Module::WriteRuleMap(const RuleMap &rule_map, std::ostream &stream) { |
| michael@0 | 5134 | for (RuleMap::const_iterator it = rule_map.begin(); |
| michael@0 | 5135 | it != rule_map.end(); ++it) { |
| michael@0 | 5136 | if (it != rule_map.begin()) |
| michael@0 | 5137 | stream << ' '; |
| michael@0 | 5138 | stream << it->first << ": " << it->second; |
| michael@0 | 5139 | } |
| michael@0 | 5140 | return stream.good(); |
| michael@0 | 5141 | diff --git a/src/common/module.h b/src/common/module.h |
| michael@0 | 5142 | --- a/src/common/module.h |
| michael@0 | 5143 | +++ b/src/common/module.h |
| michael@0 | 5144 | @@ -119,21 +119,81 @@ |
| michael@0 | 5145 | }; |
| michael@0 | 5146 | |
| michael@0 | 5147 | // An exported symbol. |
| michael@0 | 5148 | struct Extern { |
| michael@0 | 5149 | Address address; |
| michael@0 | 5150 | string name; |
| michael@0 | 5151 | }; |
| michael@0 | 5152 | |
| michael@0 | 5153 | - // A map from register names to postfix expressions that recover |
| michael@0 | 5154 | - // their their values. This can represent a complete set of rules to |
| michael@0 | 5155 | + // Representation of an expression. This can either be a postfix |
| michael@0 | 5156 | + // expression, in which case it is stored as a string, or a simple |
| michael@0 | 5157 | + // expression of the form (identifier + imm) or *(identifier + imm). |
| michael@0 | 5158 | + // It can also be invalid (denoting "no value"). |
| michael@0 | 5159 | + enum ExprHow { |
| michael@0 | 5160 | + kExprInvalid = 1, |
| michael@0 | 5161 | + kExprPostfix, |
| michael@0 | 5162 | + kExprSimple, |
| michael@0 | 5163 | + kExprSimpleMem |
| michael@0 | 5164 | + }; |
| michael@0 | 5165 | + struct Expr { |
| michael@0 | 5166 | + // Construct a simple-form expression |
| michael@0 | 5167 | + Expr(string ident, long offset, bool deref) { |
| michael@0 | 5168 | + if (ident.empty()) { |
| michael@0 | 5169 | + Expr(); |
| michael@0 | 5170 | + } else { |
| michael@0 | 5171 | + postfix_ = ""; |
| michael@0 | 5172 | + ident_ = ident; |
| michael@0 | 5173 | + offset_ = offset; |
| michael@0 | 5174 | + how_ = deref ? kExprSimpleMem : kExprSimple; |
| michael@0 | 5175 | + } |
| michael@0 | 5176 | + } |
| michael@0 | 5177 | + // Construct an expression from a postfix string |
| michael@0 | 5178 | + Expr(string postfix) { |
| michael@0 | 5179 | + if (postfix.empty()) { |
| michael@0 | 5180 | + Expr(); |
| michael@0 | 5181 | + } else { |
| michael@0 | 5182 | + postfix_ = postfix; |
| michael@0 | 5183 | + ident_ = ""; |
| michael@0 | 5184 | + offset_ = 0; |
| michael@0 | 5185 | + how_ = kExprPostfix; |
| michael@0 | 5186 | + } |
| michael@0 | 5187 | + } |
| michael@0 | 5188 | + // Construct an invalid expression |
| michael@0 | 5189 | + Expr() { |
| michael@0 | 5190 | + postfix_ = ""; |
| michael@0 | 5191 | + ident_ = ""; |
| michael@0 | 5192 | + offset_ = 0; |
| michael@0 | 5193 | + how_ = kExprInvalid; |
| michael@0 | 5194 | + } |
| michael@0 | 5195 | + bool invalid() const { return how_ == kExprInvalid; } |
| michael@0 | 5196 | + bool operator==(const Expr& other) const { |
| michael@0 | 5197 | + return how_ == other.how_ && |
| michael@0 | 5198 | + ident_ == other.ident_ && |
| michael@0 | 5199 | + offset_ == other.offset_ && |
| michael@0 | 5200 | + postfix_ == other.postfix_; |
| michael@0 | 5201 | + } |
| michael@0 | 5202 | + |
| michael@0 | 5203 | + // The identifier that gives the starting value for simple expressions. |
| michael@0 | 5204 | + string ident_; |
| michael@0 | 5205 | + // The offset to add for simple expressions. |
| michael@0 | 5206 | + long offset_; |
| michael@0 | 5207 | + // The Postfix expression string to evaluate for non-simple expressions. |
| michael@0 | 5208 | + string postfix_; |
| michael@0 | 5209 | + // The operation expressed by this expression. |
| michael@0 | 5210 | + ExprHow how_; |
| michael@0 | 5211 | + |
| michael@0 | 5212 | + friend std::ostream& operator<<(std::ostream& stream, const Expr& expr); |
| michael@0 | 5213 | + }; |
| michael@0 | 5214 | + |
| michael@0 | 5215 | + // A map from register names to expressions that recover |
| michael@0 | 5216 | + // their values. This can represent a complete set of rules to |
| michael@0 | 5217 | // follow at some address, or a set of changes to be applied to an |
| michael@0 | 5218 | // extant set of rules. |
| michael@0 | 5219 | - typedef map<string, string> RuleMap; |
| michael@0 | 5220 | + typedef map<string, Expr> RuleMap; |
| michael@0 | 5221 | |
| michael@0 | 5222 | // A map from addresses to RuleMaps, representing changes that take |
| michael@0 | 5223 | // effect at given addresses. |
| michael@0 | 5224 | typedef map<Address, RuleMap> RuleChangeMap; |
| michael@0 | 5225 | |
| michael@0 | 5226 | // A range of 'STACK CFI' stack walking information. An instance of |
| michael@0 | 5227 | // this structure corresponds to a 'STACK CFI INIT' record and the |
| michael@0 | 5228 | // subsequent 'STACK CFI' records that fall within its range. |
| michael@0 | 5229 | diff --git a/src/common/module_unittest.cc b/src/common/module_unittest.cc |
| michael@0 | 5230 | --- a/src/common/module_unittest.cc |
| michael@0 | 5231 | +++ b/src/common/module_unittest.cc |
| michael@0 | 5232 | @@ -125,21 +125,21 @@ |
| michael@0 | 5233 | function->lines.push_back(line1); |
| michael@0 | 5234 | |
| michael@0 | 5235 | m.AddFunction(function); |
| michael@0 | 5236 | |
| michael@0 | 5237 | // Some stack information. |
| michael@0 | 5238 | Module::StackFrameEntry *entry = new Module::StackFrameEntry(); |
| michael@0 | 5239 | entry->address = 0x30f9e5c83323973dULL; |
| michael@0 | 5240 | entry->size = 0x49fc9ca7c7c13dc2ULL; |
| michael@0 | 5241 | - entry->initial_rules[".cfa"] = "he was a handsome man"; |
| michael@0 | 5242 | - entry->initial_rules["and"] = "what i want to know is"; |
| michael@0 | 5243 | + entry->initial_rules[".cfa"] = Module::Expr("he was a handsome man"); |
| michael@0 | 5244 | + entry->initial_rules["and"] = Module::Expr("what i want to know is"); |
| michael@0 | 5245 | entry->rule_changes[0x30f9e5c83323973eULL]["how"] = |
| michael@0 | 5246 | - "do you like your blueeyed boy"; |
| michael@0 | 5247 | - entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = "Death"; |
| michael@0 | 5248 | + Module::Expr("do you like your blueeyed boy"); |
| michael@0 | 5249 | + entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = Module::Expr("Death"); |
| michael@0 | 5250 | m.AddStackFrameEntry(entry); |
| michael@0 | 5251 | |
| michael@0 | 5252 | // Set the load address. Doing this after adding all the data to |
| michael@0 | 5253 | // the module must work fine. |
| michael@0 | 5254 | m.SetLoadAddress(0x2ab698b0b6407073LL); |
| michael@0 | 5255 | |
| michael@0 | 5256 | m.Write(s, ALL_SYMBOL_DATA); |
| michael@0 | 5257 | string contents = s.str(); |
| michael@0 | 5258 | @@ -229,21 +229,21 @@ |
| michael@0 | 5259 | function->lines.push_back(line1); |
| michael@0 | 5260 | |
| michael@0 | 5261 | m.AddFunction(function); |
| michael@0 | 5262 | |
| michael@0 | 5263 | // Some stack information. |
| michael@0 | 5264 | Module::StackFrameEntry *entry = new Module::StackFrameEntry(); |
| michael@0 | 5265 | entry->address = 0x30f9e5c83323973dULL; |
| michael@0 | 5266 | entry->size = 0x49fc9ca7c7c13dc2ULL; |
| michael@0 | 5267 | - entry->initial_rules[".cfa"] = "he was a handsome man"; |
| michael@0 | 5268 | - entry->initial_rules["and"] = "what i want to know is"; |
| michael@0 | 5269 | + entry->initial_rules[".cfa"] = Module::Expr("he was a handsome man"); |
| michael@0 | 5270 | + entry->initial_rules["and"] = Module::Expr("what i want to know is"); |
| michael@0 | 5271 | entry->rule_changes[0x30f9e5c83323973eULL]["how"] = |
| michael@0 | 5272 | - "do you like your blueeyed boy"; |
| michael@0 | 5273 | - entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = "Death"; |
| michael@0 | 5274 | + Module::Expr("do you like your blueeyed boy"); |
| michael@0 | 5275 | + entry->rule_changes[0x30f9e5c83323973eULL]["Mister"] = Module::Expr("Death"); |
| michael@0 | 5276 | m.AddStackFrameEntry(entry); |
| michael@0 | 5277 | |
| michael@0 | 5278 | // Set the load address. Doing this after adding all the data to |
| michael@0 | 5279 | // the module must work fine. |
| michael@0 | 5280 | m.SetLoadAddress(0x2ab698b0b6407073LL); |
| michael@0 | 5281 | |
| michael@0 | 5282 | m.Write(s, NO_CFI); |
| michael@0 | 5283 | string contents = s.str(); |
| michael@0 | 5284 | @@ -305,34 +305,34 @@ |
| michael@0 | 5285 | entry1->address = 0xddb5f41285aa7757ULL; |
| michael@0 | 5286 | entry1->size = 0x1486493370dc5073ULL; |
| michael@0 | 5287 | m.AddStackFrameEntry(entry1); |
| michael@0 | 5288 | |
| michael@0 | 5289 | // Second STACK CFI entry, with initial rules but no deltas. |
| michael@0 | 5290 | Module::StackFrameEntry *entry2 = new Module::StackFrameEntry(); |
| michael@0 | 5291 | entry2->address = 0x8064f3af5e067e38ULL; |
| michael@0 | 5292 | entry2->size = 0x0de2a5ee55509407ULL; |
| michael@0 | 5293 | - entry2->initial_rules[".cfa"] = "I think that I shall never see"; |
| michael@0 | 5294 | - entry2->initial_rules["stromboli"] = "a poem lovely as a tree"; |
| michael@0 | 5295 | - entry2->initial_rules["cannoli"] = "a tree whose hungry mouth is prest"; |
| michael@0 | 5296 | + entry2->initial_rules[".cfa"] = Module::Expr("I think that I shall never see"); |
| michael@0 | 5297 | + entry2->initial_rules["stromboli"] = Module::Expr("a poem lovely as a tree"); |
| michael@0 | 5298 | + entry2->initial_rules["cannoli"] = Module::Expr("a tree whose hungry mouth is prest"); |
| michael@0 | 5299 | m.AddStackFrameEntry(entry2); |
| michael@0 | 5300 | |
| michael@0 | 5301 | // Third STACK CFI entry, with initial rules and deltas. |
| michael@0 | 5302 | Module::StackFrameEntry *entry3 = new Module::StackFrameEntry(); |
| michael@0 | 5303 | entry3->address = 0x5e8d0db0a7075c6cULL; |
| michael@0 | 5304 | entry3->size = 0x1c7edb12a7aea229ULL; |
| michael@0 | 5305 | - entry3->initial_rules[".cfa"] = "Whose woods are these"; |
| michael@0 | 5306 | + entry3->initial_rules[".cfa"] = Module::Expr("Whose woods are these"); |
| michael@0 | 5307 | entry3->rule_changes[0x47ceb0f63c269d7fULL]["calzone"] = |
| michael@0 | 5308 | - "the village though"; |
| michael@0 | 5309 | + Module::Expr("the village though"); |
| michael@0 | 5310 | entry3->rule_changes[0x47ceb0f63c269d7fULL]["cannoli"] = |
| michael@0 | 5311 | - "he will not see me stopping here"; |
| michael@0 | 5312 | + Module::Expr("he will not see me stopping here"); |
| michael@0 | 5313 | entry3->rule_changes[0x36682fad3763ffffULL]["stromboli"] = |
| michael@0 | 5314 | - "his house is in"; |
| michael@0 | 5315 | + Module::Expr("his house is in"); |
| michael@0 | 5316 | entry3->rule_changes[0x36682fad3763ffffULL][".cfa"] = |
| michael@0 | 5317 | - "I think I know"; |
| michael@0 | 5318 | + Module::Expr("I think I know"); |
| michael@0 | 5319 | m.AddStackFrameEntry(entry3); |
| michael@0 | 5320 | |
| michael@0 | 5321 | // Check that Write writes STACK CFI records properly. |
| michael@0 | 5322 | m.Write(s, ALL_SYMBOL_DATA); |
| michael@0 | 5323 | string contents = s.str(); |
| michael@0 | 5324 | EXPECT_STREQ("MODULE os-name architecture id-string name with spaces\n" |
| michael@0 | 5325 | "STACK CFI INIT 5e8d0db0a7075c6c 1c7edb12a7aea229" |
| michael@0 | 5326 | " .cfa: Whose woods are these\n" |
| michael@0 | 5327 | @@ -352,33 +352,33 @@ |
| michael@0 | 5328 | // Check that GetStackFrameEntries works. |
| michael@0 | 5329 | vector<Module::StackFrameEntry *> entries; |
| michael@0 | 5330 | m.GetStackFrameEntries(&entries); |
| michael@0 | 5331 | ASSERT_EQ(3U, entries.size()); |
| michael@0 | 5332 | // Check first entry. |
| michael@0 | 5333 | EXPECT_EQ(0x5e8d0db0a7075c6cULL, entries[0]->address); |
| michael@0 | 5334 | EXPECT_EQ(0x1c7edb12a7aea229ULL, entries[0]->size); |
| michael@0 | 5335 | Module::RuleMap entry1_initial; |
| michael@0 | 5336 | - entry1_initial[".cfa"] = "Whose woods are these"; |
| michael@0 | 5337 | + entry1_initial[".cfa"] = Module::Expr("Whose woods are these"); |
| michael@0 | 5338 | EXPECT_THAT(entries[0]->initial_rules, ContainerEq(entry1_initial)); |
| michael@0 | 5339 | Module::RuleChangeMap entry1_changes; |
| michael@0 | 5340 | - entry1_changes[0x36682fad3763ffffULL][".cfa"] = "I think I know"; |
| michael@0 | 5341 | - entry1_changes[0x36682fad3763ffffULL]["stromboli"] = "his house is in"; |
| michael@0 | 5342 | - entry1_changes[0x47ceb0f63c269d7fULL]["calzone"] = "the village though"; |
| michael@0 | 5343 | + entry1_changes[0x36682fad3763ffffULL][".cfa"] = Module::Expr("I think I know"); |
| michael@0 | 5344 | + entry1_changes[0x36682fad3763ffffULL]["stromboli"] = Module::Expr("his house is in"); |
| michael@0 | 5345 | + entry1_changes[0x47ceb0f63c269d7fULL]["calzone"] = Module::Expr("the village though"); |
| michael@0 | 5346 | entry1_changes[0x47ceb0f63c269d7fULL]["cannoli"] = |
| michael@0 | 5347 | - "he will not see me stopping here"; |
| michael@0 | 5348 | + Module::Expr("he will not see me stopping here"); |
| michael@0 | 5349 | EXPECT_THAT(entries[0]->rule_changes, ContainerEq(entry1_changes)); |
| michael@0 | 5350 | // Check second entry. |
| michael@0 | 5351 | EXPECT_EQ(0x8064f3af5e067e38ULL, entries[1]->address); |
| michael@0 | 5352 | EXPECT_EQ(0x0de2a5ee55509407ULL, entries[1]->size); |
| michael@0 | 5353 | ASSERT_EQ(3U, entries[1]->initial_rules.size()); |
| michael@0 | 5354 | Module::RuleMap entry2_initial; |
| michael@0 | 5355 | - entry2_initial[".cfa"] = "I think that I shall never see"; |
| michael@0 | 5356 | - entry2_initial["stromboli"] = "a poem lovely as a tree"; |
| michael@0 | 5357 | - entry2_initial["cannoli"] = "a tree whose hungry mouth is prest"; |
| michael@0 | 5358 | + entry2_initial[".cfa"] = Module::Expr("I think that I shall never see"); |
| michael@0 | 5359 | + entry2_initial["stromboli"] = Module::Expr("a poem lovely as a tree"); |
| michael@0 | 5360 | + entry2_initial["cannoli"] = Module::Expr("a tree whose hungry mouth is prest"); |
| michael@0 | 5361 | EXPECT_THAT(entries[1]->initial_rules, ContainerEq(entry2_initial)); |
| michael@0 | 5362 | ASSERT_EQ(0U, entries[1]->rule_changes.size()); |
| michael@0 | 5363 | // Check third entry. |
| michael@0 | 5364 | EXPECT_EQ(0xddb5f41285aa7757ULL, entries[2]->address); |
| michael@0 | 5365 | EXPECT_EQ(0x1486493370dc5073ULL, entries[2]->size); |
| michael@0 | 5366 | ASSERT_EQ(0U, entries[2]->initial_rules.size()); |
| michael@0 | 5367 | ASSERT_EQ(0U, entries[2]->rule_changes.size()); |
| michael@0 | 5368 | } |
| michael@0 | 5369 | @@ -585,34 +585,34 @@ |
| michael@0 | 5370 | entry1->address = 0x2000; |
| michael@0 | 5371 | entry1->size = 0x900; |
| michael@0 | 5372 | m.AddStackFrameEntry(entry1); |
| michael@0 | 5373 | |
| michael@0 | 5374 | // Second STACK CFI entry, with initial rules but no deltas. |
| michael@0 | 5375 | Module::StackFrameEntry *entry2 = new Module::StackFrameEntry(); |
| michael@0 | 5376 | entry2->address = 0x3000; |
| michael@0 | 5377 | entry2->size = 0x900; |
| michael@0 | 5378 | - entry2->initial_rules[".cfa"] = "I think that I shall never see"; |
| michael@0 | 5379 | - entry2->initial_rules["stromboli"] = "a poem lovely as a tree"; |
| michael@0 | 5380 | - entry2->initial_rules["cannoli"] = "a tree whose hungry mouth is prest"; |
| michael@0 | 5381 | + entry2->initial_rules[".cfa"] = Module::Expr("I think that I shall never see"); |
| michael@0 | 5382 | + entry2->initial_rules["stromboli"] = Module::Expr("a poem lovely as a tree"); |
| michael@0 | 5383 | + entry2->initial_rules["cannoli"] = Module::Expr("a tree whose hungry mouth is prest"); |
| michael@0 | 5384 | m.AddStackFrameEntry(entry2); |
| michael@0 | 5385 | |
| michael@0 | 5386 | // Third STACK CFI entry, with initial rules and deltas. |
| michael@0 | 5387 | Module::StackFrameEntry *entry3 = new Module::StackFrameEntry(); |
| michael@0 | 5388 | entry3->address = 0x1000; |
| michael@0 | 5389 | entry3->size = 0x900; |
| michael@0 | 5390 | - entry3->initial_rules[".cfa"] = "Whose woods are these"; |
| michael@0 | 5391 | + entry3->initial_rules[".cfa"] = Module::Expr("Whose woods are these"); |
| michael@0 | 5392 | entry3->rule_changes[0x47ceb0f63c269d7fULL]["calzone"] = |
| michael@0 | 5393 | - "the village though"; |
| michael@0 | 5394 | + Module::Expr("the village though"); |
| michael@0 | 5395 | entry3->rule_changes[0x47ceb0f63c269d7fULL]["cannoli"] = |
| michael@0 | 5396 | - "he will not see me stopping here"; |
| michael@0 | 5397 | + Module::Expr("he will not see me stopping here"); |
| michael@0 | 5398 | entry3->rule_changes[0x36682fad3763ffffULL]["stromboli"] = |
| michael@0 | 5399 | - "his house is in"; |
| michael@0 | 5400 | + Module::Expr("his house is in"); |
| michael@0 | 5401 | entry3->rule_changes[0x36682fad3763ffffULL][".cfa"] = |
| michael@0 | 5402 | - "I think I know"; |
| michael@0 | 5403 | + Module::Expr("I think I know"); |
| michael@0 | 5404 | m.AddStackFrameEntry(entry3); |
| michael@0 | 5405 | |
| michael@0 | 5406 | Module::StackFrameEntry* s = m.FindStackFrameEntryByAddress(0x1000); |
| michael@0 | 5407 | EXPECT_EQ(entry3, s); |
| michael@0 | 5408 | s = m.FindStackFrameEntryByAddress(0x18FF); |
| michael@0 | 5409 | EXPECT_EQ(entry3, s); |
| michael@0 | 5410 | |
| michael@0 | 5411 | s = m.FindStackFrameEntryByAddress(0x1900); |
| michael@0 | 5412 | diff --git a/src/processor/cfi_frame_info.cc b/src/processor/cfi_frame_info.cc |
| michael@0 | 5413 | --- a/src/processor/cfi_frame_info.cc |
| michael@0 | 5414 | +++ b/src/processor/cfi_frame_info.cc |
| michael@0 | 5415 | @@ -48,17 +48,17 @@ |
| michael@0 | 5416 | #endif |
| michael@0 | 5417 | |
| michael@0 | 5418 | template<typename V> |
| michael@0 | 5419 | bool CFIFrameInfo::FindCallerRegs(const RegisterValueMap<V> ®isters, |
| michael@0 | 5420 | const MemoryRegion &memory, |
| michael@0 | 5421 | RegisterValueMap<V> *caller_registers) const { |
| michael@0 | 5422 | // If there are not rules for both .ra and .cfa in effect at this address, |
| michael@0 | 5423 | // don't use this CFI data for stack walking. |
| michael@0 | 5424 | - if (cfa_rule_.empty() || ra_rule_.empty()) |
| michael@0 | 5425 | + if (cfa_rule_.invalid() || ra_rule_.invalid()) |
| michael@0 | 5426 | return false; |
| michael@0 | 5427 | |
| michael@0 | 5428 | RegisterValueMap<V> working; |
| michael@0 | 5429 | PostfixEvaluator<V> evaluator(&working, &memory); |
| michael@0 | 5430 | |
| michael@0 | 5431 | caller_registers->clear(); |
| michael@0 | 5432 | |
| michael@0 | 5433 | // First, compute the CFA. |
| michael@0 | 5434 | @@ -99,20 +99,20 @@ |
| michael@0 | 5435 | template bool CFIFrameInfo::FindCallerRegs<uint64_t>( |
| michael@0 | 5436 | const RegisterValueMap<uint64_t> ®isters, |
| michael@0 | 5437 | const MemoryRegion &memory, |
| michael@0 | 5438 | RegisterValueMap<uint64_t> *caller_registers) const; |
| michael@0 | 5439 | |
| michael@0 | 5440 | string CFIFrameInfo::Serialize() const { |
| michael@0 | 5441 | std::ostringstream stream; |
| michael@0 | 5442 | |
| michael@0 | 5443 | - if (!cfa_rule_.empty()) { |
| michael@0 | 5444 | + if (!cfa_rule_.invalid()) { |
| michael@0 | 5445 | stream << ".cfa: " << cfa_rule_; |
| michael@0 | 5446 | } |
| michael@0 | 5447 | - if (!ra_rule_.empty()) { |
| michael@0 | 5448 | + if (!ra_rule_.invalid()) { |
| michael@0 | 5449 | if (static_cast<std::streamoff>(stream.tellp()) != 0) |
| michael@0 | 5450 | stream << " "; |
| michael@0 | 5451 | stream << ".ra: " << ra_rule_; |
| michael@0 | 5452 | } |
| michael@0 | 5453 | for (RuleMap::const_iterator iter = register_rules_.begin(); |
| michael@0 | 5454 | iter != register_rules_.end(); |
| michael@0 | 5455 | ++iter) { |
| michael@0 | 5456 | if (static_cast<std::streamoff>(stream.tellp()) != 0) |
| michael@0 | 5457 | @@ -166,21 +166,22 @@ |
| michael@0 | 5458 | if (name_.empty() || expression_.empty()) return false; |
| michael@0 | 5459 | if (name_ == ".cfa") handler_->CFARule(expression_); |
| michael@0 | 5460 | else if (name_ == ".ra") handler_->RARule(expression_); |
| michael@0 | 5461 | else handler_->RegisterRule(name_, expression_); |
| michael@0 | 5462 | return true; |
| michael@0 | 5463 | } |
| michael@0 | 5464 | |
| michael@0 | 5465 | void CFIFrameInfoParseHandler::CFARule(const string &expression) { |
| michael@0 | 5466 | - frame_info_->SetCFARule(expression); |
| michael@0 | 5467 | + // 'expression' is a postfix expression string. |
| michael@0 | 5468 | + frame_info_->SetCFARule(Module::Expr(expression)); |
| michael@0 | 5469 | } |
| michael@0 | 5470 | |
| michael@0 | 5471 | void CFIFrameInfoParseHandler::RARule(const string &expression) { |
| michael@0 | 5472 | - frame_info_->SetRARule(expression); |
| michael@0 | 5473 | + frame_info_->SetRARule(Module::Expr(expression)); |
| michael@0 | 5474 | } |
| michael@0 | 5475 | |
| michael@0 | 5476 | void CFIFrameInfoParseHandler::RegisterRule(const string &name, |
| michael@0 | 5477 | const string &expression) { |
| michael@0 | 5478 | - frame_info_->SetRegisterRule(name, expression); |
| michael@0 | 5479 | + frame_info_->SetRegisterRule(name, Module::Expr(expression)); |
| michael@0 | 5480 | } |
| michael@0 | 5481 | |
| michael@0 | 5482 | } // namespace google_breakpad |
| michael@0 | 5483 | diff --git a/src/processor/cfi_frame_info.h b/src/processor/cfi_frame_info.h |
| michael@0 | 5484 | --- a/src/processor/cfi_frame_info.h |
| michael@0 | 5485 | +++ b/src/processor/cfi_frame_info.h |
| michael@0 | 5486 | @@ -38,16 +38,17 @@ |
| michael@0 | 5487 | #ifndef PROCESSOR_CFI_FRAME_INFO_H_ |
| michael@0 | 5488 | #define PROCESSOR_CFI_FRAME_INFO_H_ |
| michael@0 | 5489 | |
| michael@0 | 5490 | #include <map> |
| michael@0 | 5491 | #include <string> |
| michael@0 | 5492 | |
| michael@0 | 5493 | #include "common/using_std_string.h" |
| michael@0 | 5494 | #include "google_breakpad/common/breakpad_types.h" |
| michael@0 | 5495 | +#include "common/module.h" |
| michael@0 | 5496 | |
| michael@0 | 5497 | namespace google_breakpad { |
| michael@0 | 5498 | |
| michael@0 | 5499 | using std::map; |
| michael@0 | 5500 | |
| michael@0 | 5501 | class MemoryRegion; |
| michael@0 | 5502 | |
| michael@0 | 5503 | // A set of rules for recovering the calling frame's registers' |
| michael@0 | 5504 | @@ -61,26 +62,27 @@ |
| michael@0 | 5505 | // INIT' record that covers that instruction, and then apply the |
| michael@0 | 5506 | // changes given by the 'STACK CFI' records up to our instruction's |
| michael@0 | 5507 | // address. Then, use the FindCallerRegs member function to apply the |
| michael@0 | 5508 | // rules to the callee frame's register values, yielding the caller |
| michael@0 | 5509 | // frame's register values. |
| michael@0 | 5510 | class CFIFrameInfo { |
| michael@0 | 5511 | public: |
| michael@0 | 5512 | // A map from register names onto values. |
| michael@0 | 5513 | - template<typename ValueType> class RegisterValueMap: |
| michael@0 | 5514 | + template<typename ValueType> class RegisterValueMap: |
| michael@0 | 5515 | public map<string, ValueType> { }; |
| michael@0 | 5516 | |
| michael@0 | 5517 | // Set the expression for computing a call frame address, return |
| michael@0 | 5518 | // address, or register's value. At least the CFA rule and the RA |
| michael@0 | 5519 | // rule must be set before calling FindCallerRegs. |
| michael@0 | 5520 | - void SetCFARule(const string &expression) { cfa_rule_ = expression; } |
| michael@0 | 5521 | - void SetRARule(const string &expression) { ra_rule_ = expression; } |
| michael@0 | 5522 | - void SetRegisterRule(const string ®ister_name, const string &expression) { |
| michael@0 | 5523 | - register_rules_[register_name] = expression; |
| michael@0 | 5524 | + void SetCFARule(const Module::Expr& rule) { cfa_rule_ = rule; } |
| michael@0 | 5525 | + void SetRARule(const Module::Expr& rule) { ra_rule_ = rule; } |
| michael@0 | 5526 | + void SetRegisterRule(const string& register_name, |
| michael@0 | 5527 | + const Module::Expr& rule) { |
| michael@0 | 5528 | + register_rules_[register_name] = rule; |
| michael@0 | 5529 | } |
| michael@0 | 5530 | |
| michael@0 | 5531 | // Compute the values of the calling frame's registers, according to |
| michael@0 | 5532 | // this rule set. Use ValueType in expression evaluation; this |
| michael@0 | 5533 | // should be uint32_t on machines with 32-bit addresses, or |
| michael@0 | 5534 | // uint64_t on machines with 64-bit addresses. |
| michael@0 | 5535 | // |
| michael@0 | 5536 | // Return true on success, false otherwise. |
| michael@0 | 5537 | @@ -101,37 +103,33 @@ |
| michael@0 | 5538 | RegisterValueMap<ValueType> *caller_registers) const; |
| michael@0 | 5539 | |
| michael@0 | 5540 | // Serialize the rules in this object into a string in the format |
| michael@0 | 5541 | // of STACK CFI records. |
| michael@0 | 5542 | string Serialize() const; |
| michael@0 | 5543 | |
| michael@0 | 5544 | private: |
| michael@0 | 5545 | |
| michael@0 | 5546 | - // A map from register names onto evaluation rules. |
| michael@0 | 5547 | - typedef map<string, string> RuleMap; |
| michael@0 | 5548 | + // A map from register names onto evaluation rules. |
| michael@0 | 5549 | + typedef map<string, Module::Expr> RuleMap; |
| michael@0 | 5550 | |
| michael@0 | 5551 | - // In this type, a "postfix expression" is an expression of the sort |
| michael@0 | 5552 | - // interpreted by google_breakpad::PostfixEvaluator. |
| michael@0 | 5553 | - |
| michael@0 | 5554 | - // A postfix expression for computing the current frame's CFA (call |
| michael@0 | 5555 | + // An expression for computing the current frame's CFA (call |
| michael@0 | 5556 | // frame address). The CFA is a reference address for the frame that |
| michael@0 | 5557 | // remains unchanged throughout the frame's lifetime. You should |
| michael@0 | 5558 | // evaluate this expression with a dictionary initially populated |
| michael@0 | 5559 | // with the values of the current frame's known registers. |
| michael@0 | 5560 | - string cfa_rule_; |
| michael@0 | 5561 | + Module::Expr cfa_rule_; |
| michael@0 | 5562 | |
| michael@0 | 5563 | // The following expressions should be evaluated with a dictionary |
| michael@0 | 5564 | // initially populated with the values of the current frame's known |
| michael@0 | 5565 | // registers, and with ".cfa" set to the result of evaluating the |
| michael@0 | 5566 | // cfa_rule expression, above. |
| michael@0 | 5567 | |
| michael@0 | 5568 | - // A postfix expression for computing the current frame's return |
| michael@0 | 5569 | - // address. |
| michael@0 | 5570 | - string ra_rule_; |
| michael@0 | 5571 | + // An expression for computing the current frame's return address. |
| michael@0 | 5572 | + Module::Expr ra_rule_; |
| michael@0 | 5573 | |
| michael@0 | 5574 | // For a register named REG, rules[REG] is a postfix expression |
| michael@0 | 5575 | // which leaves the value of REG in the calling frame on the top of |
| michael@0 | 5576 | // the stack. You should evaluate this expression |
| michael@0 | 5577 | RuleMap register_rules_; |
| michael@0 | 5578 | }; |
| michael@0 | 5579 | |
| michael@0 | 5580 | // A parser for STACK CFI-style rule sets. |
| michael@0 | 5581 | diff --git a/src/processor/cfi_frame_info_unittest.cc b/src/processor/cfi_frame_info_unittest.cc |
| michael@0 | 5582 | --- a/src/processor/cfi_frame_info_unittest.cc |
| michael@0 | 5583 | +++ b/src/processor/cfi_frame_info_unittest.cc |
| michael@0 | 5584 | @@ -30,24 +30,26 @@ |
| michael@0 | 5585 | // Original author: Jim Blandy <jimb@mozilla.com> <jimb@red-bean.com> |
| michael@0 | 5586 | |
| michael@0 | 5587 | // cfi_frame_info_unittest.cc: Unit tests for CFIFrameInfo, |
| michael@0 | 5588 | // CFIRuleParser, CFIFrameInfoParseHandler, and SimpleCFIWalker. |
| michael@0 | 5589 | |
| michael@0 | 5590 | #include <string.h> |
| michael@0 | 5591 | |
| michael@0 | 5592 | #include "breakpad_googletest_includes.h" |
| michael@0 | 5593 | +#include "common/module.h" |
| michael@0 | 5594 | #include "common/using_std_string.h" |
| michael@0 | 5595 | #include "processor/cfi_frame_info.h" |
| michael@0 | 5596 | #include "google_breakpad/processor/memory_region.h" |
| michael@0 | 5597 | |
| michael@0 | 5598 | using google_breakpad::CFIFrameInfo; |
| michael@0 | 5599 | using google_breakpad::CFIFrameInfoParseHandler; |
| michael@0 | 5600 | using google_breakpad::CFIRuleParser; |
| michael@0 | 5601 | using google_breakpad::MemoryRegion; |
| michael@0 | 5602 | +using google_breakpad::Module; |
| michael@0 | 5603 | using google_breakpad::SimpleCFIWalker; |
| michael@0 | 5604 | using testing::_; |
| michael@0 | 5605 | using testing::A; |
| michael@0 | 5606 | using testing::AtMost; |
| michael@0 | 5607 | using testing::DoAll; |
| michael@0 | 5608 | using testing::Return; |
| michael@0 | 5609 | using testing::SetArgumentPointee; |
| michael@0 | 5610 | using testing::Test; |
| michael@0 | 5611 | @@ -81,56 +83,56 @@ |
| michael@0 | 5612 | }; |
| michael@0 | 5613 | |
| michael@0 | 5614 | class Simple: public CFIFixture, public Test { }; |
| michael@0 | 5615 | |
| michael@0 | 5616 | // FindCallerRegs should fail if no .cfa rule is provided. |
| michael@0 | 5617 | TEST_F(Simple, NoCFA) { |
| michael@0 | 5618 | ExpectNoMemoryReferences(); |
| michael@0 | 5619 | |
| michael@0 | 5620 | - cfi.SetRARule("0"); |
| michael@0 | 5621 | + cfi.SetRARule(Module::Expr("0")); |
| michael@0 | 5622 | ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory, |
| michael@0 | 5623 | &caller_registers)); |
| michael@0 | 5624 | ASSERT_EQ(".ra: 0", cfi.Serialize()); |
| michael@0 | 5625 | } |
| michael@0 | 5626 | |
| michael@0 | 5627 | // FindCallerRegs should fail if no .ra rule is provided. |
| michael@0 | 5628 | TEST_F(Simple, NoRA) { |
| michael@0 | 5629 | ExpectNoMemoryReferences(); |
| michael@0 | 5630 | |
| michael@0 | 5631 | - cfi.SetCFARule("0"); |
| michael@0 | 5632 | + cfi.SetCFARule(Module::Expr("0")); |
| michael@0 | 5633 | ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory, |
| michael@0 | 5634 | &caller_registers)); |
| michael@0 | 5635 | ASSERT_EQ(".cfa: 0", cfi.Serialize()); |
| michael@0 | 5636 | } |
| michael@0 | 5637 | |
| michael@0 | 5638 | TEST_F(Simple, SetCFAAndRARule) { |
| michael@0 | 5639 | ExpectNoMemoryReferences(); |
| michael@0 | 5640 | |
| michael@0 | 5641 | - cfi.SetCFARule("330903416631436410"); |
| michael@0 | 5642 | - cfi.SetRARule("5870666104170902211"); |
| michael@0 | 5643 | + cfi.SetCFARule(Module::Expr("330903416631436410")); |
| michael@0 | 5644 | + cfi.SetRARule(Module::Expr("5870666104170902211")); |
| michael@0 | 5645 | ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory, |
| michael@0 | 5646 | &caller_registers)); |
| michael@0 | 5647 | ASSERT_EQ(2U, caller_registers.size()); |
| michael@0 | 5648 | ASSERT_EQ(330903416631436410ULL, caller_registers[".cfa"]); |
| michael@0 | 5649 | ASSERT_EQ(5870666104170902211ULL, caller_registers[".ra"]); |
| michael@0 | 5650 | |
| michael@0 | 5651 | ASSERT_EQ(".cfa: 330903416631436410 .ra: 5870666104170902211", |
| michael@0 | 5652 | cfi.Serialize()); |
| michael@0 | 5653 | } |
| michael@0 | 5654 | |
| michael@0 | 5655 | TEST_F(Simple, SetManyRules) { |
| michael@0 | 5656 | ExpectNoMemoryReferences(); |
| michael@0 | 5657 | |
| michael@0 | 5658 | - cfi.SetCFARule("$temp1 68737028 = $temp2 61072337 = $temp1 $temp2 -"); |
| michael@0 | 5659 | - cfi.SetRARule(".cfa 99804755 +"); |
| michael@0 | 5660 | - cfi.SetRegisterRule("register1", ".cfa 54370437 *"); |
| michael@0 | 5661 | - cfi.SetRegisterRule("vodkathumbscrewingly", "24076308 .cfa +"); |
| michael@0 | 5662 | - cfi.SetRegisterRule("pubvexingfjordschmaltzy", ".cfa 29801007 -"); |
| michael@0 | 5663 | - cfi.SetRegisterRule("uncopyrightables", "92642917 .cfa /"); |
| michael@0 | 5664 | + cfi.SetCFARule(Module::Expr("$temp1 68737028 = $temp2 61072337 = $temp1 $temp2 -")); |
| michael@0 | 5665 | + cfi.SetRARule(Module::Expr(".cfa 99804755 +")); |
| michael@0 | 5666 | + cfi.SetRegisterRule("register1", Module::Expr(".cfa 54370437 *")); |
| michael@0 | 5667 | + cfi.SetRegisterRule("vodkathumbscrewingly", Module::Expr("24076308 .cfa +")); |
| michael@0 | 5668 | + cfi.SetRegisterRule("pubvexingfjordschmaltzy", Module::Expr(".cfa 29801007 -")); |
| michael@0 | 5669 | + cfi.SetRegisterRule("uncopyrightables", Module::Expr("92642917 .cfa /")); |
| michael@0 | 5670 | ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory, |
| michael@0 | 5671 | &caller_registers)); |
| michael@0 | 5672 | ASSERT_EQ(6U, caller_registers.size()); |
| michael@0 | 5673 | ASSERT_EQ(7664691U, caller_registers[".cfa"]); |
| michael@0 | 5674 | ASSERT_EQ(107469446U, caller_registers[".ra"]); |
| michael@0 | 5675 | ASSERT_EQ(416732599139967ULL, caller_registers["register1"]); |
| michael@0 | 5676 | ASSERT_EQ(31740999U, caller_registers["vodkathumbscrewingly"]); |
| michael@0 | 5677 | ASSERT_EQ(-22136316ULL, caller_registers["pubvexingfjordschmaltzy"]); |
| michael@0 | 5678 | @@ -142,154 +144,154 @@ |
| michael@0 | 5679 | "uncopyrightables: 92642917 .cfa / " |
| michael@0 | 5680 | "vodkathumbscrewingly: 24076308 .cfa +", |
| michael@0 | 5681 | cfi.Serialize()); |
| michael@0 | 5682 | } |
| michael@0 | 5683 | |
| michael@0 | 5684 | TEST_F(Simple, RulesOverride) { |
| michael@0 | 5685 | ExpectNoMemoryReferences(); |
| michael@0 | 5686 | |
| michael@0 | 5687 | - cfi.SetCFARule("330903416631436410"); |
| michael@0 | 5688 | - cfi.SetRARule("5870666104170902211"); |
| michael@0 | 5689 | - cfi.SetCFARule("2828089117179001"); |
| michael@0 | 5690 | + cfi.SetCFARule(Module::Expr("330903416631436410")); |
| michael@0 | 5691 | + cfi.SetRARule(Module::Expr("5870666104170902211")); |
| michael@0 | 5692 | + cfi.SetCFARule(Module::Expr("2828089117179001")); |
| michael@0 | 5693 | ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory, |
| michael@0 | 5694 | &caller_registers)); |
| michael@0 | 5695 | ASSERT_EQ(2U, caller_registers.size()); |
| michael@0 | 5696 | ASSERT_EQ(2828089117179001ULL, caller_registers[".cfa"]); |
| michael@0 | 5697 | ASSERT_EQ(5870666104170902211ULL, caller_registers[".ra"]); |
| michael@0 | 5698 | ASSERT_EQ(".cfa: 2828089117179001 .ra: 5870666104170902211", |
| michael@0 | 5699 | cfi.Serialize()); |
| michael@0 | 5700 | } |
| michael@0 | 5701 | |
| michael@0 | 5702 | class Scope: public CFIFixture, public Test { }; |
| michael@0 | 5703 | |
| michael@0 | 5704 | // There should be no value for .cfa in scope when evaluating the CFA rule. |
| michael@0 | 5705 | TEST_F(Scope, CFALacksCFA) { |
| michael@0 | 5706 | ExpectNoMemoryReferences(); |
| michael@0 | 5707 | |
| michael@0 | 5708 | - cfi.SetCFARule(".cfa"); |
| michael@0 | 5709 | - cfi.SetRARule("0"); |
| michael@0 | 5710 | + cfi.SetCFARule(Module::Expr(".cfa")); |
| michael@0 | 5711 | + cfi.SetRARule(Module::Expr("0")); |
| michael@0 | 5712 | ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory, |
| michael@0 | 5713 | &caller_registers)); |
| michael@0 | 5714 | } |
| michael@0 | 5715 | |
| michael@0 | 5716 | // There should be no value for .ra in scope when evaluating the CFA rule. |
| michael@0 | 5717 | TEST_F(Scope, CFALacksRA) { |
| michael@0 | 5718 | ExpectNoMemoryReferences(); |
| michael@0 | 5719 | |
| michael@0 | 5720 | - cfi.SetCFARule(".ra"); |
| michael@0 | 5721 | - cfi.SetRARule("0"); |
| michael@0 | 5722 | + cfi.SetCFARule(Module::Expr(".ra")); |
| michael@0 | 5723 | + cfi.SetRARule(Module::Expr("0")); |
| michael@0 | 5724 | ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory, |
| michael@0 | 5725 | &caller_registers)); |
| michael@0 | 5726 | } |
| michael@0 | 5727 | |
| michael@0 | 5728 | // The current frame's registers should be in scope when evaluating |
| michael@0 | 5729 | // the CFA rule. |
| michael@0 | 5730 | TEST_F(Scope, CFASeesCurrentRegs) { |
| michael@0 | 5731 | ExpectNoMemoryReferences(); |
| michael@0 | 5732 | |
| michael@0 | 5733 | registers[".baraminology"] = 0x06a7bc63e4f13893ULL; |
| michael@0 | 5734 | registers[".ornithorhynchus"] = 0x5e0bf850bafce9d2ULL; |
| michael@0 | 5735 | - cfi.SetCFARule(".baraminology .ornithorhynchus +"); |
| michael@0 | 5736 | - cfi.SetRARule("0"); |
| michael@0 | 5737 | + cfi.SetCFARule(Module::Expr(".baraminology .ornithorhynchus +")); |
| michael@0 | 5738 | + cfi.SetRARule(Module::Expr("0")); |
| michael@0 | 5739 | ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory, |
| michael@0 | 5740 | &caller_registers)); |
| michael@0 | 5741 | ASSERT_EQ(2U, caller_registers.size()); |
| michael@0 | 5742 | ASSERT_EQ(0x06a7bc63e4f13893ULL + 0x5e0bf850bafce9d2ULL, |
| michael@0 | 5743 | caller_registers[".cfa"]); |
| michael@0 | 5744 | } |
| michael@0 | 5745 | |
| michael@0 | 5746 | // .cfa should be in scope in the return address expression. |
| michael@0 | 5747 | TEST_F(Scope, RASeesCFA) { |
| michael@0 | 5748 | ExpectNoMemoryReferences(); |
| michael@0 | 5749 | |
| michael@0 | 5750 | - cfi.SetCFARule("48364076"); |
| michael@0 | 5751 | - cfi.SetRARule(".cfa"); |
| michael@0 | 5752 | + cfi.SetCFARule(Module::Expr("48364076")); |
| michael@0 | 5753 | + cfi.SetRARule(Module::Expr(".cfa")); |
| michael@0 | 5754 | ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory, |
| michael@0 | 5755 | &caller_registers)); |
| michael@0 | 5756 | ASSERT_EQ(2U, caller_registers.size()); |
| michael@0 | 5757 | ASSERT_EQ(48364076U, caller_registers[".ra"]); |
| michael@0 | 5758 | } |
| michael@0 | 5759 | |
| michael@0 | 5760 | // There should be no value for .ra in scope when evaluating the CFA rule. |
| michael@0 | 5761 | TEST_F(Scope, RALacksRA) { |
| michael@0 | 5762 | ExpectNoMemoryReferences(); |
| michael@0 | 5763 | |
| michael@0 | 5764 | - cfi.SetCFARule("0"); |
| michael@0 | 5765 | - cfi.SetRARule(".ra"); |
| michael@0 | 5766 | + cfi.SetCFARule(Module::Expr("0")); |
| michael@0 | 5767 | + cfi.SetRARule(Module::Expr(".ra")); |
| michael@0 | 5768 | ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory, |
| michael@0 | 5769 | &caller_registers)); |
| michael@0 | 5770 | } |
| michael@0 | 5771 | |
| michael@0 | 5772 | // The current frame's registers should be in scope in the return |
| michael@0 | 5773 | // address expression. |
| michael@0 | 5774 | TEST_F(Scope, RASeesCurrentRegs) { |
| michael@0 | 5775 | ExpectNoMemoryReferences(); |
| michael@0 | 5776 | |
| michael@0 | 5777 | registers["noachian"] = 0x54dc4a5d8e5eb503ULL; |
| michael@0 | 5778 | - cfi.SetCFARule("10359370"); |
| michael@0 | 5779 | - cfi.SetRARule("noachian"); |
| michael@0 | 5780 | + cfi.SetCFARule(Module::Expr("10359370")); |
| michael@0 | 5781 | + cfi.SetRARule(Module::Expr("noachian")); |
| michael@0 | 5782 | ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory, |
| michael@0 | 5783 | &caller_registers)); |
| michael@0 | 5784 | ASSERT_EQ(2U, caller_registers.size()); |
| michael@0 | 5785 | ASSERT_EQ(0x54dc4a5d8e5eb503ULL, caller_registers[".ra"]); |
| michael@0 | 5786 | } |
| michael@0 | 5787 | |
| michael@0 | 5788 | // .cfa should be in scope for register rules. |
| michael@0 | 5789 | TEST_F(Scope, RegistersSeeCFA) { |
| michael@0 | 5790 | ExpectNoMemoryReferences(); |
| michael@0 | 5791 | |
| michael@0 | 5792 | - cfi.SetCFARule("6515179"); |
| michael@0 | 5793 | - cfi.SetRARule(".cfa"); |
| michael@0 | 5794 | - cfi.SetRegisterRule("rogerian", ".cfa"); |
| michael@0 | 5795 | + cfi.SetCFARule(Module::Expr("6515179")); |
| michael@0 | 5796 | + cfi.SetRARule(Module::Expr(".cfa")); |
| michael@0 | 5797 | + cfi.SetRegisterRule("rogerian", Module::Expr(".cfa")); |
| michael@0 | 5798 | ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory, |
| michael@0 | 5799 | &caller_registers)); |
| michael@0 | 5800 | ASSERT_EQ(3U, caller_registers.size()); |
| michael@0 | 5801 | ASSERT_EQ(6515179U, caller_registers["rogerian"]); |
| michael@0 | 5802 | } |
| michael@0 | 5803 | |
| michael@0 | 5804 | // The return address should not be in scope for register rules. |
| michael@0 | 5805 | TEST_F(Scope, RegsLackRA) { |
| michael@0 | 5806 | ExpectNoMemoryReferences(); |
| michael@0 | 5807 | |
| michael@0 | 5808 | - cfi.SetCFARule("42740329"); |
| michael@0 | 5809 | - cfi.SetRARule("27045204"); |
| michael@0 | 5810 | - cfi.SetRegisterRule("$r1", ".ra"); |
| michael@0 | 5811 | + cfi.SetCFARule(Module::Expr("42740329")); |
| michael@0 | 5812 | + cfi.SetRARule(Module::Expr("27045204")); |
| michael@0 | 5813 | + cfi.SetRegisterRule("$r1", Module::Expr(".ra")); |
| michael@0 | 5814 | ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory, |
| michael@0 | 5815 | &caller_registers)); |
| michael@0 | 5816 | } |
| michael@0 | 5817 | |
| michael@0 | 5818 | // Register rules can see the current frame's register values. |
| michael@0 | 5819 | TEST_F(Scope, RegsSeeRegs) { |
| michael@0 | 5820 | ExpectNoMemoryReferences(); |
| michael@0 | 5821 | |
| michael@0 | 5822 | registers["$r1"] = 0x6ed3582c4bedb9adULL; |
| michael@0 | 5823 | registers["$r2"] = 0xd27d9e742b8df6d0ULL; |
| michael@0 | 5824 | - cfi.SetCFARule("88239303"); |
| michael@0 | 5825 | - cfi.SetRARule("30503835"); |
| michael@0 | 5826 | - cfi.SetRegisterRule("$r1", "$r1 42175211 = $r2"); |
| michael@0 | 5827 | - cfi.SetRegisterRule("$r2", "$r2 21357221 = $r1"); |
| michael@0 | 5828 | + cfi.SetCFARule(Module::Expr("88239303")); |
| michael@0 | 5829 | + cfi.SetRARule(Module::Expr("30503835")); |
| michael@0 | 5830 | + cfi.SetRegisterRule("$r1", Module::Expr("$r1 42175211 = $r2")); |
| michael@0 | 5831 | + cfi.SetRegisterRule("$r2", Module::Expr("$r2 21357221 = $r1")); |
| michael@0 | 5832 | ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory, |
| michael@0 | 5833 | &caller_registers)); |
| michael@0 | 5834 | ASSERT_EQ(4U, caller_registers.size()); |
| michael@0 | 5835 | ASSERT_EQ(0xd27d9e742b8df6d0ULL, caller_registers["$r1"]); |
| michael@0 | 5836 | ASSERT_EQ(0x6ed3582c4bedb9adULL, caller_registers["$r2"]); |
| michael@0 | 5837 | } |
| michael@0 | 5838 | |
| michael@0 | 5839 | // Each rule's temporaries are separate. |
| michael@0 | 5840 | TEST_F(Scope, SeparateTempsRA) { |
| michael@0 | 5841 | ExpectNoMemoryReferences(); |
| michael@0 | 5842 | |
| michael@0 | 5843 | - cfi.SetCFARule("$temp1 76569129 = $temp1"); |
| michael@0 | 5844 | - cfi.SetRARule("0"); |
| michael@0 | 5845 | + cfi.SetCFARule(Module::Expr("$temp1 76569129 = $temp1")); |
| michael@0 | 5846 | + cfi.SetRARule(Module::Expr("0")); |
| michael@0 | 5847 | ASSERT_TRUE(cfi.FindCallerRegs<uint64_t>(registers, memory, |
| michael@0 | 5848 | &caller_registers)); |
| michael@0 | 5849 | |
| michael@0 | 5850 | - cfi.SetCFARule("$temp1 76569129 = $temp1"); |
| michael@0 | 5851 | - cfi.SetRARule("$temp1"); |
| michael@0 | 5852 | + cfi.SetCFARule(Module::Expr("$temp1 76569129 = $temp1")); |
| michael@0 | 5853 | + cfi.SetRARule(Module::Expr("$temp1")); |
| michael@0 | 5854 | ASSERT_FALSE(cfi.FindCallerRegs<uint64_t>(registers, memory, |
| michael@0 | 5855 | &caller_registers)); |
| michael@0 | 5856 | } |
| michael@0 | 5857 | |
| michael@0 | 5858 | class MockCFIRuleParserHandler: public CFIRuleParser::Handler { |
| michael@0 | 5859 | public: |
| michael@0 | 5860 | MOCK_METHOD1(CFARule, void(const string &)); |
| michael@0 | 5861 | MOCK_METHOD1(RARule, void(const string &)); |
| michael@0 | 5862 | @@ -512,20 +514,20 @@ |
| michael@0 | 5863 | .WillRepeatedly(DoAll(SetArgumentPointee<1>(0xdc1975eba8602302ULL), |
| michael@0 | 5864 | Return(true))); |
| michael@0 | 5865 | // Saved return address. |
| michael@0 | 5866 | EXPECT_CALL(memory, |
| michael@0 | 5867 | GetMemoryAtAddress(stack_top + 16, A<uint64_t *>())) |
| michael@0 | 5868 | .WillRepeatedly(DoAll(SetArgumentPointee<1>(0xba5ad6d9acce28deULL), |
| michael@0 | 5869 | Return(true))); |
| michael@0 | 5870 | |
| michael@0 | 5871 | - call_frame_info.SetCFARule("sp 24 +"); |
| michael@0 | 5872 | - call_frame_info.SetRARule(".cfa 8 - ^"); |
| michael@0 | 5873 | - call_frame_info.SetRegisterRule("r0", ".cfa 24 - ^"); |
| michael@0 | 5874 | - call_frame_info.SetRegisterRule("r1", "r2"); |
| michael@0 | 5875 | + call_frame_info.SetCFARule(Module::Expr("sp 24 +")); |
| michael@0 | 5876 | + call_frame_info.SetRARule(Module::Expr(".cfa 8 - ^")); |
| michael@0 | 5877 | + call_frame_info.SetRegisterRule("r0", Module::Expr(".cfa 24 - ^")); |
| michael@0 | 5878 | + call_frame_info.SetRegisterRule("r1", Module::Expr("r2")); |
| michael@0 | 5879 | |
| michael@0 | 5880 | callee_context.r0 = 0x94e030ca79edd119ULL; |
| michael@0 | 5881 | callee_context.r1 = 0x937b4d7e95ce52d9ULL; |
| michael@0 | 5882 | callee_context.r2 = 0x5fe0027416b8b62aULL; // caller's r1 |
| michael@0 | 5883 | // callee_context.r3 is not valid in callee. |
| michael@0 | 5884 | // callee_context.r4 is not valid in callee. |
| michael@0 | 5885 | callee_context.sp = stack_top; |
| michael@0 | 5886 | callee_context.pc = 0x25b21b224311d280ULL; |
| michael@0 | 5887 | diff --git a/src/processor/postfix_evaluator-inl.h b/src/processor/postfix_evaluator-inl.h |
| michael@0 | 5888 | --- a/src/processor/postfix_evaluator-inl.h |
| michael@0 | 5889 | +++ b/src/processor/postfix_evaluator-inl.h |
| michael@0 | 5890 | @@ -226,52 +226,100 @@ |
| michael@0 | 5891 | return false; |
| michael@0 | 5892 | } |
| michael@0 | 5893 | } |
| michael@0 | 5894 | |
| michael@0 | 5895 | return true; |
| michael@0 | 5896 | } |
| michael@0 | 5897 | |
| michael@0 | 5898 | template<typename ValueType> |
| michael@0 | 5899 | -bool PostfixEvaluator<ValueType>::Evaluate(const string &expression, |
| michael@0 | 5900 | - DictionaryValidityType *assigned) { |
| michael@0 | 5901 | +bool PostfixEvaluator<ValueType>::Evaluate(const Module::Expr& expr, |
| michael@0 | 5902 | + DictionaryValidityType* assigned) { |
| michael@0 | 5903 | + // The expression is being exevaluated only for its side effects. Skip |
| michael@0 | 5904 | + // expressions that denote values only. |
| michael@0 | 5905 | + if (expr.how_ != Module::kExprPostfix) { |
| michael@0 | 5906 | + BPLOG(ERROR) << "Can't evaluate for side-effects: " << expr; |
| michael@0 | 5907 | + return false; |
| michael@0 | 5908 | + } |
| michael@0 | 5909 | + |
| michael@0 | 5910 | // Ensure that the stack is cleared before returning. |
| michael@0 | 5911 | AutoStackClearer clearer(&stack_); |
| michael@0 | 5912 | |
| michael@0 | 5913 | - if (!EvaluateInternal(expression, assigned)) |
| michael@0 | 5914 | + if (!EvaluateInternal(expr.postfix_, assigned)) |
| michael@0 | 5915 | return false; |
| michael@0 | 5916 | |
| michael@0 | 5917 | // If there's anything left on the stack, it indicates incomplete execution. |
| michael@0 | 5918 | // This is a failure case. If the stack is empty, evalution was complete |
| michael@0 | 5919 | // and successful. |
| michael@0 | 5920 | if (stack_.empty()) |
| michael@0 | 5921 | return true; |
| michael@0 | 5922 | |
| michael@0 | 5923 | - BPLOG(ERROR) << "Incomplete execution: " << expression; |
| michael@0 | 5924 | + BPLOG(ERROR) << "Incomplete execution: " << expr; |
| michael@0 | 5925 | return false; |
| michael@0 | 5926 | } |
| michael@0 | 5927 | |
| michael@0 | 5928 | template<typename ValueType> |
| michael@0 | 5929 | -bool PostfixEvaluator<ValueType>::EvaluateForValue(const string &expression, |
| michael@0 | 5930 | - ValueType *result) { |
| michael@0 | 5931 | - // Ensure that the stack is cleared before returning. |
| michael@0 | 5932 | - AutoStackClearer clearer(&stack_); |
| michael@0 | 5933 | +bool PostfixEvaluator<ValueType>::EvaluateForValue(const Module::Expr& expr, |
| michael@0 | 5934 | + ValueType* result) { |
| michael@0 | 5935 | + switch (expr.how_) { |
| michael@0 | 5936 | |
| michael@0 | 5937 | - if (!EvaluateInternal(expression, NULL)) |
| michael@0 | 5938 | - return false; |
| michael@0 | 5939 | + // Postfix expression. Give to the evaluator and return the |
| michael@0 | 5940 | + // one-and-only stack element that should be left over. |
| michael@0 | 5941 | + case Module::kExprPostfix: { |
| michael@0 | 5942 | + // Ensure that the stack is cleared before returning. |
| michael@0 | 5943 | + AutoStackClearer clearer(&stack_); |
| michael@0 | 5944 | |
| michael@0 | 5945 | - // A successful execution should leave exactly one value on the stack. |
| michael@0 | 5946 | - if (stack_.size() != 1) { |
| michael@0 | 5947 | - BPLOG(ERROR) << "Expression yielded bad number of results: " |
| michael@0 | 5948 | - << "'" << expression << "'"; |
| michael@0 | 5949 | - return false; |
| michael@0 | 5950 | + if (!EvaluateInternal(expr.postfix_, NULL)) |
| michael@0 | 5951 | + return false; |
| michael@0 | 5952 | + |
| michael@0 | 5953 | + // A successful execution should leave exactly one value on the stack. |
| michael@0 | 5954 | + if (stack_.size() != 1) { |
| michael@0 | 5955 | + BPLOG(ERROR) << "Expression yielded bad number of results: " |
| michael@0 | 5956 | + << "'" << expr << "'"; |
| michael@0 | 5957 | + return false; |
| michael@0 | 5958 | + } |
| michael@0 | 5959 | + |
| michael@0 | 5960 | + return PopValue(result); |
| michael@0 | 5961 | + } |
| michael@0 | 5962 | + |
| michael@0 | 5963 | + // Simple-form expressions |
| michael@0 | 5964 | + case Module::kExprSimple: |
| michael@0 | 5965 | + case Module::kExprSimpleMem: { |
| michael@0 | 5966 | + // Look up the base value |
| michael@0 | 5967 | + typename DictionaryType::const_iterator iterator |
| michael@0 | 5968 | + = dictionary_->find(expr.ident_); |
| michael@0 | 5969 | + if (iterator == dictionary_->end()) { |
| michael@0 | 5970 | + // The identifier wasn't found in the dictionary. Don't imply any |
| michael@0 | 5971 | + // default value, just fail. |
| michael@0 | 5972 | + BPLOG(INFO) << "Identifier " << expr.ident_ |
| michael@0 | 5973 | + << " not in dictionary (kExprSimple{Mem})"; |
| michael@0 | 5974 | + return false; |
| michael@0 | 5975 | + } |
| michael@0 | 5976 | + |
| michael@0 | 5977 | + // Form the sum |
| michael@0 | 5978 | + ValueType sum = iterator->second + (int64_t)expr.offset_; |
| michael@0 | 5979 | + |
| michael@0 | 5980 | + // and dereference if necessary |
| michael@0 | 5981 | + if (expr.how_ == Module::kExprSimpleMem) { |
| michael@0 | 5982 | + ValueType derefd; |
| michael@0 | 5983 | + if (!memory_ || !memory_->GetMemoryAtAddress(sum, &derefd)) { |
| michael@0 | 5984 | + return false; |
| michael@0 | 5985 | + } |
| michael@0 | 5986 | + *result = derefd; |
| michael@0 | 5987 | + } else { |
| michael@0 | 5988 | + *result = sum; |
| michael@0 | 5989 | + } |
| michael@0 | 5990 | + return true; |
| michael@0 | 5991 | + } |
| michael@0 | 5992 | + |
| michael@0 | 5993 | + default: |
| michael@0 | 5994 | + return false; |
| michael@0 | 5995 | } |
| michael@0 | 5996 | +} |
| michael@0 | 5997 | |
| michael@0 | 5998 | - return PopValue(result); |
| michael@0 | 5999 | -} |
| michael@0 | 6000 | |
| michael@0 | 6001 | template<typename ValueType> |
| michael@0 | 6002 | typename PostfixEvaluator<ValueType>::PopResult |
| michael@0 | 6003 | PostfixEvaluator<ValueType>::PopValueOrIdentifier( |
| michael@0 | 6004 | ValueType *value, string *identifier) { |
| michael@0 | 6005 | // There needs to be at least one element on the stack to pop. |
| michael@0 | 6006 | if (!stack_.size()) |
| michael@0 | 6007 | return POP_RESULT_FAIL; |
| michael@0 | 6008 | diff --git a/src/processor/postfix_evaluator.h b/src/processor/postfix_evaluator.h |
| michael@0 | 6009 | --- a/src/processor/postfix_evaluator.h |
| michael@0 | 6010 | +++ b/src/processor/postfix_evaluator.h |
| michael@0 | 6011 | @@ -70,16 +70,17 @@ |
| michael@0 | 6012 | #define PROCESSOR_POSTFIX_EVALUATOR_H__ |
| michael@0 | 6013 | |
| michael@0 | 6014 | |
| michael@0 | 6015 | #include <map> |
| michael@0 | 6016 | #include <string> |
| michael@0 | 6017 | #include <vector> |
| michael@0 | 6018 | |
| michael@0 | 6019 | #include "common/using_std_string.h" |
| michael@0 | 6020 | +#include "common/module.h" |
| michael@0 | 6021 | |
| michael@0 | 6022 | namespace google_breakpad { |
| michael@0 | 6023 | |
| michael@0 | 6024 | using std::map; |
| michael@0 | 6025 | using std::vector; |
| michael@0 | 6026 | |
| michael@0 | 6027 | class MemoryRegion; |
| michael@0 | 6028 | |
| michael@0 | 6029 | @@ -100,23 +101,23 @@ |
| michael@0 | 6030 | |
| michael@0 | 6031 | // Evaluate the expression, starting with an empty stack. The results of |
| michael@0 | 6032 | // execution will be stored in one (or more) variables in the dictionary. |
| michael@0 | 6033 | // Returns false if any failures occur during execution, leaving |
| michael@0 | 6034 | // variables in the dictionary in an indeterminate state. If assigned is |
| michael@0 | 6035 | // non-NULL, any keys set in the dictionary as a result of evaluation |
| michael@0 | 6036 | // will also be set to true in assigned, providing a way to determine if |
| michael@0 | 6037 | // an expression modifies any of its input variables. |
| michael@0 | 6038 | - bool Evaluate(const string &expression, DictionaryValidityType *assigned); |
| michael@0 | 6039 | + bool Evaluate(const Module::Expr &expr, DictionaryValidityType *assigned); |
| michael@0 | 6040 | |
| michael@0 | 6041 | - // Like Evaluate, but provides the value left on the stack to the |
| michael@0 | 6042 | - // caller. If evaluation succeeds and leaves exactly one value on |
| michael@0 | 6043 | - // the stack, pop that value, store it in *result, and return true. |
| michael@0 | 6044 | - // Otherwise, return false. |
| michael@0 | 6045 | - bool EvaluateForValue(const string &expression, ValueType *result); |
| michael@0 | 6046 | + // Like Evaluate, but expects the expression to denote a value. |
| michael@0 | 6047 | + // If evaluation succeeds and (in the case of a postfix expression) |
| michael@0 | 6048 | + // leaves exactly one value on the stack, pop that value, store it in |
| michael@0 | 6049 | + // *result, and return true. Otherwise, return false. |
| michael@0 | 6050 | + bool EvaluateForValue(const Module::Expr& expression, ValueType* result); |
| michael@0 | 6051 | |
| michael@0 | 6052 | DictionaryType* dictionary() const { return dictionary_; } |
| michael@0 | 6053 | |
| michael@0 | 6054 | // Reset the dictionary. PostfixEvaluator does not take ownership. |
| michael@0 | 6055 | void set_dictionary(DictionaryType *dictionary) {dictionary_ = dictionary; } |
| michael@0 | 6056 | |
| michael@0 | 6057 | private: |
| michael@0 | 6058 | // Return values for PopValueOrIdentifier |
