Make build system less annoying (#8) r=bryner

- Place objects in the appropriate directories, instead of filling up the root directory. - Remove namespace macros, which made maintenance troublesome and which created a dependency on config.h in public headers - Skip useless Fortran checks at configure time git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@8 4c0a9323-5329-0410-9bdc-e9ce6186880e
2024-11-21 14:29:09 -07:00 · 2006-08-30 20:05:05 +00:00 · 2006-08-30 20:05:05 +00:00 · 425d256321
commit 425d256321
parent 310d2f384d
21 changed files with 5361 additions and 5477 deletions
--- a/1
+++ b/1
@ -1,2 +1 @@
 opensource@google.com
--- a/2
+++ b/2
@ -187,7 +187,7 @@
      same "printed page" as the copyright notice for easier
      identification within third-party archives.
-   Copyright [yyyy] [name of copyright owner]
+   Copyright (C) 2006 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
--- a/70
+++ b/70
@ -1,14 +1,16 @@
-Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Installation Instructions
-Foundation, Inc.
+*************************
-   This file is free documentation; the Free Software Foundation gives
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
 Software Foundation, Inc.
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 Basic Installation
 ==================
-   These are generic installation instructions.
+These are generic installation instructions.
   The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@ -68,9 +70,9 @@ The simplest way to compile this package is:
 Compilers and Options
 =====================
-   Some systems require unusual options for compilation or linking that
+Some systems require unusual options for compilation or linking that the
-the `configure' script does not know about.  Run `./configure --help'
+`configure' script does not know about.  Run `./configure --help' for
-for details on some of the pertinent environment variables.
+details on some of the pertinent environment variables.
   You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
@ -83,7 +85,7 @@ is an example:
 Compiling For Multiple Architectures
 ====================================
-   You can compile the package for more than one kind of computer at the
+You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
 own directory.  To do this, you must use a version of `make' that
 supports the `VPATH' variable, such as GNU `make'.  `cd' to the
@ -100,19 +102,19 @@ for another architecture.
 Installation Names
 ==================
-   By default, `make install' will install the package's files in
+By default, `make install' installs the package's commands under
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
-installation prefix other than `/usr/local' by giving `configure' the
+can specify an installation prefix other than `/usr/local' by giving
-option `--prefix=PATH'.
+`configure' the option `--prefix=PREFIX'.
   You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PATH as the prefix for installing programs and libraries.
+PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+Documentation and other data files still use the regular prefix.
   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
+options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
@ -123,7 +125,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 Optional Features
 =================
-   Some packages pay attention to `--enable-FEATURE' options to
+Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@ -138,11 +140,11 @@ you can use the `configure' options `--x-includes=DIR' and
 Specifying the System Type
 ==========================
-   There may be some features `configure' cannot figure out
+There may be some features `configure' cannot figure out automatically,
-automatically, but needs to determine by the type of machine the package
+but needs to determine by the type of machine the package will run on.
-will run on.  Usually, assuming the package is built to be run on the
+Usually, assuming the package is built to be run on the _same_
-_same_ architectures, `configure' can figure that out, but if it prints
+architectures, `configure' can figure that out, but if it prints a
-a message saying it cannot guess the machine type, give it the
+message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
@ -157,7 +159,7 @@ where SYSTEM can have one of these forms:
 need to know the machine type.
   If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+use the option `--target=TYPE' to select the type of system they will
 produce code for.
   If you want to _use_ a cross compiler, that generates code for a
@ -168,9 +170,9 @@ eventually be run) with `--host=TYPE'.
 Sharing Defaults
 ================
-   If you want to set default values for `configure' scripts to share,
+If you want to set default values for `configure' scripts to share, you
-you can create a site shell script called `config.site' that gives
+can create a site shell script called `config.site' that gives default
-default values for variables like `CC', `cache_file', and `prefix'.
+values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@ -179,7 +181,7 @@ A warning: not all `configure' scripts look for a site script.
 Defining Variables
 ==================
-   Variables not defined in a site shell script can be set in the
+Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@ -187,14 +189,18 @@ them in the `configure' command line, using `VAR=value'.  For example:
     ./configure CC=/usr/local2/bin/gcc
-will cause the specified gcc to be used as the C compiler (unless it is
+causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
+overridden in the site shell script).  Here is a another example:
     /bin/bash ./configure CONFIG_SHELL=/bin/bash
 Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
 configuration-related scripts to be executed by `/bin/bash'.
 `configure' Invocation
 ======================
-   `configure' recognizes the following options to control how it
+`configure' recognizes the following options to control how it operates.
 operates.
 `--help'
 `-h'
--- a/Makefile.am
+++ b/Makefile.am
@ -1,64 +1,64 @@
 ## Process this file with automake to produce Makefile.in
-# Make sure that when we re-make ./configure, we get the macros we need
+# Copyright (C) 2006 Google Inc.
-ACLOCAL_AMFLAGS = -I `pwd`/../autoconf
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # This is so we can #include <google/foo>
 AM_CPPFLAGS = -I$(top_srcdir)/src
 googleincludedir = $(includedir)/google
 ## The .h files you want to install (that is, .h files that people
 ## who install this package can include in their own applications.)
 googleinclude_HEADERS =
 ## Documentation
 docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
 ## This is for HTML and other documentation you want to install.
 ## Add your documentation files (in doc/) in addition to these
 ## top-level boilerplate files.  Also add a TODO file if you have one.
 dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README
-## The libraries (.so's) you want to install
+dist_doc_DATA = \
-lib_LTLIBRARIES = libairbag.la
+	AUTHORS \
 	COPYING \
 	ChangeLog \
 	INSTALL \
 	NEWS \
 	README
-## unittests you want to run when people type 'make check'.
+
-## TESTS is for binary unittests, check_SCRIPTS for script-based unittests.
+## Libraries
-## TESTS_ENVIRONMENT sets environment variables for when you run unittest,
+lib_LTLIBRARIES = src/libairbag.la
-## but it only seems to take effect for *binary* unittests (argh!)
+
-TESTS = source_line_resolver_unittest
+src_libairbag_la_SOURCES = \
 	src/processor/source_line_resolver.cc \
 	src/processor/source_line_resolver.h
 ## Tests
 TESTS = src/processor/source_line_resolver_unittest
 TESTS_ENVIRONMENT =
 check_SCRIPTS =
 # Every time you add a unittest to check_SCRIPTS, add it here too
 noinst_SCRIPTS =
-## vvvv RULES TO MAKE THE LIBRARIES, BINARIES, AND UNITTESTS
+src_processor_source_line_resolver_unittest_SOURCES = \
-
+	src/processor/source_line_resolver_unittest.cc
-libairbag_la_SOURCES = 				\
+src_processor_source_line_resolver_unittest_LDADD = \
-	src/processor/source_line_resolver.cc	\
+	src/processor/source_line_resolver.lo
 	src/processor/source_line_resolver.h
 source_line_resolver_unittest_SOURCES =		\
 	src/processor/source_line_resolver_unittest.cc \
 	src/processor/source_line_resolver.h
 source_line_resolver_unittest_LDADD = source_line_resolver.lo
 ## ^^^^ END OF RULES TO MAKE THE LIBRARIES, BINARIES, AND UNITTESTS
-## This should always include $(TESTS), but may also include other
+## Non-installables
 ## binaries that you compile but don't want automatically installed.
 noinst_PROGRAMS = $(TESTS)
 noinst_SCRIPTS = $(check_SCRIPTS)
 rpm: dist-gzip packages/rpm.sh packages/rpm/rpm.spec
 	@cd packages && ./rpm.sh ${PACKAGE} ${VERSION}
-deb: dist-gzip packages/deb.sh packages/deb/*
+## Additional files to be included in a source distribution
-	@cd packages && ./deb.sh ${PACKAGE} ${VERSION}
+EXTRA_DIST = \
 	$(SCRIPTS) \
 	src/processor/testdata/module1.out \
 	src/processor/testdata/module2.out \
 	src/processor/testdata/module3_bad.out
 ## Additional rules
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
 EXTRA_DIST = packages/rpm.sh packages/rpm/rpm.spec packages/deb.sh packages/deb \
 	$(SCRIPTS) libtool
 ## If you create hash_map.h, hash_set.h, and/or hash_fun.h via the
 ## ACC_CXX_MAKE_*_H configure.ac macros, add those files here.
 DISTCLEANFILES =
--- a/Makefile.in
+++ b/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -14,12 +14,23 @@
@SET_MAKE@
 # Copyright (C) 2006 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 SOURCES = $(libairbag_la_SOURCES) $(source_line_resolver_unittest_SOURCES)
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@ -44,11 +55,11 @@ build_triplet = @build@
 host_triplet = @host@
 noinst_PROGRAMS = $(am__EXEEXT_1)
 DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
-	$(googleinclude_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure \
+	$(top_srcdir)/configure $(top_srcdir)/src/config.h.in AUTHORS \
-	$(top_srcdir)/src/config.h.in AUTHORS COPYING ChangeLog \
+	COPYING ChangeLog INSTALL NEWS autotools/config.guess \
-	INSTALL NEWS compile config.guess config.sub depcomp \
+	autotools/config.sub autotools/depcomp autotools/install-sh \
-	install-sh ltmain.sh missing mkinstalldirs
+	autotools/ltmain.sh autotools/missing
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@ -56,7 +67,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 configure.lineno configure.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h
 CONFIG_CLEAN_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@ -65,23 +76,24 @@ am__vpath_adj = case $$p in \
    *) f=$$p;; \
  esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(docdir)" \
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(docdir)"
 	"$(DESTDIR)$(googleincludedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libairbag_la_LIBADD =
+src_libairbag_la_LIBADD =
-am_libairbag_la_OBJECTS = source_line_resolver.lo
+am__dirstamp = $(am__leading_dot)dirstamp
-libairbag_la_OBJECTS = $(am_libairbag_la_OBJECTS)
+am_src_libairbag_la_OBJECTS = src/processor/source_line_resolver.lo
-am__EXEEXT_1 = source_line_resolver_unittest$(EXEEXT)
+src_libairbag_la_OBJECTS = $(am_src_libairbag_la_OBJECTS)
 am__EXEEXT_1 = src/processor/source_line_resolver_unittest$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
-am_source_line_resolver_unittest_OBJECTS =  \
+am_src_processor_source_line_resolver_unittest_OBJECTS =  \
-	source_line_resolver_unittest.$(OBJEXT)
+	src/processor/source_line_resolver_unittest.$(OBJEXT)
-source_line_resolver_unittest_OBJECTS =  \
+src_processor_source_line_resolver_unittest_OBJECTS =  \
-	$(am_source_line_resolver_unittest_OBJECTS)
+	$(am_src_processor_source_line_resolver_unittest_OBJECTS)
-source_line_resolver_unittest_DEPENDENCIES = source_line_resolver.lo
+src_processor_source_line_resolver_unittest_DEPENDENCIES =  \
 	src/processor/source_line_resolver.lo
 SCRIPTS = $(noinst_SCRIPTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
 am__depfiles_maybe = depfiles
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@ -99,14 +111,12 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libairbag_la_SOURCES) \
+SOURCES = $(src_libairbag_la_SOURCES) \
-	$(source_line_resolver_unittest_SOURCES)
+	$(src_processor_source_line_resolver_unittest_SOURCES)
-DIST_SOURCES = $(libairbag_la_SOURCES) \
+DIST_SOURCES = $(src_libairbag_la_SOURCES) \
-	$(source_line_resolver_unittest_SOURCES)
+	$(src_processor_source_line_resolver_unittest_SOURCES)
 dist_docDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_doc_DATA)
 googleincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(googleinclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@ -217,35 +227,36 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 # Make sure that when we re-make ./configure, we get the macros we need
 ACLOCAL_AMFLAGS = -I `pwd`/../autoconf
 # This is so we can #include <google/foo>
 AM_CPPFLAGS = -I$(top_srcdir)/src
 googleincludedir = $(includedir)/google
 googleinclude_HEADERS = 
 docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
-dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README
+dist_doc_DATA = \
-lib_LTLIBRARIES = libairbag.la
+	AUTHORS \
-TESTS = source_line_resolver_unittest
+	COPYING \
 	ChangeLog \
 	INSTALL \
 	NEWS \
 	README
 lib_LTLIBRARIES = src/libairbag.la
 src_libairbag_la_SOURCES = \
 	src/processor/source_line_resolver.cc \
 	src/processor/source_line_resolver.h
 TESTS = src/processor/source_line_resolver_unittest
 TESTS_ENVIRONMENT = 
 check_SCRIPTS = 
-# Every time you add a unittest to check_SCRIPTS, add it here too
+src_processor_source_line_resolver_unittest_SOURCES = \
-noinst_SCRIPTS = 
+	src/processor/source_line_resolver_unittest.cc
 libairbag_la_SOURCES = \
 	src/processor/source_line_resolver.cc	\
 	src/processor/source_line_resolver.h
-source_line_resolver_unittest_SOURCES = \
+src_processor_source_line_resolver_unittest_LDADD = \
-	src/processor/source_line_resolver_unittest.cc \
+	src/processor/source_line_resolver.lo
 	src/processor/source_line_resolver.h
-source_line_resolver_unittest_LDADD = source_line_resolver.lo
+noinst_SCRIPTS = $(check_SCRIPTS)
-EXTRA_DIST = packages/rpm.sh packages/rpm/rpm.spec packages/deb.sh packages/deb \
+EXTRA_DIST = \
-	$(SCRIPTS) libtool
+	$(SCRIPTS) \
 	src/processor/testdata/module1.out \
 	src/processor/testdata/module2.out \
 	src/processor/testdata/module3_bad.out
 DISTCLEANFILES = 
 all: all-am
 .SUFFIXES:
@ -327,8 +338,19 @@ clean-libLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libairbag.la: $(libairbag_la_OBJECTS) $(libairbag_la_DEPENDENCIES) 
+src/processor/$(am__dirstamp):
-	$(CXXLINK) -rpath $(libdir) $(libairbag_la_LDFLAGS) $(libairbag_la_OBJECTS) $(libairbag_la_LIBADD) $(LIBS)
+	@$(mkdir_p) src/processor
 	@: > src/processor/$(am__dirstamp)
 src/processor/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) src/processor/$(DEPDIR)
 	@: > src/processor/$(DEPDIR)/$(am__dirstamp)
 src/processor/source_line_resolver.lo: src/processor/$(am__dirstamp) \
 	src/processor/$(DEPDIR)/$(am__dirstamp)
 src/$(am__dirstamp):
 	@$(mkdir_p) src
 	@: > src/$(am__dirstamp)
 src/libairbag.la: $(src_libairbag_la_OBJECTS) $(src_libairbag_la_DEPENDENCIES) src/$(am__dirstamp)
 	$(CXXLINK) -rpath $(libdir) $(src_libairbag_la_LDFLAGS) $(src_libairbag_la_OBJECTS) $(src_libairbag_la_LIBADD) $(LIBS)
 clean-noinstPROGRAMS:
 	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
@ -336,66 +358,56 @@ clean-noinstPROGRAMS:
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
-source_line_resolver_unittest$(EXEEXT): $(source_line_resolver_unittest_OBJECTS) $(source_line_resolver_unittest_DEPENDENCIES) 
+src/processor/source_line_resolver_unittest.$(OBJEXT):  \
-	@rm -f source_line_resolver_unittest$(EXEEXT)
+	src/processor/$(am__dirstamp) \
-	$(CXXLINK) $(source_line_resolver_unittest_LDFLAGS) $(source_line_resolver_unittest_OBJECTS) $(source_line_resolver_unittest_LDADD) $(LIBS)
+	src/processor/$(DEPDIR)/$(am__dirstamp)
 src/processor/source_line_resolver_unittest$(EXEEXT): $(src_processor_source_line_resolver_unittest_OBJECTS) $(src_processor_source_line_resolver_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)
 	@rm -f src/processor/source_line_resolver_unittest$(EXEEXT)
 	$(CXXLINK) $(src_processor_source_line_resolver_unittest_LDFLAGS) $(src_processor_source_line_resolver_unittest_OBJECTS) $(src_processor_source_line_resolver_unittest_LDADD) $(LIBS)
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 	-rm -f src/processor/source_line_resolver.$(OBJEXT)
 	-rm -f src/processor/source_line_resolver.lo
 	-rm -f src/processor/source_line_resolver_unittest.$(OBJEXT)
 distclean-compile:
 	-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/source_line_resolver.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/source_line_resolver.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/source_line_resolver_unittest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/source_line_resolver_unittest.Po@am__quote@
 .cc.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
@am__fastdepCXX_TRUE@	then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 .cc.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
@am__fastdepCXX_TRUE@	then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 .cc.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
@am__fastdepCXX_TRUE@	then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 source_line_resolver.lo: src/processor/source_line_resolver.cc
@am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT source_line_resolver.lo -MD -MP -MF "$(DEPDIR)/source_line_resolver.Tpo" -c -o source_line_resolver.lo `test -f 'src/processor/source_line_resolver.cc' || echo '$(srcdir)/'`src/processor/source_line_resolver.cc; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/source_line_resolver.Tpo" "$(DEPDIR)/source_line_resolver.Plo"; else rm -f "$(DEPDIR)/source_line_resolver.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/processor/source_line_resolver.cc' object='source_line_resolver.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o source_line_resolver.lo `test -f 'src/processor/source_line_resolver.cc' || echo '$(srcdir)/'`src/processor/source_line_resolver.cc
 source_line_resolver_unittest.o: src/processor/source_line_resolver_unittest.cc
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT source_line_resolver_unittest.o -MD -MP -MF "$(DEPDIR)/source_line_resolver_unittest.Tpo" -c -o source_line_resolver_unittest.o `test -f 'src/processor/source_line_resolver_unittest.cc' || echo '$(srcdir)/'`src/processor/source_line_resolver_unittest.cc; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/source_line_resolver_unittest.Tpo" "$(DEPDIR)/source_line_resolver_unittest.Po"; else rm -f "$(DEPDIR)/source_line_resolver_unittest.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/processor/source_line_resolver_unittest.cc' object='source_line_resolver_unittest.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o source_line_resolver_unittest.o `test -f 'src/processor/source_line_resolver_unittest.cc' || echo '$(srcdir)/'`src/processor/source_line_resolver_unittest.cc
 source_line_resolver_unittest.obj: src/processor/source_line_resolver_unittest.cc
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT source_line_resolver_unittest.obj -MD -MP -MF "$(DEPDIR)/source_line_resolver_unittest.Tpo" -c -o source_line_resolver_unittest.obj `if test -f 'src/processor/source_line_resolver_unittest.cc'; then $(CYGPATH_W) 'src/processor/source_line_resolver_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/src/processor/source_line_resolver_unittest.cc'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/source_line_resolver_unittest.Tpo" "$(DEPDIR)/source_line_resolver_unittest.Po"; else rm -f "$(DEPDIR)/source_line_resolver_unittest.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/processor/source_line_resolver_unittest.cc' object='source_line_resolver_unittest.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o source_line_resolver_unittest.obj `if test -f 'src/processor/source_line_resolver_unittest.cc'; then $(CYGPATH_W) 'src/processor/source_line_resolver_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/src/processor/source_line_resolver_unittest.cc'; fi`
 mostlyclean-libtool:
 	-rm -f *.lo
 clean-libtool:
 	-rm -rf .libs _libs
 	-rm -rf src/.libs src/_libs
 	-rm -rf src/processor/.libs src/processor/_libs
 distclean-libtool:
 	-rm -f libtool
@ -417,23 +429,6 @@ uninstall-dist_docDATA:
 	  echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
 	done
 install-googleincludeHEADERS: $(googleinclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(googleincludedir)" || $(mkdir_p) "$(DESTDIR)$(googleincludedir)"
 	@list='$(googleinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
 	  echo " $(googleincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(googleincludedir)/$$f'"; \
 	  $(googleincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(googleincludedir)/$$f"; \
 	done
 uninstall-googleincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(googleinclude_HEADERS)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
 	  echo " rm -f '$(DESTDIR)$(googleincludedir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(googleincludedir)/$$f"; \
 	done
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@ -559,7 +554,7 @@ check-TESTS: $(TESTS)
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/packages $(distdir)/packages/rpm $(distdir)/src
+	$(mkdir_p) $(distdir)/autotools $(distdir)/src $(distdir)/src/processor/testdata
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@ -687,10 +682,9 @@ check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) $(check_SCRIPTS)
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA)
 		$(HEADERS)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(googleincludedir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(docdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@ -713,7 +707,9 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+	-rm -f src/$(am__dirstamp)
 	-rm -f src/processor/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/processor/$(am__dirstamp)
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@ -725,7 +721,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR)
+	-rm -rf src/processor/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-libtool distclean-tags
@ -740,7 +736,7 @@ info: info-am
 info-am:
-install-data-am: install-dist_docDATA install-googleincludeHEADERS
+install-data-am: install-dist_docDATA
 install-exec-am: install-libLTLIBRARIES
@ -753,7 +749,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR)
+	-rm -rf src/processor/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
@ -770,8 +766,8 @@ ps: ps-am
 ps-am:
-uninstall-am: uninstall-dist_docDATA uninstall-googleincludeHEADERS \
+uninstall-am: uninstall-dist_docDATA uninstall-info-am \
-	uninstall-info-am uninstall-libLTLIBRARIES
+	uninstall-libLTLIBRARIES
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \
 	clean clean-generic clean-libLTLIBRARIES clean-libtool \
@ -781,23 +777,16 @@ uninstall-am: uninstall-dist_docDATA uninstall-googleincludeHEADERS \
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-dist_docDATA install-exec install-exec-am \
+	install-dist_docDATA install-exec install-exec-am install-info \
-	install-googleincludeHEADERS install-info install-info-am \
+	install-info-am install-libLTLIBRARIES install-man \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	install-strip installcheck installcheck-am installdirs \
-	installcheck-am installdirs maintainer-clean \
+	maintainer-clean maintainer-clean-generic mostlyclean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	tags uninstall uninstall-am uninstall-dist_docDATA \
+	uninstall-dist_docDATA uninstall-info-am \
 	uninstall-googleincludeHEADERS uninstall-info-am \
 	uninstall-libLTLIBRARIES
 rpm: dist-gzip packages/rpm.sh packages/rpm/rpm.spec
 	@cd packages && ./rpm.sh ${PACKAGE} ${VERSION}
 deb: dist-gzip packages/deb.sh packages/deb/*
 	@cd packages && ./deb.sh ${PACKAGE} ${VERSION}
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/aclocal.m4
+++ b/aclocal.m4
--- a/autotools/config.guess
+++ b/autotools/config.guess
@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2006-01-30'
+timestamp='2005-12-13'
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@ -106,7 +106,7 @@ set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@ -206,9 +206,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
    *:SolidBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
 	exit ;;
    macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
@ -767,12 +764,7 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
    *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	    pc98)
 		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
 		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
    i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@ -859,11 +851,7 @@ EOF
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
 	    /^CPU/{
 		s: ::g
 		p
 	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
    mips64:Linux:*:*)
@ -882,11 +870,7 @@ EOF
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
 	    /^CPU/{
 		s: ::g
 		p
 	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
    or32:Linux:*:*)
@ -993,11 +977,7 @@ EOF
 	LIBC=dietlibc
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
 	    /^LIBC/{
 		s: ::g
 		p
 	    }'`"
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
--- a/autotools/config.sub
+++ b/autotools/config.sub
@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2006-01-02'
+timestamp='2005-12-11'
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@ -248,7 +248,7 @@ case $basic_machine in
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@ -818,12 +818,6 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
 	pc98)
 		basic_machine=i386-pc
 		;;
 	pc98-*)
 		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@ -1199,8 +1193,7 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
 	      | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
--- a/autotools/depcomp
+++ b/autotools/depcomp
@ -1,7 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+
 scriptversion=2005-07-09.11
 # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@ -15,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02111-1307, USA.
+# 02110-1301, USA.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@ -25,22 +27,45 @@
 # Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
 case $1 in
  '')
     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
     exit 1;
     ;;
  -h | --h*)
    cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
 Run PROGRAMS ARGS to compile a file, generating dependencies
 as side-effects.
 Environment variables:
  depmode     Dependency tracking mode.
  source      Source file read by `PROGRAMS ARGS'.
  object      Object file output by `PROGRAMS ARGS'.
  DEPDIR      directory where to store dependencies.
  depfile     Dependency file to output.
  tmpdepfile  Temporary file to use when outputing dependencies.
  libtool     Whether libtool is used (yes/no).
 Report bugs to <bug-automake@gnu.org>.
 EOF
    exit $?
    ;;
  -v | --v*)
    echo "depcomp $scriptversion"
    exit $?
    ;;
 esac
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
  echo "depcomp: Variables source, object and depmode must be set" 1>&2
  exit 1
 fi
 # `libtool' can also be set to `yes' or `no'.
 if test -z "$depfile"; then
   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
   dir=`echo "$object" | sed 's,/.*$,/,'`
   if test "$dir" = "$object"; then
      dir=
   fi
   # FIXME: should be _deps on DOS.
   depfile="$dir.deps/$base"
 fi
 # Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
 depfile=${depfile-`echo "$object" |
  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 rm -f "$tmpdepfile"
@ -172,19 +197,25 @@ sgi)
 aix)
  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  This file always lives in the current directory.
+  # in a .u file.  In older versions, this file always lives in the
-  # Also, the AIX compiler puts `$object:' at the start of each line;
+  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # $object doesn't have directory information.
+  # start of each line; $object doesn't have directory information.
-  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
+  # Version 6 uses the directory in both cases.
  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
  tmpdepfile="$stripped.u"
  outname="$stripped.o"
  if test "$libtool" = yes; then
    "$@" -Wc,-M
  else
    "$@" -M
  fi
  stat=$?
  if test -f "$tmpdepfile"; then :
  else
    stripped=`echo "$stripped" | sed 's,^.*/,,'`
    tmpdepfile="$stripped.u"
  fi
  if test $stat -eq 0; then :
  else
    rm -f "$tmpdepfile"
@ -192,6 +223,7 @@ aix)
  fi
  if test -f "$tmpdepfile"; then
    outname="$stripped.o"
    # Each line is of the form `foo.o: dependent.h'.
    # Do two passes, one to just change these to
    # `$object: dependent.h' and one to simply `dependent.h:'.
@ -206,6 +238,44 @@ aix)
  rm -f "$tmpdepfile"
  ;;
 icc)
  # Intel's C compiler understands `-MD -MF file'.  However on
  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
  # ICC 7.0 will fill foo.d with something like
  #    foo.o: sub/foo.c
  #    foo.o: sub/foo.h
  # which is wrong.  We want:
  #    sub/foo.o: sub/foo.c
  #    sub/foo.o: sub/foo.h
  #    sub/foo.c:
  #    sub/foo.h:
  # ICC 7.1 will output
  #    foo.o: sub/foo.c sub/foo.h
  # and will wrap long lines using \ :
  #    foo.o: sub/foo.c ... \
  #     sub/foo.h ... \
  #     ...
  "$@" -MD -MF "$tmpdepfile"
  stat=$?
  if test $stat -eq 0; then :
  else
    rm -f "$tmpdepfile"
    exit $stat
  fi
  rm -f "$depfile"
  # Each line is of the form `foo.o: dependent.h',
  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
  # Do two passes, one to just change these to
  # `$object: dependent.h' and one to simply `dependent.h:'.
  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
  # Some versions of the HPUX 10.20 sed can't process this invocation
  # correctly.  Breaking it into two sed invocations is a workaround.
  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
    sed -e 's/$/ :/' >> "$depfile"
  rm -f "$tmpdepfile"
  ;;
 tru64)
   # The Tru64 compiler uses -MD to generate dependencies as a side
   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@ -217,31 +287,47 @@ tru64)
   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
-      tmpdepfile1="$dir.libs/$base.lo.d"
+      # With Tru64 cc, shared objects can also be used to make a
-      tmpdepfile2="$dir.libs/$base.d"
+      # static library.  This mecanism is used in libtool 1.4 series to
      # handle both shared and static libraries in a single compilation.
      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
      #
      # With libtool 1.5 this exception was removed, and libtool now
      # generates 2 separate objects for the 2 libraries.  These two
      # compilations output dependencies in in $dir.libs/$base.o.d and
      # in $dir$base.o.d.  We have to check for both files, because
      # one of the two compilations can be disabled.  We should prefer
      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
      # automatically cleaned when .libs/ is deleted, while ignoring
      # the former would cause a distcleancheck panic.
      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
      tmpdepfile2=$dir$base.o.d          # libtool 1.5
      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
      "$@" -Wc,-MD
   else
-      tmpdepfile1="$dir$base.o.d"
+      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2="$dir$base.d"
+      tmpdepfile2=$dir$base.d
      tmpdepfile3=$dir$base.d
      tmpdepfile4=$dir$base.d
      "$@" -MD
   fi
   stat=$?
   if test $stat -eq 0; then :
   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2"
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
      exit $stat
   fi
-   if test -f "$tmpdepfile1"; then
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      tmpdepfile="$tmpdepfile1"
+   do
-   else
+     test -f "$tmpdepfile" && break
-      tmpdepfile="$tmpdepfile2"
+   done
   fi
   if test -f "$tmpdepfile"; then
      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a space and a tab in the [].
+      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
      echo "#dummy" > "$depfile"
   fi
@ -254,7 +340,7 @@ tru64)
 dashmstdout)
  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o.
+  # always write the preprocessed file to stdout, regardless of -o.
  "$@" || exit $?
  # Remove the call to Libtool.
@ -265,9 +351,7 @@ dashmstdout)
    shift
  fi
-  # Remove `-o $object'.  We will use -o /dev/null later,
+  # Remove `-o $object'.
  # however we can't do the remplacement now because
  # `-o $object' might simply not be used
  IFS=" "
  for arg
  do
@ -287,7 +371,11 @@ dashmstdout)
  done
  test -z "$dashmflag" && dashmflag=-M
-  "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
+  # Require at least two characters before searching for `:'
  # in the target name.  This is to cope with DOS-style filenames:
  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
  "$@" $dashmflag |
    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
  rm -f "$depfile"
  cat < "$tmpdepfile" > "$depfile"
  tr ' ' '
@ -306,6 +394,13 @@ dashXmstdout)
 makedepend)
  "$@" || exit $?
  # Remove any Libtool call
  if test "$libtool" = yes; then
    while test $1 != '--mode=compile'; do
      shift
    done
    shift
  fi
  # X makedepend
  shift
  cleared=no
@ -318,7 +413,9 @@ makedepend)
    case "$arg" in
    -D*|-I*)
      set fnord "$@" "$arg"; shift ;;
-    -*)
+    # Strip any option that makedepend may not understand.  Remove
    # the object too, otherwise makedepend will parse it as a source file.
    -*|$object)
      ;;
    *)
      set fnord "$@" "$arg"; shift ;;
@ -339,7 +436,7 @@ makedepend)
 cpp)
  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout.
+  # always write the preprocessed file to stdout.
  "$@" || exit $?
  # Remove the call to Libtool.
@ -370,7 +467,8 @@ cpp)
  done
  "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
    sed '$ s: \\$::' > "$tmpdepfile"
  rm -f "$depfile"
  echo "$object : \\" > "$depfile"
@ -381,7 +479,7 @@ cpp)
 msvisualcpp)
  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
+  # always write the preprocessed file to stdout, regardless of -o,
  # because we must use -o when running libtool.
  "$@" || exit $?
  IFS=" "
@ -421,3 +519,12 @@ none)
 esac
 exit 0
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-end: "$"
 # End:
--- a/autotools/install-sh
+++ b/autotools/install-sh
@ -0,0 +1,323 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 scriptversion=2005-05-14.22
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
 # following copyright and license.
 #
 # Copyright (C) 1994 X Consortium
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
 # deal in the Software without restriction, including without limitation the
 # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
 # sell copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
 # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
 # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 # Except as contained in this notice, the name of the X Consortium shall not
 # be used in advertising or otherwise to promote the sale, use or other deal-
 # ings in this Software without prior written authorization from the X Consor-
 # tium.
 #
 #
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
 # from scratch.  It can only install one file at a time, a restriction
 # shared with many OS's install programs.
 # set DOITPROG to echo to test this script
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
 # put in absolute paths if you don't have them in your path; or use env. vars.
 mvprog="${MVPROG-mv}"
 cpprog="${CPPROG-cp}"
 chmodprog="${CHMODPROG-chmod}"
 chownprog="${CHOWNPROG-chown}"
 chgrpprog="${CHGRPPROG-chgrp}"
 stripprog="${STRIPPROG-strip}"
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 chmodcmd="$chmodprog 0755"
 chowncmd=
 chgrpcmd=
 stripcmd=
 rmcmd="$rmprog -f"
 mvcmd="$mvprog"
 src=
 dst=
 dir_arg=
 dstarg=
 no_target_directory=
 usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
   or: $0 [OPTION]... SRCFILES... DIRECTORY
   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
   or: $0 [OPTION]... -d DIRECTORIES...
 In the 1st form, copy SRCFILE to DSTFILE.
 In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
 In the 4th, create DIRECTORIES.
 Options:
 -c         (ignored)
 -d         create directories instead of installing files.
 -g GROUP   $chgrpprog installed files to GROUP.
 -m MODE    $chmodprog installed files to MODE.
 -o USER    $chownprog installed files to USER.
 -s         $stripprog installed files.
 -t DIRECTORY  install into DIRECTORY.
 -T         report an error if DSTFILE is a directory.
 --help     display this help and exit.
 --version  display version info and exit.
 Environment variables override the default commands:
  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
 "
 while test -n "$1"; do
  case $1 in
    -c) shift
        continue;;
    -d) dir_arg=true
        shift
        continue;;
    -g) chgrpcmd="$chgrpprog $2"
        shift
        shift
        continue;;
    --help) echo "$usage"; exit $?;;
    -m) chmodcmd="$chmodprog $2"
        shift
        shift
        continue;;
    -o) chowncmd="$chownprog $2"
        shift
        shift
        continue;;
    -s) stripcmd=$stripprog
        shift
        continue;;
    -t) dstarg=$2
 	shift
 	shift
 	continue;;
    -T) no_target_directory=true
 	shift
 	continue;;
    --version) echo "$0 $scriptversion"; exit $?;;
    *)  # When -d is used, all remaining arguments are directories to create.
 	# When -t is used, the destination is already specified.
 	test -n "$dir_arg$dstarg" && break
        # Otherwise, the last argument is the destination.  Remove it from $@.
 	for arg
 	do
          if test -n "$dstarg"; then
 	    # $@ is not empty: it contains at least $arg.
 	    set fnord "$@" "$dstarg"
 	    shift # fnord
 	  fi
 	  shift # arg
 	  dstarg=$arg
 	done
 	break;;
  esac
 done
 if test -z "$1"; then
  if test -z "$dir_arg"; then
    echo "$0: no input file specified." >&2
    exit 1
  fi
  # It's OK to call `install-sh -d' without argument.
  # This can happen when creating conditional directories.
  exit 0
 fi
 for src
 do
  # Protect names starting with `-'.
  case $src in
    -*) src=./$src ;;
  esac
  if test -n "$dir_arg"; then
    dst=$src
    src=
    if test -d "$dst"; then
      mkdircmd=:
      chmodcmd=
    else
      mkdircmd=$mkdirprog
    fi
  else
    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
    # might cause directories to be created, which would be especially bad
    # if $src (and thus $dsttmp) contains '*'.
    if test ! -f "$src" && test ! -d "$src"; then
      echo "$0: $src does not exist." >&2
      exit 1
    fi
    if test -z "$dstarg"; then
      echo "$0: no destination specified." >&2
      exit 1
    fi
    dst=$dstarg
    # Protect names starting with `-'.
    case $dst in
      -*) dst=./$dst ;;
    esac
    # If destination is a directory, append the input filename; won't work
    # if double slashes aren't ignored.
    if test -d "$dst"; then
      if test -n "$no_target_directory"; then
 	echo "$0: $dstarg: Is a directory" >&2
 	exit 1
      fi
      dst=$dst/`basename "$src"`
    fi
  fi
  # This sed command emulates the dirname command.
  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
  # Make sure that the destination directory exists.
  # Skip lots of stat calls in the usual case.
  if test ! -d "$dstdir"; then
    defaultIFS='
 	 '
    IFS="${IFS-$defaultIFS}"
    oIFS=$IFS
    # Some sh's can't handle IFS=/ for some reason.
    IFS='%'
    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
    shift
    IFS=$oIFS
    pathcomp=
    while test $# -ne 0 ; do
      pathcomp=$pathcomp$1
      shift
      if test ! -d "$pathcomp"; then
        $mkdirprog "$pathcomp"
 	# mkdir can fail with a `File exist' error in case several
 	# install-sh are creating the directory concurrently.  This
 	# is OK.
 	test -d "$pathcomp" || exit
      fi
      pathcomp=$pathcomp/
    done
  fi
  if test -n "$dir_arg"; then
    $doit $mkdircmd "$dst" \
      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
  else
    dstfile=`basename "$dst"`
    # Make a couple of temp file names in the proper directory.
    dsttmp=$dstdir/_inst.$$_
    rmtmp=$dstdir/_rm.$$_
    # Trap to clean up those temp files at exit.
    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
    trap '(exit $?); exit' 1 2 13 15
    # Copy the file name to the temp name.
    $doit $cpprog "$src" "$dsttmp" &&
    # and set any options; do chmod last to preserve setuid bits.
    #
    # If any of these fail, we abort the whole thing.  If we want to
    # ignore errors from any of these, just make sure not to ignore
    # errors from the above "$doit $cpprog $src $dsttmp" command.
    #
    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
    # Now rename the file to the real destination.
    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
      || {
 	   # The rename failed, perhaps because mv can't rename something else
 	   # to itself, or perhaps because mv is so ancient that it does not
 	   # support -f.
 	   # Now remove or move aside any old file at destination location.
 	   # We try this two ways since rm can't unlink itself on some
 	   # systems and the destination file might be busy for other
 	   # reasons.  In this case, the final cleanup might fail but the new
 	   # file should still install successfully.
 	   {
 	     if test -f "$dstdir/$dstfile"; then
 	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
 	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
 	       || {
 		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
 		 (exit 1); exit 1
 	       }
 	     else
 	       :
 	     fi
 	   } &&
 	   # Now rename the file to the real destination.
 	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
 	 }
    }
  fi || { (exit 1); exit 1; }
 done
 # The final little trick to "correctly" pass the exit status to the exit trap.
 {
  (exit 0); exit 0
 }
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-end: "$"
 # End:
--- a/autotools/ltmain.sh
+++ b/autotools/ltmain.sh
--- a/autotools/missing
+++ b/autotools/missing
@ -1,6 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
+
 scriptversion=2005-06-08.21
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 # This program is free software; you can redistribute it and/or modify
@ -15,8 +19,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02111-1307, USA.
+# 02110-1301, USA.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@ -38,18 +42,24 @@ else
  configure_ac=configure.in
 fi
 msg="missing on your system"
 case "$1" in
 --run)
  # Try to run requested program, and just exit if it succeeds.
  run=
  shift
  "$@" && exit 0
  # Exit code 63 means version mismatch.  This often happens
  # when the user try to use an ancient version of a tool on
  # a file that requires a minimum version.  In this case we
  # we should proceed has if the program had been absent, or
  # if --run hadn't been passed.
  if test $? = 63; then
    run=:
    msg="probably too old"
  fi
  ;;
 esac
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
 case "$1" in
  -h|--h|--he|--hel|--help)
    echo "\
@ -74,11 +84,15 @@ Supported PROGRAM values:
  lex          create \`lex.yy.c', if possible, from existing .c
  makeinfo     touch the output file
  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 Send bug reports to <bug-automake@gnu.org>."
    exit $?
    ;;
  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.4 - GNU automake"
+    echo "missing $scriptversion (GNU Automake)"
    exit $?
    ;;
  -*)
@ -87,14 +101,44 @@ Supported PROGRAM values:
    exit 1
    ;;
-  aclocal*)
+esac
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
 # the program).
 case "$1" in
  lex|yacc)
    # Not GNU programs, they don't have --version.
    ;;
  tar)
    if test -n "$run"; then
       echo 1>&2 "ERROR: \`tar' requires --run"
       exit 1
    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
       exit 1
    fi
    ;;
  *)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
       # Could not run --version or --help.  This is probably someone
       # running `$TOOL --version' or `$TOOL --help' to check whether
       # $TOOL exists and not knowing $TOOL uses missing.
       exit 1
    fi
    ;;
 esac
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
 case "$1" in
  aclocal*)
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
         to install the \`Automake' and \`Perl' packages.  Grab them from
         any GNU archive site."
@ -102,13 +146,8 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    ;;
  autoconf)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified \`${configure_ac}'.  You might want to install the
         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
         archive site."
@ -116,13 +155,8 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    ;;
  autoheader)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
         from any GNU archive site."
@ -140,13 +174,8 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    ;;
  automake*)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
         You might want to install the \`Automake' and \`Perl' packages.
         Grab them from any GNU archive site."
@ -156,16 +185,11 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    ;;
  autom4te)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
+WARNING: \`$1' is needed, but is $msg.
-         system.  You might have modified some files without having the
+         You might have modified some files without having the
         proper tools for further handling them.
-         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
+         You can get \`$1' as part of \`Autoconf' from any GNU
         archive site."
    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
@ -185,7 +209,7 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your
  bison|yacc)
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' $msg.  You should only need it if
         you modified a \`.y' file.  You may need the \`Bison' package
         in order for those modifications to take effect.  You can get
         \`Bison' from any GNU archive site."
@ -215,7 +239,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
  lex|flex)
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified a \`.l' file.  You may need the \`Flex' package
         in order for those modifications to take effect.  You can get
         \`Flex' from any GNU archive site."
@ -237,13 +261,8 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    ;;
  help2man)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
@ -262,32 +281,30 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    ;;
  makeinfo)
    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
       # We have makeinfo, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified a \`.texi' or \`.texinfo' file, or any other file
         indirectly affecting the aspect of the manual.  The spurious
         call might also be the consequence of using a buggy \`make' (AIX,
         DU, IRIX).  You might want to install the \`Texinfo' package or
         the \`GNU make' package.  Grab either from any GNU archive site."
    # The file to touch is that specified with -o ...
    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      # ... or it is the one specified with @setfilename ...
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
      # ... or it is derived from the source name (dir/f.texi becomes f.info)
      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
    fi
    # If the file does not exist, the user really needs makeinfo;
    # let's fail without touching anything.
    test -f $file || exit 1
    touch $file
    ;;
  tar)
    shift
    if test -n "$run"; then
      echo 1>&2 "ERROR: \`tar' requires --run"
      exit 1
    fi
    # We have already tried tar in the generic part.
    # Look for gnutar/gtar before invocation to avoid ugly error
@ -323,10 +340,10 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments.
  *)
    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
+WARNING: \`$1' is needed, and is $msg.
-         system.  You might have modified some files without having the
+         You might have modified some files without having the
         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
+         it often tells you about the needed prerequisites for installing
         this package.  You may also peek at any GNU archive site, in case
         some other package would contain this missing \`$1' program."
    exit 1
@ -334,3 +351,10 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your
 esac
 exit 0
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-end: "$"
 # End:
--- a/99
+++ b/99
@ -1,99 +0,0 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 # Copyright 1999, 2000 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 # Usage:
 # compile PROGRAM [ARGS]...
 # `-o FOO.o' is removed from the args passed to the actual compile.
 prog=$1
 shift
 ofile=
 cfile=
 args=
 while test $# -gt 0; do
   case "$1" in
    -o)
       # configure might choose to run compile as `compile cc -o foo foo.c'.
       # So we do something ugly here.
       ofile=$2
       shift
       case "$ofile" in
 	*.o | *.obj)
 	   ;;
 	*)
 	   args="$args -o $ofile"
 	   ofile=
 	   ;;
       esac
       ;;
    *.c)
       cfile=$1
       args="$args $1"
       ;;
    *)
       args="$args $1"
       ;;
   esac
   shift
 done
 if test -z "$ofile" || test -z "$cfile"; then
   # If no `-o' option was seen then we might have been invoked from a
   # pattern rule where we don't need one.  That is ok -- this is a
   # normal compilation that the losing compiler can handle.  If no
   # `.c' file was seen then we are probably linking.  That is also
   # ok.
   exec "$prog" $args
 fi
 # Name of file we expect compiler to create.
 cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
 # Create the lock directory.
 # Note: use `[/.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
 lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
 while true; do
   if mkdir $lockdir > /dev/null 2>&1; then
      break
   fi
   sleep 1
 done
 # FIXME: race condition here if user kills between mkdir and trap.
 trap "rmdir $lockdir; exit 1" 1 2 15
 # Run the compile.
 "$prog" $args
 status=$?
 if test -f "$cofile"; then
   mv "$cofile" "$ofile"
 fi
 rmdir $lockdir
 exit $status
--- a/5553
+++ b/5553
--- a/configure.ac
+++ b/configure.ac
@ -1,29 +1,39 @@
-# make sure we're interpreted by some minimal autoconf
+dnl Copyright (C) 2006 Google Inc.
 dnl
 dnl Licensed under the Apache License, Version 2.0 (the "License");
 dnl you may not use this file except in compliance with the License.
 dnl You may obtain a copy of the License at
 dnl
 dnl     http://www.apache.org/licenses/LICENSE-2.0
 dnl
 dnl Unless required by applicable law or agreed to in writing, software
 dnl distributed under the License is distributed on an "AS IS" BASIS,
 dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 dnl See the License for the specific language governing permissions and
 dnl limitations under the License.
 AC_PREREQ(2.57)
 AC_INIT(airbag, 0.1, opensource@google.com)
-# The argument here is just something that should be in the current directory
+dnl Sanity check: the argument is just a file that should exist.
 # (for sanity checking)
 AC_CONFIG_SRCDIR(README)
-AM_INIT_AUTOMAKE
+AC_CONFIG_AUX_DIR(autotools)
 AM_INIT_AUTOMAKE(subdir-objects)
 AM_CONFIG_HEADER(src/config.h)
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_CXX
 dnl Prevent AC_PROG_LIBTOOL from looking for Fortran support.  We don't use
 dnl any Fortran here.
 define(AC_PROG_F77)
 AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 # Check whether some low-level functions/files are available
 AC_HEADER_STDC
 # Find out what namespace 'normal' STL code lives in, and also what namespace
 # the user wants our classes to be defined in
 AC_CXX_STL_NAMESPACE
 AC_DEFINE_GOOGLE_NAMESPACE(google_airbag)
 # Write generated configuration file
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
--- a/251
+++ b/251
@ -1,251 +0,0 @@
 #!/bin/sh
 #
 # install - install a program, script, or datafile
 # This comes from X11R5 (mit/util/scripts/install.sh).
 #
 # Copyright 1991 by the Massachusetts Institute of Technology
 #
 # Permission to use, copy, modify, distribute, and sell this software and its
 # documentation for any purpose is hereby granted without fee, provided that
 # the above copyright notice appear in all copies and that both that
 # copyright notice and this permission notice appear in supporting
 # documentation, and that the name of M.I.T. not be used in advertising or
 # publicity pertaining to distribution of the software without specific,
 # written prior permission.  M.I.T. makes no representations about the
 # suitability of this software for any purpose.  It is provided "as is"
 # without express or implied warranty.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
 # from scratch.  It can only install one file at a time, a restriction
 # shared with many OS's install programs.
 # set DOITPROG to echo to test this script
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
 # put in absolute paths if you don't have them in your path; or use env. vars.
 mvprog="${MVPROG-mv}"
 cpprog="${CPPROG-cp}"
 chmodprog="${CHMODPROG-chmod}"
 chownprog="${CHOWNPROG-chown}"
 chgrpprog="${CHGRPPROG-chgrp}"
 stripprog="${STRIPPROG-strip}"
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 transformbasename=""
 transform_arg=""
 instcmd="$mvprog"
 chmodcmd="$chmodprog 0755"
 chowncmd=""
 chgrpcmd=""
 stripcmd=""
 rmcmd="$rmprog -f"
 mvcmd="$mvprog"
 src=""
 dst=""
 dir_arg=""
 while [ x"$1" != x ]; do
    case $1 in
 	-c) instcmd="$cpprog"
 	    shift
 	    continue;;
 	-d) dir_arg=true
 	    shift
 	    continue;;
 	-m) chmodcmd="$chmodprog $2"
 	    shift
 	    shift
 	    continue;;
 	-o) chowncmd="$chownprog $2"
 	    shift
 	    shift
 	    continue;;
 	-g) chgrpcmd="$chgrpprog $2"
 	    shift
 	    shift
 	    continue;;
 	-s) stripcmd="$stripprog"
 	    shift
 	    continue;;
 	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
 	    shift
 	    continue;;
 	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
 	    shift
 	    continue;;
 	*)  if [ x"$src" = x ]
 	    then
 		src=$1
 	    else
 		# this colon is to work around a 386BSD /bin/sh bug
 		:
 		dst=$1
 	    fi
 	    shift
 	    continue;;
    esac
 done
 if [ x"$src" = x ]
 then
 	echo "install:	no input file specified"
 	exit 1
 else
 	:
 fi
 if [ x"$dir_arg" != x ]; then
 	dst=$src
 	src=""
 	if [ -d $dst ]; then
 		instcmd=:
 		chmodcmd=""
 	else
 		instcmd=$mkdirprog
 	fi
 else
 # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
 # might cause directories to be created, which would be especially bad 
 # if $src (and thus $dsttmp) contains '*'.
 	if [ -f "$src" ] || [ -d "$src" ]
 	then
 		:
 	else
 		echo "install:  $src does not exist"
 		exit 1
 	fi
 	if [ x"$dst" = x ]
 	then
 		echo "install:	no destination specified"
 		exit 1
 	else
 		:
 	fi
 # If destination is a directory, append the input filename; if your system
 # does not like double slashes in filenames, you may need to add some logic
 	if [ -d $dst ]
 	then
 		dst="$dst"/`basename $src`
 	else
 		:
 	fi
 fi
 ## this sed command emulates the dirname command
 dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 # Make sure that the destination directory exists.
 #  this part is taken from Noah Friedman's mkinstalldirs script
 # Skip lots of stat calls in the usual case.
 if [ ! -d "$dstdir" ]; then
 defaultIFS='
 	'
 IFS="${IFS-${defaultIFS}}"
 oIFS="${IFS}"
 # Some sh's can't handle IFS=/ for some reason.
 IFS='%'
 set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
 IFS="${oIFS}"
 pathcomp=''
 while [ $# -ne 0 ] ; do
 	pathcomp="${pathcomp}${1}"
 	shift
 	if [ ! -d "${pathcomp}" ] ;
        then
 		$mkdirprog "${pathcomp}"
 	else
 		:
 	fi
 	pathcomp="${pathcomp}/"
 done
 fi
 if [ x"$dir_arg" != x ]
 then
 	$doit $instcmd $dst &&
 	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
 	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
 	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
 	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
 else
 # If we're going to rename the final executable, determine the name now.
 	if [ x"$transformarg" = x ] 
 	then
 		dstfile=`basename $dst`
 	else
 		dstfile=`basename $dst $transformbasename | 
 			sed $transformarg`$transformbasename
 	fi
 # don't allow the sed command to completely eliminate the filename
 	if [ x"$dstfile" = x ] 
 	then
 		dstfile=`basename $dst`
 	else
 		:
 	fi
 # Make a temp file name in the proper directory.
 	dsttmp=$dstdir/#inst.$$#
 # Move or copy the file name to the temp name
 	$doit $instcmd $src $dsttmp &&
 	trap "rm -f ${dsttmp}" 0 &&
 # and set any options; do chmod last to preserve setuid bits
 # If any of these fail, we abort the whole thing.  If we want to
 # ignore errors from any of these, just make sure not to ignore
 # errors from the above "$doit $instcmd $src $dsttmp" command.
 	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
 	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
 	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
 	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
 # Now rename the file to the real destination.
 	$doit $rmcmd -f $dstdir/$dstfile &&
 	$doit $mvcmd $dsttmp $dstdir/$dstfile 
 fi &&
 exit 0
--- a/99
+++ b/99
@ -1,99 +0,0 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 # Author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
 # Public domain
 errstatus=0
 dirmode=""
 usage="\
 Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
 # process command line arguments
 while test $# -gt 0 ; do
   case "${1}" in
     -h | --help | --h* )			# -h for help
 	echo "${usage}" 1>&2; exit 0 ;;
     -m )					# -m PERM arg
 	shift
 	test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
 	dirmode="${1}"
 	shift ;;
     -- ) shift; break ;;			# stop option processing
     -* ) echo "${usage}" 1>&2; exit 1 ;;	# unknown option
     * )  break ;;				# first non-opt arg
   esac
 done
 for file
 do
  if test -d "$file"; then
    shift
  else
    break
  fi
 done
 case $# in
 0) exit 0 ;;
 esac
 case $dirmode in
 '')
  if mkdir -p -- . 2>/dev/null; then
    echo "mkdir -p -- $*"
    exec mkdir -p -- "$@"
  fi ;;
 *)
  if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
    echo "mkdir -m $dirmode -p -- $*"
    exec mkdir -m "$dirmode" -p -- "$@"
  fi ;;
 esac
 for file
 do
   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
   shift
   pathcomp=
   for d
   do
     pathcomp="$pathcomp$d"
     case "$pathcomp" in
       -* ) pathcomp=./$pathcomp ;;
     esac
     if test ! -d "$pathcomp"; then
 	echo "mkdir $pathcomp"
 	mkdir "$pathcomp" || lasterr=$?
 	if test ! -d "$pathcomp"; then
 	  errstatus=$lasterr
 	else
 	  if test ! -z "$dirmode"; then
 	     echo "chmod $dirmode $pathcomp"
 	     lasterr=""
 	     chmod "$dirmode" "$pathcomp" || lasterr=$?
 	     if test ! -z "$lasterr"; then
 	       errstatus=$lasterr
 	     fi
 	  fi
 	fi
     fi
     pathcomp="$pathcomp/"
   done
 done
 exit $errstatus
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 3
 # End:
 # mkinstalldirs ends here
--- a/src/config.h.in
+++ b/src/config.h.in
@ -1,8 +1,5 @@
 /* src/config.h.in.  Generated from configure.ac by autoheader.  */
 /* Namespace for Google classes */
 #undef GOOGLE_NAMESPACE
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
@ -12,9 +9,6 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 /* define if the compiler implements namespaces */
 #undef HAVE_NAMESPACES
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
@ -57,14 +51,5 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 /* the namespace where STL code like vector<> is defined */
 #undef STL_NAMESPACE
 /* Version number of package */
 #undef VERSION
 /* Stops putting the code inside the Google namespace */
 #undef _END_GOOGLE_NAMESPACE_
 /* Puts following code inside the Google namespace */
 #undef _START_GOOGLE_NAMESPACE_
--- a/src/processor/source_line_resolver.cc
+++ b/src/processor/source_line_resolver.cc
@ -19,12 +19,12 @@
 #include <utility>
 #include "source_line_resolver.h"
-using STL_NAMESPACE::map;
+using std::map;
-using STL_NAMESPACE::vector;
+using std::vector;
-using STL_NAMESPACE::make_pair;
+using std::make_pair;
 using __gnu_cxx::hash;
-_START_GOOGLE_NAMESPACE_
+namespace google_airbag {
 void SourceLineResolver::SourceLineInfo::Reset() {
  function_name.clear();
@ -272,4 +272,4 @@ size_t SourceLineResolver::HashString::operator()(const string &s) const {
  return hash<const char*>()(s.c_str());
 }
-_END_GOOGLE_NAMESPACE_
+} // namespace google_airbag
--- a/src/processor/source_line_resolver.h
+++ b/src/processor/source_line_resolver.h
@ -23,9 +23,9 @@
 #include <string>
 #include <ext/hash_map>
-_START_GOOGLE_NAMESPACE_
+namespace google_airbag {
-using STL_NAMESPACE::string;
+using std::string;
 using __gnu_cxx::hash_map;
 class SourceLineResolver {
@ -83,6 +83,6 @@ class SourceLineResolver {
  void operator=(const SourceLineResolver&);
 };
-_END_GOOGLE_NAMESPACE_
+} // namespace google_airbag
 #endif  // _SOLURCE_LINE_RESOLVER_H__
--- a/src/processor/source_line_resolver_unittest.cc
+++ b/src/processor/source_line_resolver_unittest.cc
@ -16,8 +16,8 @@
 #include <string>
 #include "source_line_resolver.h"
-using STL_NAMESPACE::string;
+using std::string;
-using GOOGLE_NAMESPACE::SourceLineResolver;
+using google_airbag::SourceLineResolver;
 #define ASSERT_TRUE(cond) \
  if (!(cond)) {                                                        \
`@ -1,2 +1 @@`
	`opensource@google.com`	`opensource@google.com`