Merge lp:~statik/ubuntu/lucid/protobuf/merge-bug502654 into lp:ubuntu/lucid/protobuf

[Elliot Murphy]

[Elliot Murphy (statik)]

Merged from Debian, reviewed Ubuntu delta and it still looks sane and appropriate.

[Daniel Holbach (dholbach)]

As far as I can tell this has been merged into Lucid already.

=== modified file 'CHANGES.txt'
--- CHANGES.txt	2009-06-24 00:19:03 +0000
+++ CHANGES.txt	2010-01-18 04:34:17 +0000
@@ -1,4 +1,50 @@
-????-??-?? version 2.1.0:
[phone] version 2.2.0a:
+
+  There is probably no reason to install this release if you have arleady
+  installed 2.2.0.
+
+  C++
+  * Bumped binary interface version number, so that installing libprotobuf.so
+    v2.2.0 doesn't break already-compiled binaries that are linked against
+    v2.1.0.  This should have happened as part of the original 2.2.0 release,
+    but somehow was missed.
+
[phone] version 2.2.0:
+
+  C++
+  * Lite mode:  The "optimize_for = LITE_RUNTIME" option causes the compiler
+    to generate code which only depends libprotobuf-lite, which is much smaller
+    than libprotobuf but lacks descriptors, reflection, and some other features.
+  * Fixed bug where Message.Swap(Message) was only implemented for
+    optimize_for_speed.  Swap now properly implemented in both modes
+    (Issue 91).
+  * Added RemoveLast and SwapElements(index1, index2) to Reflection
+    interface for repeated elements.
+  * Added Swap(Message) to Reflection interface.
+  * Floating-point literals in generated code that are intended to be
+    single-precision now explicitly have 'f' suffix to avoid pedantic warnings
+    produced by some compilers.
+  * The [deprecated=true] option now causes the C++ code generator to generate
+    a GCC-style deprecation annotation (no-op on other compilers).
+  * google::protobuf::GetEnumDescriptor<SomeGeneratedEnumType>() returns the
+    EnumDescriptor for that type -- useful for templates which cannot call
+    SomeGeneratedEnumType_descriptor().
+  * Various optimizations and obscure bug fixes.
+
+  Java
+  * Lite mode:  The "optimize_for = LITE_RUNTIME" option causes the compiler
+    to generate code which only depends libprotobuf-lite, which is much smaller
+    than libprotobuf but lacks descriptors, reflection, and some other features.
+  * Lots of style cleanups.
+
+  Python
+  * Fixed endianness bug with floats and doubles.
+  * Text format parsing support.
+  * Fix bug with parsing packed repeated fields in embedded messages.
+  * Ability to initialize fields by passing keyword args to constructor.
+  * Support iterators in extend and __setslice__ for containers.
+
[phone] version 2.1.0:
 
   General
   * Repeated fields of primitive types (types other that string, group, and

=== modified file 'CONTRIBUTORS.txt'
--- CONTRIBUTORS.txt	2009-06-24 00:19:03 +0000
+++ CONTRIBUTORS.txt	2010-01-18 04:34:16 +0000
@@ -70,3 +70,5 @@
     * Small patch improving performance of in Python serialization.
   Alexandre Vassalotti <[e-mail]>
     * Emacs mode for Protocol Buffers (editors/protobuf-mode.el).
+  Scott Stafford <[e-mail]>
+    * Added Swap(), SwapElements(), and RemoveLast() to Reflection interface.

=== modified file 'Makefile.am'
--- Makefile.am	2009-06-24 00:19:03 +0000
+++ Makefile.am	2010-01-18 04:34:16 +0000
@@ -32,6 +32,9 @@
 	  cd gtest && $(MAKE) $(AM_MAKEFLAGS) clean; \
 	fi
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = protobuf.pc protobuf-lite.pc
+
 EXTRA_DIST =                                                                 \
   autogen.sh                                                                 \
   generate_descriptor_proto.sh                                               \
@@ -46,11 +49,13 @@
   vsprojects/config.h                                                        \
   vsprojects/extract_includes.bat                                            \
   vsprojects/libprotobuf.vcproj                                              \
+  vsprojects/libprotobuf-lite.vcproj                                         \
   vsprojects/libprotoc.vcproj                                                \
   vsprojects/protobuf.sln                                                    \
   vsprojects/protoc.vcproj                                                   \
   vsprojects/readme.txt                                                      \
   vsprojects/tests.vcproj                                                    \
+  vsprojects/lite-test.vcproj                                                \
   vsprojects/convert2008to2005.sh                                            \
   examples/README.txt                                                        \
   examples/Makefile                                                          \
@@ -62,6 +67,7 @@
   examples/add_person.py                                                     \
   examples/list_people.py                                                    \
   java/src/main/java/com/google/protobuf/AbstractMessage.java                \
+  java/src/main/java/com/google/protobuf/AbstractMessageLite.java            \
   java/src/main/java/com/google/protobuf/BlockingRpcChannel.java             \
   java/src/main/java/com/google/protobuf/BlockingService.java                \
   java/src/main/java/com/google/protobuf/ByteString.java                     \
@@ -70,10 +76,14 @@
   java/src/main/java/com/google/protobuf/Descriptors.java                    \
   java/src/main/java/com/google/protobuf/DynamicMessage.java                 \
   java/src/main/java/com/google/protobuf/ExtensionRegistry.java              \
+  java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java          \
   java/src/main/java/com/google/protobuf/FieldSet.java                       \
   java/src/main/java/com/google/protobuf/GeneratedMessage.java               \
+  java/src/main/java/com/google/protobuf/GeneratedMessageLite.java           \
+  java/src/main/java/com/google/protobuf/Internal.java                       \
   java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java \
   java/src/main/java/com/google/protobuf/Message.java                        \
+  java/src/main/java/com/google/protobuf/MessageLite.java                    \
   java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java            \
   java/src/main/java/com/google/protobuf/RpcCallback.java                    \
   java/src/main/java/com/google/protobuf/RpcChannel.java                     \
@@ -91,6 +101,7 @@
   java/src/test/java/com/google/protobuf/DescriptorsTest.java                \
   java/src/test/java/com/google/protobuf/DynamicMessageTest.java             \
   java/src/test/java/com/google/protobuf/GeneratedMessageTest.java           \
+  java/src/test/java/com/google/protobuf/LiteTest.java                       \
   java/src/test/java/com/google/protobuf/MessageTest.java                    \
   java/src/test/java/com/google/protobuf/ServiceTest.java                    \
   java/src/test/java/com/google/protobuf/TestUtil.java                       \
@@ -110,6 +121,7 @@
   python/google/protobuf/internal/input_stream.py                            \
   python/google/protobuf/internal/input_stream_test.py                       \
   python/google/protobuf/internal/message_listener.py                        \
+  python/google/protobuf/internal/message_test.py                            \
   python/google/protobuf/internal/more_extensions.proto                      \
   python/google/protobuf/internal/more_messages.proto                        \
   python/google/protobuf/internal/output_stream.py                           \
@@ -149,4 +161,9 @@
   missing                \
   mkinstalldirs          \
   config.h.in            \
-  stamp.h.in
+  stamp.h.in             \
+  m4/ltsugar.m4          \
+  m4/libtool.m4          \
+  m4/ltversion.m4        \
+  m4/lt~obsolete.m4      \
+  m4/ltoptions.m4

=== modified file 'Makefile.in'
--- Makefile.in	2009-06-24 00:19:03 +0000
+++ Makefile.in	2010-01-18 04:34:16 +0000
@@ -13,6 +13,7 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -31,9 +32,11 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+target_triplet = @target@
 subdir = .
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(srcdir)/protobuf-lite.pc.in $(srcdir)/protobuf.pc.in \
 	$(top_srcdir)/configure config.guess config.sub depcomp \
 	install-sh ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -49,7 +52,7 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = protobuf.pc protobuf-lite.pc
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -59,6 +62,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
+pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgconfig_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -106,6 +118,7 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ISAINFO = @ISAINFO@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -191,7 +204,11 @@
 srcdir = @srcdir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
+target = @target@
 target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4
@@ -203,6 +220,8 @@
 
 # Always include gtest in distributions.
 DIST_SUBDIRS = $(subdirs) src
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = protobuf.pc protobuf-lite.pc
 EXTRA_DIST = \
   autogen.sh                                                                 \
   generate_descriptor_proto.sh                                               \
@@ -217,11 +236,13 @@
   vsprojects/config.h                                                        \
   vsprojects/extract_includes.bat                                            \
   vsprojects/libprotobuf.vcproj                                              \
+  vsprojects/libprotobuf-lite.vcproj                                         \
   vsprojects/libprotoc.vcproj                                                \
   vsprojects/protobuf.sln                                                    \
   vsprojects/protoc.vcproj                                                   \
   vsprojects/readme.txt                                                      \
   vsprojects/tests.vcproj                                                    \
+  vsprojects/lite-test.vcproj                                                \
   vsprojects/convert2008to2005.sh                                            \
   examples/README.txt                                                        \
   examples/Makefile                                                          \
@@ -233,6 +254,7 @@
   examples/add_person.py                                                     \
   examples/list_people.py                                                    \
   java/src/main/java/com/google/protobuf/AbstractMessage.java                \
+  java/src/main/java/com/google/protobuf/AbstractMessageLite.java            \
   java/src/main/java/com/google/protobuf/BlockingRpcChannel.java             \
   java/src/main/java/com/google/protobuf/BlockingService.java                \
   java/src/main/java/com/google/protobuf/ByteString.java                     \
@@ -241,10 +263,14 @@
   java/src/main/java/com/google/protobuf/Descriptors.java                    \
   java/src/main/java/com/google/protobuf/DynamicMessage.java                 \
   java/src/main/java/com/google/protobuf/ExtensionRegistry.java              \
+  java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java          \
   java/src/main/java/com/google/protobuf/FieldSet.java                       \
   java/src/main/java/com/google/protobuf/GeneratedMessage.java               \
+  java/src/main/java/com/google/protobuf/GeneratedMessageLite.java           \
+  java/src/main/java/com/google/protobuf/Internal.java                       \
   java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java \
   java/src/main/java/com/google/protobuf/Message.java                        \
+  java/src/main/java/com/google/protobuf/MessageLite.java                    \
   java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java            \
   java/src/main/java/com/google/protobuf/RpcCallback.java                    \
   java/src/main/java/com/google/protobuf/RpcChannel.java                     \
@@ -262,6 +288,7 @@
   java/src/test/java/com/google/protobuf/DescriptorsTest.java                \
   java/src/test/java/com/google/protobuf/DynamicMessageTest.java             \
   java/src/test/java/com/google/protobuf/GeneratedMessageTest.java           \
+  java/src/test/java/com/google/protobuf/LiteTest.java                       \
   java/src/test/java/com/google/protobuf/MessageTest.java                    \
   java/src/test/java/com/google/protobuf/ServiceTest.java                    \
   java/src/test/java/com/google/protobuf/TestUtil.java                       \
@@ -281,6 +308,7 @@
   python/google/protobuf/internal/input_stream.py                            \
   python/google/protobuf/internal/input_stream_test.py                       \
   python/google/protobuf/internal/message_listener.py                        \
+  python/google/protobuf/internal/message_test.py                            \
   python/google/protobuf/internal/more_extensions.proto                      \
   python/google/protobuf/internal/more_messages.proto                        \
   python/google/protobuf/internal/output_stream.py                           \
@@ -321,7 +349,12 @@
   missing                \
   mkinstalldirs          \
   config.h.in            \
-  stamp.h.in
+  stamp.h.in             \
+  m4/ltsugar.m4          \
+  m4/libtool.m4          \
+  m4/ltversion.m4        \
+  m4/lt~obsolete.m4      \
+  m4/ltoptions.m4
 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -377,6 +410,10 @@
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
+protobuf.pc: $(top_builddir)/config.status $(srcdir)/protobuf.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+protobuf-lite.pc: $(top_builddir)/config.status $(srcdir)/protobuf-lite.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -386,6 +423,23 @@
 
 distclean-libtool:
 	-rm -f libtool
+install-pkgconfigDATA: $(pkgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+	@list='$(pkgconfig_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+	done
+
+uninstall-pkgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgconfig_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+	done
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -668,9 +722,12 @@
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-recursive
-all-am: Makefile config.h
+all-am: Makefile $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -716,7 +773,7 @@
 
 info-am:
 
-install-data-am:
+install-data-am: install-pkgconfigDATA
 
 install-dvi: install-dvi-recursive
 
@@ -752,7 +809,7 @@
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-pkgconfigDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -767,12 +824,12 @@
 	info-am install install-am install-data install-data-am \
 	install-dvi install-dvi-am install-exec install-exec-am \
 	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
+	install-man install-pdf install-pdf-am install-pkgconfigDATA \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+	uninstall uninstall-am uninstall-pkgconfigDATA
 
 
 # Build gtest before we build protobuf tests.  We don't add gtest to SUBDIRS

=== modified file 'README.txt'
--- README.txt	2009-06-24 00:19:03 +0000
+++ README.txt	2010-01-18 04:34:17 +0000
@@ -33,6 +33,44 @@
   If you already built the package with a different prefix, make sure
   to run "make clean" before building again.
 
+** Compiling dependent packages **
+
+  To compile a package that uses Protocol Buffers, you need to pass
+  various flags to your compiler and linker.  As of version 2.2.0,
+  Protocol Buffers integrates with pkg-config to manage this.  If you
+  have pkg-config installed, then you can invoke it to get a list of
+  flags like so:
+
+    pkg-config --cflags protobuf         # print compiler flags
+    pkg-config --libs protobuf           # print linker flags
+    pkg-config --cflags --libs protobuf  # print both
+
+  For example:
+
+    c++ my_program.cc my_proto.pb.cc `pkg-config --cflags --libs protobuf`
+
+  Note that packages written prior to the 2.2.0 release of Protocol
+  Buffers may not yet integrate with pkg-config to get flags, and may
+  not pass the correct set of flags to correctly link against
+  libprotobuf.  If the package in question uses autoconf, you can
+  often fix the problem by invoking its configure script like:
+
+    configure CXXFLAGS="$(pkg-config --cflags protobuf)" \
+              LIBS="$(pkg-config --libs protobuf)"
+
+  This will force it to use the correct flags.
+
+  If you are writing an autoconf-based package that uses Protocol
+  Buffers, you should probably use the PKG_CHECK_MODULES macro in your
+  configure script like:
+
+    PKG_CHECK_MODULES([protobuf], [protobuf])
+
+  See the pkg-config man page for more info.
+
+  If you only want protobuf-lite, substitute "protobuf-lite" in place
+  of "protobuf" in these examples.
+
 ** Note for cross-compiling **
 
   The makefiles normally invoke the protoc executable that they just

=== modified file 'autogen.sh'
--- autogen.sh	2009-06-24 00:19:03 +0000
+++ autogen.sh	2010-01-18 04:34:16 +0000
@@ -13,23 +13,16 @@
   exit 1
 fi
 
-if test ! -d gtest; then
-  echo "gtest bundle not present.  Downloading gtest-1.3.0 automatically." >&2
-  set -ex
-  curl http://googletest.googlecode.com/files/gtest-1.3.0.tar.bz2 | tar jx
-  mv gtest-1.3.0 gtest
+set -ex
 
-  # Temporary hack:  Must change C runtime library to "multi-threaded DLL",
-  #   otherwise it will be set to "multi-threaded static" when MSVC upgrades
-  #   the project file to MSVC 2005/2008.  vladl of Google Test says gtest will
-  #   probably change their default to match, then this will be unnecessary.
-  #   One of these mappings converts the debug configuration and the other
-  #   converts the release configuration.  I don't know which is which.
-  sed -i -e 's/RuntimeLibrary="5"/RuntimeLibrary="3"/g;
-             s/RuntimeLibrary="4"/RuntimeLibrary="2"/g;' gtest/msvc/*.vcproj
-else
-  set -ex
-fi
+# Temporary hack:  Must change C runtime library to "multi-threaded DLL",
+#   otherwise it will be set to "multi-threaded static" when MSVC upgrades
+#   the project file to MSVC 2005/2008.  vladl of Google Test says gtest will
+#   probably change their default to match, then this will be unnecessary.
+#   One of these mappings converts the debug configuration and the other
+#   converts the release configuration.  I don't know which is which.
+sed -i -e 's/RuntimeLibrary="5"/RuntimeLibrary="3"/g;
+           s/RuntimeLibrary="4"/RuntimeLibrary="2"/g;' gtest/msvc/*.vcproj
 
 # TODO(kenton):  Remove the ",no-obsolete" part and fix the resulting warnings.
 autoreconf -f -i -Wall,no-obsolete

=== modified file 'configure'
--- configure	2009-06-24 00:19:03 +0000
+++ configure	2010-01-18 04:34:17 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Protocol Buffers 2.1.0.
+# Generated by GNU Autoconf 2.61 for Protocol Buffers 2.2.0a.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -723,8 +723,8 @@
 # Identity of this package.
 PACKAGE_NAME='Protocol Buffers'
 PACKAGE_TARNAME='protobuf'
-PACKAGE_VERSION='2.1.0'
-PACKAGE_STRING='Protocol Buffers 2.1.0'
+PACKAGE_VERSION='2.2.0a'
+PACKAGE_STRING='Protocol Buffers 2.2.0a'
 PACKAGE_BUGREPORT='[e-mail]'
 
 ac_unique_file="src/google/protobuf/message.cc"
@@ -801,6 +801,18 @@
 build_alias
 host_alias
 target_alias
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+target
+target_cpu
+target_vendor
+target_os
 INSTALL_PROGRAM
 INSTALL_SCRIPT
 INSTALL_DATA
@@ -848,15 +860,11 @@
 CXXCPP
 GREP
 EGREP
+GCC_TRUE
+GCC_FALSE
+PROTOBUF_OPT_FLAG
+ISAINFO
 LIBTOOL
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
 SED
 FGREP
 LD
@@ -872,9 +880,6 @@
 LIPO
 OTOOL
 OTOOL64
-GCC_TRUE
-GCC_FALSE
-PROTOBUF_OPT_FLAG
 LIBOBJS
 POW_LIB
 HAVE_ZLIB_TRUE
@@ -1403,7 +1408,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Protocol Buffers 2.1.0 to adapt to many kinds of systems.
+\`configure' configures Protocol Buffers 2.2.0a to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1468,12 +1473,13 @@
 System types:
   --build=BUILD     configure for building on BUILD [guessed]
   --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+  --target=TARGET   configure for building compilers for TARGET [HOST]
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Protocol Buffers 2.1.0:";;
+     short | recursive ) echo "Configuration of Protocol Buffers 2.2.0a:";;
    esac
   cat <<\_ACEOF
 
@@ -1482,6 +1488,7 @@
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
+  --disable-64bit-solaris Build 64 bit binary on Solaris [default=on]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
@@ -1576,7 +1583,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Protocol Buffers configure 2.1.0
+Protocol Buffers configure 2.2.0a
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1590,7 +1597,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Protocol Buffers $as_me 2.1.0, which was
+It was created by Protocol Buffers $as_me 2.2.0a, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1944,20 +1951,22 @@
 
 
 
-# Detect whether the user specified their own compilation flags.  If so then
-# we want to respect their decision, otherwise we will twiddle them later.
-if test "$CXXFLAGS" = ""; then
-
-  protobuf_default_cxxflags=yes
-
-fi
-
 
 
 ac_config_headers="$ac_config_headers config.h"
 
 
-am__api_version='1.10'
+
+# autoconf's default CXXFLAGS are usually "-g -O2".  These aren't necessarily
+# the best choice for libprotobuf.
+if test "x${ac_cv_env_CFLAGS_set}" = "x"; then
+  CFLAGS=""
+fi
+
+if test "x${ac_cv_env_CXXFLAGS_set}" = "x"; then
+  CXXFLAGS=""
+fi
+
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -1990,6 +1999,135 @@
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+if test "${ac_cv_build+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+if test "${ac_cv_host+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+{ echo "$as_me:$LINENO: checking target system type" >&5
+echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+if test "${ac_cv_target+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "x$target_alias" = x; then
+  ac_cv_target=$ac_cv_host
+else
+  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+echo "${ECHO_T}$ac_cv_target" >&6; }
+case $ac_cv_target in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
+echo "$as_me: error: invalid value of canonical target" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+target=$ac_cv_target
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_target
+shift
+target_cpu=$1
+target_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+target_os=$*
+IFS=$ac_save_IFS
+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+test -n "$target_alias" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_prefix=${target_alias}-
+
+am__api_version='1.10'
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -2294,7 +2432,7 @@
 
 # Define the identity of the package.
  PACKAGE='protobuf'
- VERSION='2.1.0'
+ VERSION='2.2.0a'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4929,6 +5067,237 @@
 
 
 
+ if test "$GCC" = yes; then
+  GCC_TRUE=
+  GCC_FALSE='#'
+else
+  GCC_TRUE='#'
+  GCC_FALSE=
+fi
+   # let the Makefile know if we're gcc
+
+# test_util.cc takes forever to compile with GCC and optimization turned on.
+{ echo "$as_me:$LINENO: checking C++ compiler flags..." >&5
+echo $ECHO_N "checking C++ compiler flags...... $ECHO_C" >&6; }
+if test "x${ac_cv_env_CXXFLAGS_set}" = "x"; then
+
+  if test "$GCC" = "yes"; then
+
+    PROTOBUF_OPT_FLAG="-O2"
+    CXXFLAGS="${CXXFLAGS} -g"
+
+fi
+
+
+  # Protocol Buffers contains several checks that are intended to be used only
+  # for debugging and which might hurt performance.  Most users are probably
+  # end users who don't want these checks, so add -DNDEBUG by default.
+  CXXFLAGS="$CXXFLAGS -DNDEBUG"
+
+  { echo "$as_me:$LINENO: result: use default: $PROTOBUF_OPT_FLAG $CXXFLAGS" >&5
+echo "${ECHO_T}use default: $PROTOBUF_OPT_FLAG $CXXFLAGS" >&6; }
+
+else
+
+  { echo "$as_me:$LINENO: result: use user-supplied: $CXXFLAGS" >&5
+echo "${ECHO_T}use user-supplied: $CXXFLAGS" >&6; }
+
+fi
+
+
+
+
+
+
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+  { echo "$as_me:$LINENO: checking whether __SUNPRO_CC is declared" >&5
+echo $ECHO_N "checking whether __SUNPRO_CC is declared... $ECHO_C" >&6; }
+if test "${ac_cv_have_decl___SUNPRO_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+#ifndef __SUNPRO_CC
+  (void) __SUNPRO_CC;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl___SUNPRO_CC=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl___SUNPRO_CC=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_CC" >&5
+echo "${ECHO_T}$ac_cv_have_decl___SUNPRO_CC" >&6; }
+if test $ac_cv_have_decl___SUNPRO_CC = yes; then
+  SUNCC="yes"
+else
+  SUNCC="no"
+fi
+
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+
+  # Check whether --enable-64bit-solaris was given.
+if test "${enable_64bit_solaris+set}" = set; then
+  enableval=$enable_64bit_solaris; ac_enable_64bit="$enableval"
+else
+  ac_enable_64bit="yes"
+fi
+
+
+  if test "$SUNCC" = "yes" -a "x${ac_cv_env_CXXFLAGS_set}" = "x"; then
+
+            CXXFLAGS="-g0 -xO3 -xlibmil -xdepend -xbuiltin -mt -compat=5 -library=stlport4 -template=no%extdef ${CXXFLAGS}"
+
+fi
+
+
+  case $host_os in
+    *solaris*)
+      for ac_prog in isainfo
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ISAINFO+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ISAINFO"; then
+  ac_cv_prog_ISAINFO="$ISAINFO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ISAINFO="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ISAINFO=$ac_cv_prog_ISAINFO
+if test -n "$ISAINFO"; then
+  { echo "$as_me:$LINENO: result: $ISAINFO" >&5
+echo "${ECHO_T}$ISAINFO" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+  test -n "$ISAINFO" && break
+done
+test -n "$ISAINFO" || ISAINFO="no"
+
+      if test "x$ISAINFO" != "xno"; then
+  isainfo_b=`${ISAINFO} -b`
+else
+  isainfo_b="x"
+fi
+
+
+      if test "$isainfo_b" != "x"; then
+
+
+        isainfo_k=`${ISAINFO} -k`
+
+        if test "x$ac_enable_64bit" = "xyes"; then
+
+
+          if test "x${ac_cv_env_LDFLAGS_set}" = "x"; then
+
+            LDFLAGS="-L/usr/local/lib/${isainfo_k} ${LDFLAGS}"
+
+fi
+
+
+          if test "x$libdir" = "x\${exec_prefix}/lib"; then
+
+                                 libdir="${libdir}/${isainfo_k}"
+
+fi
+
+
+                              if test "x${ac_cv_env_CXXFLAGS_set}" = "x"; then
+
+            CXXFLAGS="${CXXFLAGS} -m64"
+            ac_cv_env_CXXFLAGS_set=set
+            ac_cv_env_CXXFLAGS_value='-m64'
+
+fi
+
+
+          if test "$target_cpu" = "sparc" -a "x$SUNCC" = "xyes" ; then
+
+            CXXFLAGS="-xmemalign=8s ${CXXFLAGS}"
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+
+
+# Have to do libtool after SUNCC, other wise it "helpfully" adds Crun Cstd
+# to the link
 case `pwd` in
   *\ * | *\	*)
     { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -4954,89 +5323,6 @@
 
 ltmain="$ac_aux_dir/ltmain.sh"
 
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
 { echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
 echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
 if test "${ac_cv_path_SED+set}" = set; then
@@ -5528,13 +5814,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5531: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5817: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5534: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5820: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5537: output\"" >&5)
+  (eval echo "\"\$as_me:5823: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6645,7 +6931,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6648 "configure"' > conftest.$ac_ext
+  echo '#line 6934 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8726,11 +9012,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8729: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9015: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8733: \$? = $ac_status" >&5
+   echo "$as_me:9019: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9050,11 +9336,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9053: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9339: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9057: \$? = $ac_status" >&5
+   echo "$as_me:9343: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9155,11 +9441,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9158: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9444: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9162: \$? = $ac_status" >&5
+   echo "$as_me:9448: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9210,11 +9496,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9213: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9499: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9217: \$? = $ac_status" >&5
+   echo "$as_me:9503: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11958,7 +12244,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11961 "configure"
+#line 12247 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12058,7 +12344,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12061 "configure"
+#line 12347 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14061,11 +14347,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14064: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14350: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14068: \$? = $ac_status" >&5
+   echo "$as_me:14354: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14160,11 +14446,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14163: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14449: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14167: \$? = $ac_status" >&5
+   echo "$as_me:14453: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14212,11 +14498,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14215: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14501: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14219: \$? = $ac_status" >&5
+   echo "$as_me:14505: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15192,143 +15478,6 @@
 # Only expand once:
 
 
- if test "$GCC" = yes; then
-  GCC_TRUE=
-  GCC_FALSE='#'
-else
-  GCC_TRUE='#'
-  GCC_FALSE=
-fi
-   # let the Makefile know if we're gcc
-
-# autoconf's default CXXFLAGS are usually "-g -O2".  These aren't necessarily
-# the best choice for libprotobuf.
-{ echo "$as_me:$LINENO: checking C++ compiler flags..." >&5
-echo $ECHO_N "checking C++ compiler flags...... $ECHO_C" >&6; }
-if test "$protobuf_default_cxxflags" = "yes"; then
-
-
-  # test_util.cc takes forever to compile with GCC and optimization turned on.
-  # But we cannot override anything that is part of CXXFLAGS since it is the
-  # last thing added to the command line.  The automake docs insist that you
-  # should never want to override CXXFLAGS because they represent the intent of
-  # the user, and the user knows best.  But if the user actually did not set
-  # any CXXFLAGS, then AC_PROG_CXX sets them to a rather arbitrary default.
-  # That's not user intent at all, but automake still treats it like it is.
-  # Grr.  Anyway, getting back to the point, this hack here strips out the -O
-  # flag from autoconf's defaults and puts it into another variable so that
-  # we can override it.  BTW, m4 escaping sucks.
-  PROTOBUF_OPT_FLAG=`echo "$CXXFLAGS" | grep -o '\-O[0-9]\?'`
-  CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ \?-O[0-9]\?//g'`
-
-  # Protocol Buffers contains several checks that are intended to be used only
-  # for debugging and which might hurt performance.  Most users are probably
-  # end users who don't want these checks, so add -DNDEBUG by default.
-  CXXFLAGS="$CXXFLAGS -DNDEBUG"
-
-  { echo "$as_me:$LINENO: result: use default: $PROTOBUF_OPT_FLAG $CXXFLAGS" >&5
-echo "${ECHO_T}use default: $PROTOBUF_OPT_FLAG $CXXFLAGS" >&6; }
-
-else
-
-  PROTOBUF_OPT_FLAG=
-  { echo "$as_me:$LINENO: result: use user-supplied: $CXXFLAGS" >&5
-echo "${ECHO_T}use user-supplied: $CXXFLAGS" >&6; }
-
-fi
-
-
-
-
-
-
-  { echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5
-echo $ECHO_N "checking whether __SUNPRO_C is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-#ifndef __SUNPRO_C
-  (void) __SUNPRO_C;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl___SUNPRO_C=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl___SUNPRO_C=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5
-echo "${ECHO_T}$ac_cv_have_decl___SUNPRO_C" >&6; }
-if test $ac_cv_have_decl___SUNPRO_C = yes; then
-  SUNCC="yes"
-else
-  SUNCC="no"
-fi
-
-
-  if test "$SUNCC" = "yes"; then
-
-    isainfo_k=`isainfo -k`
-    if test "$target_cpu" = "sparc"; then
-
-      MEMALIGN_FLAGS="-xmemalign=8s"
-      IS_64="-m64"
-      LDFLAGS="${LDFLAGS} -L/usr/lib/${isainfo_k} -L/usr/local/lib/${isainfo_k}"
-
-else
-
-      if test "$isainfo_k" = "amd64"; then
-
-        IS_64="-m64"
-        LDFLAGS="${LDFLAGS} -L/usr/lib/${isainfo_k} -L/usr/local/lib/${isainfo_k}"
-
-fi
-
-
-fi
-
-
-    CFLAGS="-g -xO4 -xlibmil -xdepend -Xa -mt -xstrconst ${IS_64} ${MEMALIGN_FLAGS} $CFLAGS"
-    CXXFLAGS="-g -xO4 -xlibmil -mt ${IS_64} ${MEMALIGN_FLAGS} -xlang=c99 -compat=5 -library=stlport4 -template=no%extdef $CXXFLAGS"
-
-fi
-
-
 
 # Checks for header files.
 { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
@@ -17039,10 +17188,13 @@
    fi
 
 
+# HACK:  Make gtest's configure script pick up our copy of CXXFLAGS, since the
+#   flags added by ACX_CHECK_SUNCC must be used when compiling gtest too.
+export CXXFLAGS
 subdirs="$subdirs gtest"
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile protobuf.pc protobuf-lite.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -17161,13 +17313,6 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${GCC_TRUE}" && test -z "${GCC_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"GCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -17175,6 +17320,13 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${HAVE_ZLIB_TRUE}" && test -z "${HAVE_ZLIB_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"HAVE_ZLIB\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -17489,7 +17641,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Protocol Buffers $as_me 2.1.0, which was
+This file was extended by Protocol Buffers $as_me 2.2.0a, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17542,7 +17694,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Protocol Buffers config.status 2.1.0
+Protocol Buffers config.status 2.2.0a
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -18010,6 +18162,8 @@
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "protobuf.pc") CONFIG_FILES="$CONFIG_FILES protobuf.pc" ;;
+    "protobuf-lite.pc") CONFIG_FILES="$CONFIG_FILES protobuf-lite.pc" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -18109,6 +18263,18 @@
 build_alias!$build_alias$ac_delim
 host_alias!$host_alias$ac_delim
 target_alias!$target_alias$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
+target!$target$ac_delim
+target_cpu!$target_cpu$ac_delim
+target_vendor!$target_vendor$ac_delim
+target_os!$target_os$ac_delim
 INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
 INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
 INSTALL_DATA!$INSTALL_DATA$ac_delim
@@ -18156,60 +18322,56 @@
 CXXCPP!$CXXCPP$ac_delim
 GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
+GCC_TRUE!$GCC_TRUE$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
+_ACEOF
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+GCC_FALSE!$GCC_FALSE$ac_delim
+PROTOBUF_OPT_FLAG!$PROTOBUF_OPT_FLAG$ac_delim
+ISAINFO!$ISAINFO$ac_delim
 LIBTOOL!$LIBTOOL$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
 SED!$SED$ac_delim
 FGREP!$FGREP$ac_delim
 LD!$LD$ac_delim
 DUMPBIN!$DUMPBIN$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
 ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim
 NM!$NM$ac_delim
 LN_S!$LN_S$ac_delim
@@ -18221,9 +18383,6 @@
 LIPO!$LIPO$ac_delim
 OTOOL!$OTOOL$ac_delim
 OTOOL64!$OTOOL64$ac_delim
-GCC_TRUE!$GCC_TRUE$ac_delim
-GCC_FALSE!$GCC_FALSE$ac_delim
-PROTOBUF_OPT_FLAG!$PROTOBUF_OPT_FLAG$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 POW_LIB!$POW_LIB$ac_delim
 HAVE_ZLIB_TRUE!$HAVE_ZLIB_TRUE$ac_delim
@@ -18239,7 +18398,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 27; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

=== modified file 'configure.ac'
--- configure.ac	2009-06-24 00:19:03 +0000
+++ configure.ac	2010-01-18 04:34:17 +0000
@@ -12,17 +12,22 @@
 # In the SVN trunk, the version should always be the next anticipated release
 # version with the "-pre" suffix.  (We used to use "-SNAPSHOT" but this pushed
 # the size of one file name in the dist tarfile over the 99-char limit.)
-AC_INIT([Protocol Buffers],[2.1.0],[[e-mail]],[protobuf])
+AC_INIT([Protocol Buffers],[2.2.0a],[[e-mail]],[protobuf])
 
-# Detect whether the user specified their own compilation flags.  If so then
-# we want to respect their decision, otherwise we will twiddle them later.
-AS_IF([test "$CXXFLAGS" = ""],[
-  protobuf_default_cxxflags=yes
-])
 
 AC_CONFIG_SRCDIR(src/google/protobuf/message.cc)
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
+
+# autoconf's default CXXFLAGS are usually "-g -O2".  These aren't necessarily
+# the best choice for libprotobuf.
+AS_IF([test "x${ac_cv_env_CFLAGS_set}" = "x"],
+      [CFLAGS=""])
+AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],
+      [CXXFLAGS=""])
+
+AC_CANONICAL_TARGET
+
 AM_INIT_AUTOMAKE
 
 AC_ARG_WITH([zlib],
@@ -40,26 +45,15 @@
 AC_PROG_CXX
 AC_LANG([C++])
 ACX_USE_SYSTEM_EXTENSIONS
-AC_PROG_LIBTOOL
 AM_CONDITIONAL(GCC, test "$GCC" = yes)   # let the Makefile know if we're gcc
 
-# autoconf's default CXXFLAGS are usually "-g -O2".  These aren't necessarily
-# the best choice for libprotobuf.
+# test_util.cc takes forever to compile with GCC and optimization turned on.
 AC_MSG_CHECKING([C++ compiler flags...])
-AS_IF([test "$protobuf_default_cxxflags" = "yes"],[
-
-  # test_util.cc takes forever to compile with GCC and optimization turned on.
-  # But we cannot override anything that is part of CXXFLAGS since it is the
-  # last thing added to the command line.  The automake docs insist that you
-  # should never want to override CXXFLAGS because they represent the intent of
-  # the user, and the user knows best.  But if the user actually did not set
-  # any CXXFLAGS, then AC_PROG_CXX sets them to a rather arbitrary default.
-  # That's not user intent at all, but automake still treats it like it is.
-  # Grr.  Anyway, getting back to the point, this hack here strips out the -O
-  # flag from autoconf's defaults and puts it into another variable so that
-  # we can override it.  BTW, m4 escaping sucks.
-  PROTOBUF_OPT_FLAG=`echo "$CXXFLAGS" | grep -o '\-O@<:@0-9@:>@\?'`
-  CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ \?-O@<:@0-9@:>@\?//g'`
+AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],[
+  AS_IF([test "$GCC" = "yes"],[
+    PROTOBUF_OPT_FLAG="-O2"
+    CXXFLAGS="${CXXFLAGS} -g"
+  ])
 
   # Protocol Buffers contains several checks that are intended to be used only
   # for debugging and which might hurt performance.  Most users are probably
@@ -68,7 +62,6 @@
 
   AC_MSG_RESULT([use default: $PROTOBUF_OPT_FLAG $CXXFLAGS])
 ],[
-  PROTOBUF_OPT_FLAG=
   AC_MSG_RESULT([use user-supplied: $CXXFLAGS])
 ])
 
@@ -76,6 +69,10 @@
 
 ACX_CHECK_SUNCC
 
+# Have to do libtool after SUNCC, other wise it "helpfully" adds Crun Cstd
+# to the link
+AC_PROG_LIBTOOL
+
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h stdlib.h unistd.h])
@@ -117,7 +114,10 @@
 ACX_PTHREAD
 AC_CXX_STL_HASH
 
+# HACK:  Make gtest's configure script pick up our copy of CXXFLAGS, since the
+#   flags added by ACX_CHECK_SUNCC must be used when compiling gtest too.
+export CXXFLAGS
 AC_CONFIG_SUBDIRS([gtest])
 
-AC_CONFIG_FILES([Makefile src/Makefile ])
+AC_CONFIG_FILES([Makefile src/Makefile protobuf.pc protobuf-lite.pc])
 AC_OUTPUT

=== modified file 'debian/changelog'
--- debian/changelog	2009-11-16 10:41:33 +0000
+++ debian/changelog	2010-01-18 04:34:17 +0000
@@ -1,3 +1,39 @@
+protobuf (2.2.0a-0.1ubuntu1) lucid; urgency=low
+
+  * Merge from Debian (LP: #502654)
+  * Remaining Ubuntu changes:
+    - Disable the death tests on IA64, now as a quilt patch.
+    - Don't hardcode python2.4, also as a quilt patch.
+
+ -- Elliot Murphy <[e-mail]>  Sun, 17 Jan 2010 23:21:58 -0500
+
+protobuf (2.2.0a-0.1) unstable; urgency=low
+
+  * Non-maintainer upload 
+  * New upstream release made this evening correction major SONAME
+  * debian/control: Updated major version to 5 		(Closes: #556563)
+  * debian/rules: Updated two links to use libproto*5 
+  * debian/libprotobuf5.shlibs: Added
+  * debian/libprotoc5.shlibs: Added
+  
+ -- Dirk Eddelbuettel <[e-mail]>  Wed, 18 Nov 2009 21:47:41 -0600
+
+protobuf (2.2.0-0.1) unstable; urgency=low
+
+  * Non-maintainer upload coordinated with maintainer
+  * New upstream release				(Closes: #551931)
+
+  * debian/libprotobuf-install: Added 'usr/lib/pkgconfig/*' to have 
+    pkg-config support files installed 
+
+  * debian/control: Added (= ${binary:Version}) to Depends for -dev 
+    packages for tighter link to underlying libraries [lintian warning]
+  * debian/control: Updated StandardVersion: to 3.8.3
+  
+  * debian/control: Major version not incremented as upstream kept it at 4
+  
+ -- Dirk Eddelbuettel <[e-mail]>  Sat, 14 Nov 2009 06:44:22 -0600
+
 protobuf (2.1.0-1ubuntu1) lucid; urgency=low
 
   * Merge from Debian testing.

=== modified file 'debian/control'
--- debian/control	2009-11-16 10:41:33 +0000
+++ debian/control	2010-01-18 04:34:17 +0000
@@ -5,12 +5,12 @@
 XSBC-Original-Maintainer: Iustin Pop <[e-mail]>
 Build-Depends: debhelper (>= 7), python (>= 2.3.5-11), python-setuptools (>= 0.6c8), xmlto, ant, quilt, zlib1g-dev
 Build-Depends-Indep: python-support (>= 0.6), openjdk-6-jdk
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Homepage: http://code.google.com/p/protobuf/
 Vcs-Browser: http://git.debian.org/?p=collab-maint/protobuf.git
 Vcs-Git: git://git.debian.org/git/collab-maint/protobuf.git
 
-Package: libprotobuf4
+Package: libprotobuf5
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: protocol buffers C++ library
@@ -30,7 +30,7 @@
 Package: libprotobuf-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libprotobuf4
+Depends: ${shlibs:Depends}, ${misc:Depends}, libprotobuf5 (= ${binary:Version})
 Description: protocol buffers C++ library (development headers)
  Protocol buffers are a flexible, efficient, automated mechanism for
  serializing structured data - similar to XML, but smaller, faster, and
@@ -46,7 +46,7 @@
  This package contains the development libraries needed for writing C++
  applications.
 
-Package: libprotoc4
+Package: libprotoc5
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: protocol buffers compiler library
@@ -67,7 +67,7 @@
 Package: libprotoc-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libprotoc4, libprotobuf-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libprotoc5 (= ${binary:Version}), libprotobuf-dev (= ${binary:Version})
 Replaces: libprotobuf-dev (<< 2.1.0)
 Conflicts: libprotobuf-dev (<< 2.1.0)
 Description: protocol buffers compiler library (development headers)
@@ -87,7 +87,7 @@
 
 Package: protobuf-compiler
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libprotoc4 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libprotoc5 (= ${binary:Version})
 Description: compiler for protocol buffer definition files
  Protocol buffers are a flexible, efficient, automated mechanism for
  serializing structured data - similar to XML, but smaller, faster, and

=== modified file 'debian/java-build.xml'
--- debian/java-build.xml	2009-11-16 10:41:33 +0000
+++ debian/java-build.xml	2010-01-18 04:34:16 +0000
@@ -28,6 +28,6 @@
     </target>
 
     <target name="jar" depends="compile">
-        <jar destfile="${targetdir}/protobuf-2.1.0.jar" basedir="${classesdir}" />
+        <jar destfile="${targetdir}/protobuf-2.2.0.jar" basedir="${classesdir}" />
     </target>
 </project>

=== modified file 'debian/libprotobuf-dev.install'
--- debian/libprotobuf-dev.install	2009-06-24 00:19:03 +0000
+++ debian/libprotobuf-dev.install	2010-01-18 04:34:17 +0000
@@ -1,3 +1,4 @@
 usr/lib/libprotobuf.so
 usr/lib/libprotobuf.la
+usr/lib/pkgconfig/*
 usr/include

=== modified file 'debian/libprotobuf-java.links'
--- debian/libprotobuf-java.links	2009-11-16 10:41:33 +0000
+++ debian/libprotobuf-java.links	2010-01-18 04:34:17 +0000
@@ -1,1 +1,1 @@
-usr/share/java/protobuf-2.1.0.jar usr/share/java/protobuf.jar
+usr/share/java/protobuf-2.2.0.jar usr/share/java/protobuf.jar

=== removed file 'debian/libprotobuf4.install'
--- debian/libprotobuf4.install	2009-06-24 00:19:03 +0000
+++ debian/libprotobuf4.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/libprotobuf*.so.*

=== added file 'debian/libprotobuf5.install'
--- debian/libprotobuf5.install	1970-01-01 00:00:00 +0000
+++ debian/libprotobuf5.install	2010-01-18 04:34:16 +0000
@@ -0,0 +1,1 @@
+usr/lib/libprotobuf*.so.*

=== added file 'debian/libprotobuf5.shlibs'
--- debian/libprotobuf5.shlibs	1970-01-01 00:00:00 +0000
+++ debian/libprotobuf5.shlibs	2010-01-18 04:34:17 +0000
@@ -0,0 +1,3 @@
+libprotobuf 5 libprotobuf5
+libprotobuf-lite 5 libprotobuf5
+

=== added file 'debian/libprotoc-dev.dirs'
--- debian/libprotoc-dev.dirs	1970-01-01 00:00:00 +0000
+++ debian/libprotoc-dev.dirs	2010-01-18 04:34:17 +0000
@@ -0,0 +1,1 @@
+usr/share/doc

=== removed file 'debian/libprotoc-dev.dirs'
--- debian/libprotoc-dev.dirs	2009-06-24 00:19:03 +0000
+++ debian/libprotoc-dev.dirs	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/share/doc

=== added file 'debian/libprotoc-dev.install'
--- debian/libprotoc-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libprotoc-dev.install	2010-01-18 04:34:16 +0000
@@ -0,0 +1,3 @@
+usr/lib/libprotoc.so
+usr/lib/libprotoc.la
+usr/include/google/protobuf/compiler

=== removed file 'debian/libprotoc-dev.install'
--- debian/libprotoc-dev.install	2009-06-24 00:19:03 +0000
+++ debian/libprotoc-dev.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/lib/libprotoc.so
-usr/lib/libprotoc.la
-usr/include/google/protobuf/compiler

=== removed file 'debian/libprotoc4.install'
--- debian/libprotoc4.install	2009-06-24 00:19:03 +0000
+++ debian/libprotoc4.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/libprotoc*.so.*

=== added file 'debian/libprotoc5.install'
--- debian/libprotoc5.install	1970-01-01 00:00:00 +0000
+++ debian/libprotoc5.install	2010-01-18 04:34:17 +0000
@@ -0,0 +1,1 @@
+usr/lib/libprotoc*.so.*

=== added file 'debian/libprotoc5.shlibs'
--- debian/libprotoc5.shlibs	1970-01-01 00:00:00 +0000
+++ debian/libprotoc5.shlibs	2010-01-18 04:34:17 +0000
@@ -0,0 +1,1 @@
+libprotoc 5 libprotoc5

=== added directory 'debian/patches'
=== removed directory 'debian/patches'
=== renamed file 'debian/patches/default_python_version' => 'debian/patches/default_python_version'
=== renamed file 'debian/patches/no_death_tests_on_ia64' => 'debian/patches/no_death_tests_on_ia64'
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2010-01-18 04:34:16 +0000
@@ -0,0 +1,3 @@
+# comment to keep empty file in the diff.gz
+no_death_tests_on_ia64
+default_python_version

=== removed file 'debian/patches/series'
--- debian/patches/series	2009-11-16 10:41:33 +0000
+++ debian/patches/series	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-# comment to keep empty file in the diff.gz
-no_death_tests_on_ia64
-default_python_version

=== modified file 'debian/rules'
--- debian/rules	2009-11-16 10:41:33 +0000
+++ debian/rules	2010-01-18 04:34:17 +0000
@@ -90,9 +90,11 @@
 	# remove the built manpage
 	rm -f protoc.1
 
-	cd python && \
-		python setup.py clean --all ;\
-		rm -rf protobuf.egg-info
+	if [ -f python/protobuf.egg-info ]; then \
+		( cd python && \
+		  python setup.py clean --all && \
+		  rm -rf protobuf.egg-info ) \
+	fi
 
 	# remove java builds
 	$(SHELL) ./debian/ant-wrapper -f debian/java-build.xml clean || true
@@ -130,9 +132,9 @@
 
 	# convert doc dir to symlink for the dev packages
 	rm -rf $(CURDIR)/debian/libprotobuf-dev/usr/share/doc/libprotobuf-dev
-	ln -s libprotobuf4 $(CURDIR)/debian/libprotobuf-dev/usr/share/doc/libprotobuf-dev
+	ln -s libprotobuf5 $(CURDIR)/debian/libprotobuf-dev/usr/share/doc/libprotobuf-dev
 	rm -rf $(CURDIR)/debian/libprotoc-dev/usr/share/doc/libprotoc-dev
-	ln -s libprotoc4 $(CURDIR)/debian/libprotoc-dev/usr/share/doc/libprotoc-dev
+	ln -s libprotoc5 $(CURDIR)/debian/libprotoc-dev/usr/share/doc/libprotoc-dev
 
 	# remove compiler headers from libprotobuf-dev
 	rm -rf $(CURDIR)/debian/libprotobuf-dev/usr/include/google/protobuf/compiler

=== added file 'editors/protobuf-mode.el'
--- editors/protobuf-mode.el	1970-01-01 00:00:00 +0000
+++ editors/protobuf-mode.el	2010-01-18 04:34:16 +0000
@@ -0,0 +1,218 @@
+;;; protobuf-mode.el --- major mode for editing protocol buffers.
+
+;; Author: Alexandre Vassalotti <[e-mail]>
+;; Created: 23-Apr-2009
+;; Version: 0.3
+;; Keywords: google protobuf languages
+
+;; Redistribution and use in source and binary forms, with or without
+;; modification, are permitted provided that the following conditions are
+;; met:
+;;
+;;     * Redistributions of source code must retain the above copyright
+;; notice, this list of conditions and the following disclaimer.
+;;     * Redistributions in binary form must reproduce the above
+;; copyright notice, this list of conditions and the following disclaimer
+;; in the documentation and/or other materials provided with the
+;; distribution.
+;;     * Neither the name of Google Inc. nor the names of its
+;; contributors may be used to endorse or promote products derived from
+;; this software without specific prior written permission.
+;;
+;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;; "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;; LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+;; A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+;; OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+;; SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+;; LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+;; DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+;; THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+;; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+;;; Commentary:
+
+;; Installation:
+;;   - Put `protobuf-mode.el' in your Emacs load-path.
+;;   - Add this line to your .emacs file:
+;;       (require 'protobuf-mode)
+;;
+;; You can customize this mode just like any mode derived from CC Mode.  If
+;; you want to add customizations specific to protobuf-mode, you can use the
+;; `protobuf-mode-hook'. For example, the following would make protocol-mode
+;; use 2-space indentation:
+;;
+;;   (defconst my-protobuf-style
+;;     '((c-basic-offset . 2)
+;;       (indent-tabs-mode . nil)))
+;;
+;;   (add-hook 'protobuf-mode-hook
+;;     (lambda () (c-add-style "my-style" my-protobuf-style t)))
+;;
+;; Refer to the documentation of CC Mode for more information about
+;; customization details and how to use this mode.
+;;
+;; TODO:
+;;   - Make highlighting for enum values work properly.
+;;   - Fix the parser to recognize extensions as identifiers and not
+;;     as casts.
+;;   - Improve the parsing of option assignment lists. For example:
+;;       optional int32 foo = 1 [(my_field_option) = 4.5];
+;;   - Add support for fully-qualified identifiers (e.g., with a leading ".").
+
+;;; Code:
+
+(require 'cc-mode)
+
+(eval-when-compile
+  (require 'cc-langs)
+  (require 'cc-fonts))
+
+;; This mode does not inherit properties from other modes. So, we do not use 
+;; the usual `c-add-language' function.
+(put 'protobuf-mode 'c-mode-prefix "protobuf-")
+
+;; The following code uses of the `c-lang-defconst' macro define syntactic
+;; features of protocol buffer language.  Refer to the documentation in the
+;; cc-langs.el file for information about the meaning of the -kwds variables.
+
+(c-lang-defconst c-primitive-type-kwds
+  protobuf '("double" "float" "int32" "int64" "uint32" "uint64" "sint32"
+             "sint64" "fixed32" "fixed64" "sfixed32" "sfixed64" "bool"
+             "string" "bytes" "group"))
+
+(c-lang-defconst c-modifier-kwds
+  protobuf '("required" "optional" "repeated"))
+
+(c-lang-defconst c-class-decl-kwds
+  protobuf '("message" "enum" "service"))
+
+(c-lang-defconst c-constant-kwds
+  protobuf '("true" "false"))
+
+(c-lang-defconst c-other-decl-kwds
+  protobuf '("package" "import"))
+
+(c-lang-defconst c-other-kwds
+  protobuf '("default" "max"))
+
+(c-lang-defconst c-identifier-ops
+  ;; Handle extended identifiers like google.protobuf.MessageOptions
+  protobuf '((left-assoc ".")))
+
+;; The following keywords do not fit well in keyword classes defined by
+;; cc-mode.  So, we approximate as best we can.
+
+(c-lang-defconst c-type-list-kwds
+  protobuf '("extensions" "to"))
+
+(c-lang-defconst c-typeless-decl-kwds
+  protobuf '("extend" "rpc" "option" "returns"))
+
+
+;; Here we remove default syntax for loops, if-statements and other C
+;; syntactic features that are not supported by the protocol buffer language.
+
+(c-lang-defconst c-brace-list-decl-kwds
+  ;; Remove syntax for C-style enumerations.
+  protobuf nil)
+
+(c-lang-defconst c-block-stmt-1-kwds
+  ;; Remove syntax for "do" and "else" keywords.
+  protobuf nil)
+
+(c-lang-defconst c-block-stmt-2-kwds
+  ;; Remove syntax for "for", "if", "switch" and "while" keywords.
+  protobuf nil)
+
+(c-lang-defconst c-simple-stmt-kwds
+  ;; Remove syntax for "break", "continue", "goto" and "return" keywords.
+  protobuf nil)
+
+(c-lang-defconst c-paren-stmt-kwds
+  ;; Remove special case for the "(;;)" in for-loops.
+  protobuf nil)
+
+(c-lang-defconst c-label-kwds
+  ;; Remove case label syntax for the "case" and "default" keywords.
+  protobuf nil)
+
+(c-lang-defconst c-before-label-kwds
+  ;; Remove special case for the label in a goto statement.
+  protobuf nil)
+
+(c-lang-defconst c-cpp-matchers
+  ;; Disable all the C preprocessor syntax.
+  protobuf nil)
+
+(c-lang-defconst c-decl-prefix-re
+  ;; Same as for C, except it does not match "(". This is needed for disabling
+  ;; the syntax for casts.
+  protobuf "\\([\{\};,]+\\)")
+
+
+;; Add support for variable levels of syntax highlighting.
+
+(defconst protobuf-font-lock-keywords-1 (c-lang-const c-matchers-1 protobuf)
+  "Minimal highlighting for protobuf-mode.")
+
+(defconst protobuf-font-lock-keywords-2 (c-lang-const c-matchers-2 protobuf)
+  "Fast normal highlighting for protobuf-mode.")
+
+(defconst protobuf-font-lock-keywords-3 (c-lang-const c-matchers-3 protobuf)
+  "Accurate normal highlighting for protobuf-mode.")
+
+(defvar protobuf-font-lock-keywords protobuf-font-lock-keywords-3
+  "Default expressions to highlight in protobuf-mode.")
+
+;; Our syntax table is auto-generated from the keyword classes we defined
+;; previously with the `c-lang-const' macro.
+(defvar protobuf-mode-syntax-table nil
+  "Syntax table used in protobuf-mode buffers.")
+(or protobuf-mode-syntax-table
+    (setq protobuf-mode-syntax-table
+          (funcall (c-lang-const c-make-mode-syntax-table protobuf))))
+
+(defvar protobuf-mode-abbrev-table nil
+  "Abbreviation table used in protobuf-mode buffers.")
+
+(defvar protobuf-mode-map nil
+  "Keymap used in protobuf-mode buffers.")
+(or protobuf-mode-map
+    (setq protobuf-mode-map (c-make-inherited-keymap)))
+
+(easy-menu-define protobuf-menu protobuf-mode-map
+  "Protocol Buffers Mode Commands"
+  (cons "Protocol Buffers" (c-lang-const c-mode-menu protobuf)))
+
+;;;###autoload (add-to-list 'auto-mode-alist '("\\.proto\\'" . protobuf-mode))
+
+;;;###autoload
+(defun protobuf-mode ()
+  "Major mode for editing Protocol Buffers description language.
+
+The hook `c-mode-common-hook' is run with no argument at mode
+initialization, then `protobuf-mode-hook'.
+
+Key bindings:
+\\{protobuf-mode-map}"
+  (interactive)
+  (kill-all-local-variables)
+  (set-syntax-table protobuf-mode-syntax-table)
+  (setq major-mode 'protobuf-mode
+        mode-name "Protocol-Buffers"
+        local-abbrev-table protobuf-mode-abbrev-table
+        abbrev-mode t)
+  (use-local-map protobuf-mode-map)
+  (c-initialize-cc-mode t)
+  (c-make-emacs-variables-local)
+  (c-init-language-vars protobuf-mode)
+  (c-common-init 'protobuf-mode)
+  (easy-menu-add protobuf-menu)
+  (c-run-mode-hooks 'c-mode-common-hook 'protobuf-mode-hook)
+  (c-update-modeline))
+
+(provide 'protobuf-mode)
+
+;;; protobuf-mode.el ends here

=== removed file 'editors/protobuf-mode.el'
--- editors/protobuf-mode.el	2009-06-24 00:19:03 +0000
+++ editors/protobuf-mode.el	1970-01-01 00:00:00 +0000
@@ -1,217 +0,0 @@
-;;; protobuf-mode.el --- major mode for editing protocol buffers.
-
-;; Author: Alexandre Vassalotti <[e-mail]>
-;; Created: 23-Apr-2009
-;; Version: 0.3
-;; Keywords: google protobuf languages
-
-;; Redistribution and use in source and binary forms, with or without
-;; modification, are permitted provided that the following conditions are
-;; met:
-;;
-;;     * Redistributions of source code must retain the above copyright
-;; notice, this list of conditions and the following disclaimer.
-;;     * Redistributions in binary form must reproduce the above
-;; copyright notice, this list of conditions and the following disclaimer
-;; in the documentation and/or other materials provided with the
-;; distribution.
-;;     * Neither the name of Google Inc. nor the names of its
-;; contributors may be used to endorse or promote products derived from
-;; this software without specific prior written permission.
-;;
-;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-;; "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-;; LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-;; A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-;; OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-;; SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-;; LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-;; DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-;; THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-;; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-;;; Commentary:
-
-;; Installation:
-;;   - Put `protobuf-mode.el' in your Emacs load-path.
-;;   - Add this line to your .emacs file:
-;;       (require 'protobuf-mode)
-;;
-;; You can customize this mode just like any mode derived from CC Mode.  If
-;; you want to add customizations specific to protobuf-mode, you can use the
-;; `protobuf-mode-hook'. For example, the following would make protocol-mode
-;; use 2-space indentation:
-;;
-;;   (defconst my-protobuf-style
-;;     '((c-basic-offset . 2)
-;;       (indent-tabs-mode . nil)))
-;;
-;;   (add-hook 'protobuf-mode-hook
-;;     (lambda () (c-add-style "my-style" my-protobuf-style t)))
-;;
-;; Refer to the documentation of CC Mode for more information about
-;; customization details and how to use this mode.
-;;
-;; TODO:
-;;   - Make highlighting for enum values work properly.
-;;   - Fix the parser to recognize extensions as identifiers and not
-;;     as casts.
-;;   - Improve the parsing of option assignment lists. For example:
-;;       optional int32 foo = 1 [(my_field_option) = 4.5];
-;;   - Add support for fully-qualified identifiers (e.g., with a leading ".").
-
-;;; Code:
-
-(require 'cc-mode)
-
-(eval-when-compile
-  (require 'cc-langs)
-  (require 'cc-fonts))
-
-;; This mode does not inherit properties from other modes. So, we do not use 
-;; the usual `c-add-language' function.
-(put 'protobuf-mode 'c-mode-prefix "protobuf-")
-
-;; The following code uses of the `c-lang-defconst' macro define syntactic
-;; features of protocol buffer language.  Refer to the documentation in the
-;; cc-langs.el file for information about the meaning of the -kwds variables.
-
-(c-lang-defconst c-primitive-type-kwds
-  protobuf '("double" "float" "int32" "int64" "uint32" "uint64" "sint32"
-             "sint64" "fixed32" "fixed64" "sfixed32" "sfixed64" "bool"
-             "string" "bytes" "group"))
-
-(c-lang-defconst c-modifier-kwds
-  protobuf '("required" "optional" "repeated"))
-
-(c-lang-defconst c-class-decl-kwds
-  protobuf '("message" "enum" "service"))
-
-(c-lang-defconst c-constant-kwds
-  protobuf '("true" "false"))
-
-(c-lang-defconst c-other-decl-kwds
-  protobuf '("package" "import"))
-
-(c-lang-defconst c-other-kwds
-  protobuf '("default" "max"))
-
-(c-lang-defconst c-identifier-ops
-  ;; Handle extended identifiers like google.protobuf.MessageOptions
-  protobuf '((left-assoc ".")))
-
-;; The following keywords do not fit well in keyword classes defined by
-;; cc-mode.  So, we approximate as best we can.
-
-(c-lang-defconst c-type-list-kwds
-  protobuf '("extensions" "to"))
-
-(c-lang-defconst c-typeless-decl-kwds
-  protobuf '("extend" "rpc" "option" "returns"))
-
-
-;; Here we remove default syntax for loops, if-statements and other C
-;; syntactic features that are not supported by the protocol buffer language.
-
-(c-lang-defconst c-brace-list-decl-kwds
-  ;; Remove syntax for C-style enumerations.
-  protobuf nil)
-
-(c-lang-defconst c-block-stmt-1-kwds
-  ;; Remove syntax for "do" and "else" keywords.
-  protobuf nil)
-
-(c-lang-defconst c-block-stmt-2-kwds
-  ;; Remove syntax for "for", "if", "switch" and "while" keywords.
-  protobuf nil)
-
-(c-lang-defconst c-simple-stmt-kwds
-  ;; Remove syntax for "break", "continue", "goto" and "return" keywords.
-  protobuf nil)
-
-(c-lang-defconst c-paren-stmt-kwds
-  ;; Remove special case for the "(;;)" in for-loops.
-  protobuf nil)
-
-(c-lang-defconst c-label-kwds
-  ;; Remove case label syntax for the "case" and "default" keywords.
-  protobuf nil)
-
-(c-lang-defconst c-before-label-kwds
-  ;; Remove special case for the label in a goto statement.
-  protobuf nil)
-
-(c-lang-defconst c-cpp-matchers
-  ;; Disable all the C preprocessor syntax.
-  protobuf nil)
-
-(c-lang-defconst c-decl-prefix-re
-  ;; Same as for C, except it does not match "(". This is needed for disabling
-  ;; the syntax for casts.
-  protobuf "\\([\{\};,]+\\)")
-
-
-;; Add support for variable levels of syntax highlighting.
-
-(defconst protobuf-font-lock-keywords-1 (c-lang-const c-matchers-1 protobuf)
-  "Minimal highlighting for protobuf-mode.")
-
-(defconst protobuf-font-lock-keywords-2 (c-lang-const c-matchers-2 protobuf)
-  "Fast normal highlighting for protobuf-mode.")
-
-(defconst protobuf-font-lock-keywords-3 (c-lang-const c-matchers-3 protobuf)
-  "Accurate normal highlighting for protobuf-mode.")
-
-(defvar protobuf-font-lock-keywords protobuf-font-lock-keywords-3
-  "Default expressions to highlight in protobuf-mode.")
-
-;; Our syntax table is auto-generated from the keyword classes we defined
-;; previously with the `c-lang-const' macro.
-(defvar protobuf-mode-syntax-table nil
-  "Syntax table used in protobuf-mode buffers.")
-(or protobuf-mode-syntax-table
-    (setq protobuf-mode-syntax-table
-          (funcall (c-lang-const c-make-mode-syntax-table protobuf))))
-
-(defvar protobuf-mode-abbrev-table nil
-  "Abbreviation table used in protobuf-mode buffers.")
-
-(defvar protobuf-mode-map nil
-  "Keymap used in protobuf-mode buffers.")
-(or protobuf-mode-map
-    (setq protobuf-mode-map (c-make-inherited-keymap)))
-
-(easy-menu-define protobuf-menu protobuf-mode-map
-  "Protocol Buffers Mode Commands"
-  (cons "Protocol Buffers" (c-lang-const c-mode-menu protobuf)))
-
-;;;###autoload (add-to-list 'auto-mode-alist '("\\.proto\\'" . protobuf-mode))
-
-;;;###autoload
-(defun protobuf-mode ()
-  "Major mode for editing Protocol Buffers description language.
-
-The hook `c-mode-common-hook' is run with no argument at mode
-initialization, then `protobuf-mode-hook'.
-
-Key bindings:
-\\{protobuf-mode-map}"
-  (interactive)
-  (kill-all-local-variables)
-  (set-syntax-table protobuf-mode-syntax-table)
-  (setq major-mode 'protobuf-mode
-        mode-name "Protocol-Buffers"
-        local-abbrev-table protobuf-mode-abbrev-table
-        abbrev-mode t)
-  (use-local-map protobuf-mode-map)
-  (c-initialize-cc-mode t)
-  (c-init-language-vars protobuf-mode)
-  (c-common-init 'protobuf-mode)
-  (easy-menu-add protobuf-menu)
-  (c-run-mode-hooks 'c-mode-common-hook 'protobuf-mode-hook)
-  (c-update-modeline))
-
-(provide 'protobuf-mode)
-
-;;; protobuf-mode.el ends here

=== modified file 'examples/Makefile'
--- examples/Makefile	2009-06-24 00:19:03 +0000
+++ examples/Makefile	2010-01-18 04:34:16 +0000
@@ -22,10 +22,12 @@
 	@touch protoc_middleman
 
 add_person_cpp: add_person.cc protoc_middleman
-	c++ add_person.cc addressbook.pb.cc -lprotobuf -lpthread -o add_person_cpp
+	pkg-config --cflags protobuf  # fails if protobuf is not installed
+	c++ add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf`
 
 list_people_cpp: list_people.cc protoc_middleman
-	c++ list_people.cc addressbook.pb.cc -lprotobuf -lpthread -o list_people_cpp
+	pkg-config --cflags protobuf  # fails if protobuf is not installed
+	c++ list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf`
 
 javac_middleman: AddPerson.java ListPeople.java protoc_middleman
 	javac AddPerson.java ListPeople.java com/example/tutorial/AddressBookProtos.java

=== modified file 'examples/add_person.cc'
--- examples/add_person.cc	2008-08-03 11:01:44 +0000
+++ examples/add_person.cc	2010-01-18 04:34:16 +0000
@@ -88,5 +88,8 @@
     }
   }
 
+  // Optional:  Delete all global objects allocated by libprotobuf.
+  google::protobuf::ShutdownProtobufLibrary();
+
   return 0;
 }

=== modified file 'examples/list_people.cc'
--- examples/list_people.cc	2008-08-03 11:01:44 +0000
+++ examples/list_people.cc	2010-01-18 04:34:16 +0000
@@ -61,5 +61,8 @@
 
   ListPeople(address_book);
 
+  // Optional:  Delete all global objects allocated by libprotobuf.
+  google::protobuf::ShutdownProtobufLibrary();
+
   return 0;
 }

=== modified file 'generate_descriptor_proto.sh'
--- generate_descriptor_proto.sh	2008-12-18 01:26:29 +0000
+++ generate_descriptor_proto.sh	2010-01-18 04:34:16 +0000
@@ -5,6 +5,10 @@
 # itself, they cannot be generated automatically by a make rule.  "make check"
 # will fail if these files do not match what the protocol compiler would
 # generate.
+#
+# HINT:  Flags passed to generate_descriptor_proto.sh will be passed directly
+#   to make when building protoc.  This is particularly useful for passing
+#   -j4 to run 4 jobs simultaneously.
 
 if test ! -e src/google/protobuf/stubs/common.h; then
   cat >&2 << __EOF__
@@ -23,5 +27,5 @@
 fi
 
 cd src
-make protoc && ./protoc --cpp_out=dllexport_decl=LIBPROTOBUF_EXPORT:. google/protobuf/descriptor.proto
+make $@ protoc && ./protoc --cpp_out=dllexport_decl=LIBPROTOBUF_EXPORT:. google/protobuf/descriptor.proto
 cd ..

=== added directory 'gtest'
=== removed directory 'gtest'
=== added file 'gtest/CHANGES'
--- gtest/CHANGES	1970-01-01 00:00:00 +0000
+++ gtest/CHANGES	2010-01-18 04:34:16 +0000
@@ -0,0 +1,57 @@
+Changes for 1.3.0:
+
+ * New feature: death tests on Windows, Cygwin, and Mac.
+ * New feature: ability to use Google Test assertions in other testing
+   frameworks.
+ * New feature: ability to run disabled test via
+   --gtest_also_run_disabled_tests.
+ * New feature: the --help flag for printing the usage.
+ * New feature: access to Google Test flag values in user code.
+ * New feature: a script that packs Google Test into one .h and one
+   .cc file for easy deployment.
+ * New feature: support for distributing test functions to multiple
+   machines (requires support from the test runner).
+ * Bug fixes and implementation clean-up.
+
+Changes for 1.2.1:
+
+ * Compatibility fixes for Linux IA-64 and IBM z/OS.
+ * Added support for using Boost and other TR1 implementations.
+ * Changes to the build scripts to support upcoming release of Google C++
+   Mocking Framework.
+ * Added Makefile to the distribution package.
+ * Improved build instructions in README.
+
+Changes for 1.2.0:
+
+ * New feature: value-parameterized tests.
+ * New feature: the ASSERT/EXPECT_(NON)FATAL_FAILURE(_ON_ALL_THREADS)
+   macros.
+ * Changed the XML report format to match JUnit/Ant's.
+ * Added tests to the Xcode project.
+ * Added scons/SConscript for building with SCons.
+ * Added src/gtest-all.cc for building Google Test from a single file.
+ * Fixed compatibility with Solaris and z/OS.
+ * Enabled running Python tests on systems with python 2.3 installed,
+   e.g. Mac OS X 10.4.
+ * Bug fixes.
+
+Changes for 1.1.0:
+
+ * New feature: type-parameterized tests.
+ * New feature: exception assertions.
+ * New feature: printing elapsed time of tests.
+ * Improved the robustness of death tests.
+ * Added an Xcode project and samples.
+ * Adjusted the output format on Windows to be understandable by Visual Studio.
+ * Minor bug fixes.
+
+Changes for 1.0.1:
+
+ * Added project files for Visual Studio 7.1.
+ * Fixed issues with compiling on Mac OS X.
+ * Fixed issues with compiling on Cygwin.
+
+Changes for 1.0.0:
+
+ * Initial Open Source release of Google Test

=== removed file 'gtest/CHANGES'
--- gtest/CHANGES	2009-06-24 00:19:03 +0000
+++ gtest/CHANGES	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-Changes for 1.3.0:
-
- * New feature: death tests on Windows, Cygwin, and Mac.
- * New feature: ability to use Google Test assertions in other testing
-   frameworks.
- * New feature: ability to run disabled test via
-   --gtest_also_run_disabled_tests.
- * New feature: the --help flag for printing the usage.
- * New feature: access to Google Test flag values in user code.
- * New feature: a script that packs Google Test into one .h and one
-   .cc file for easy deployment.
- * New feature: support for distributing test functions to multiple
-   machines (requires support from the test runner).
- * Bug fixes and implementation clean-up.
-
-Changes for 1.2.1:
-
- * Compatibility fixes for Linux IA-64 and IBM z/OS.
- * Added support for using Boost and other TR1 implementations.
- * Changes to the build scripts to support upcoming release of Google C++
-   Mocking Framework.
- * Added Makefile to the distribution package.
- * Improved build instructions in README.
-
-Changes for 1.2.0:
-
- * New feature: value-parameterized tests.
- * New feature: the ASSERT/EXPECT_(NON)FATAL_FAILURE(_ON_ALL_THREADS)
-   macros.
- * Changed the XML report format to match JUnit/Ant's.
- * Added tests to the Xcode project.
- * Added scons/SConscript for building with SCons.
- * Added src/gtest-all.cc for building Google Test from a single file.
- * Fixed compatibility with Solaris and z/OS.
- * Enabled running Python tests on systems with python 2.3 installed,
-   e.g. Mac OS X 10.4.
- * Bug fixes.
-
-Changes for 1.1.0:
-
- * New feature: type-parameterized tests.
- * New feature: exception assertions.
- * New feature: printing elapsed time of tests.
- * Improved the robustness of death tests.
- * Added an Xcode project and samples.
- * Adjusted the output format on Windows to be understandable by Visual Studio.
- * Minor bug fixes.
-
-Changes for 1.0.1:
-
- * Added project files for Visual Studio 7.1.
- * Fixed issues with compiling on Mac OS X.
- * Fixed issues with compiling on Cygwin.
-
-Changes for 1.0.0:
-
- * Initial Open Source release of Google Test

=== added file 'gtest/CONTRIBUTORS'
--- gtest/CONTRIBUTORS	1970-01-01 00:00:00 +0000
+++ gtest/CONTRIBUTORS	2010-01-18 04:34:16 +0000
@@ -0,0 +1,33 @@
+# This file contains a list of people who've made non-trivial
+# contribution to the Google C++ Testing Framework project.  People
+# who commit code to the project are encouraged to add their names
+# here.  Please keep the list sorted by first names.
+
+Ajay Joshi <[e-mail]>
+Balázs Dán <[e-mail]>
+Bharat Mediratta <[e-mail]>
+Chandler Carruth <[e-mail]>
+Chris Prince <[e-mail]>
+Chris Taylor <[e-mail]>
+Dan Egnor <[e-mail]>
+Eric Roman <[e-mail]>
+Jeffrey Yasskin <[e-mail]>
+Jói Sigurðsson <[e-mail]>
+Keir Mierle <[e-mail]>
+Keith Ray <[e-mail]>
+Kenton Varda <[e-mail]>
+Markus Heule <[e-mail]>
+Mika Raento <[e-mail]>
+Patrick Hanna <[e-mail]>
+Patrick Riley <[e-mail]>
+Peter Kaminski <[e-mail]>
+Preston Jackson <[e-mail]>
+Rainer Klaffenboeck <[e-mail]>
+Russ Cox <[e-mail]>
+Russ Rufer <[e-mail]>
+Sean Mcafee <[e-mail]>
+Sigurður Ásgeirsson <[e-mail]>
+Tracy Bialik <[e-mail]>
+Vadim Berman <[e-mail]>
+Vlad Losev <[e-mail]>
+Zhanyong Wan <[e-mail]>

=== removed file 'gtest/CONTRIBUTORS'
--- gtest/CONTRIBUTORS	2009-06-24 00:19:03 +0000
+++ gtest/CONTRIBUTORS	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-# This file contains a list of people who've made non-trivial
-# contribution to the Google C++ Testing Framework project.  People
-# who commit code to the project are encouraged to add their names
-# here.  Please keep the list sorted by first names.
-
-Ajay Joshi <[e-mail]>
-Balázs Dán <[e-mail]>
-Bharat Mediratta <[e-mail]>
-Chandler Carruth <[e-mail]>
-Chris Prince <[e-mail]>
-Chris Taylor <[e-mail]>
-Dan Egnor <[e-mail]>
-Eric Roman <[e-mail]>
-Jeffrey Yasskin <[e-mail]>
-Jói Sigurðsson <[e-mail]>
-Keir Mierle <[e-mail]>
-Keith Ray <[e-mail]>
-Kenton Varda <[e-mail]>
-Markus Heule <[e-mail]>
-Mika Raento <[e-mail]>
-Patrick Hanna <[e-mail]>
-Patrick Riley <[e-mail]>
-Peter Kaminski <[e-mail]>
-Preston Jackson <[e-mail]>
-Rainer Klaffenboeck <[e-mail]>
-Russ Cox <[e-mail]>
-Russ Rufer <[e-mail]>
-Sean Mcafee <[e-mail]>
-Sigurður Ásgeirsson <[e-mail]>
-Tracy Bialik <[e-mail]>
-Vadim Berman <[e-mail]>
-Vlad Losev <[e-mail]>
-Zhanyong Wan <[e-mail]>

=== added file 'gtest/COPYING'
--- gtest/COPYING	1970-01-01 00:00:00 +0000
+++ gtest/COPYING	2010-01-18 04:34:16 +0000
@@ -0,0 +1,28 @@
+Copyright 2008, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

=== removed file 'gtest/COPYING'
--- gtest/COPYING	2009-06-24 00:19:03 +0000
+++ gtest/COPYING	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-Copyright 2008, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

=== added file 'gtest/Makefile.am'
--- gtest/Makefile.am	1970-01-01 00:00:00 +0000
+++ gtest/Makefile.am	2010-01-18 04:34:16 +0000
@@ -0,0 +1,422 @@
+# Automake file
+
+# TODO([e-mail]): automate the generation of *.h from *.h.pump.
+
+# Nonstandard package files for distribution
+EXTRA_DIST = \
+  CHANGES \
+  CONTRIBUTORS \
+  include/gtest/gtest-param-test.h.pump \
+  include/gtest/internal/gtest-tuple.h.pump \
+  include/gtest/internal/gtest-type-util.h.pump \
+  include/gtest/internal/gtest-param-util-generated.h.pump \
+  make/Makefile \
+  scons/SConscript \
+  scripts/fuse_gtest_files.py \
+  scripts/gen_gtest_pred_impl.py \
+  scripts/test/Makefile \
+  test/gtest_all_test.cc
+
+# MSVC project files
+EXTRA_DIST += \
+  msvc/gtest.sln \
+  msvc/gtest.vcproj \
+  msvc/gtest_color_test_.vcproj \
+  msvc/gtest_env_var_test_.vcproj \
+  msvc/gtest_environment_test.vcproj \
+  msvc/gtest_main.vcproj \
+  msvc/gtest_output_test_.vcproj \
+  msvc/gtest_prod_test.vcproj \
+  msvc/gtest_uninitialized_test_.vcproj \
+  msvc/gtest_unittest.vcproj
+
+# xcode project files
+EXTRA_DIST += \
+  xcode/Config/DebugProject.xcconfig \
+  xcode/Config/FrameworkTarget.xcconfig \
+  xcode/Config/General.xcconfig \
+  xcode/Config/ReleaseProject.xcconfig \
+  xcode/Config/TestTarget.xcconfig \
+  xcode/Config/InternalTestTarget.xcconfig \
+  xcode/Config/InternalPythonTestTarget.xcconfig \
+  xcode/Resources/Info.plist \
+  xcode/Scripts/versiongenerate.py \
+  xcode/Scripts/runtests.sh \
+  xcode/gtest.xcodeproj/project.pbxproj
+
+# xcode sample files
+EXTRA_DIST += \
+  xcode/Samples/FrameworkSample/Info.plist \
+  xcode/Samples/FrameworkSample/widget_test.cc \
+  xcode/Samples/FrameworkSample/widget.cc \
+  xcode/Samples/FrameworkSample/widget.h \
+  xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
+
+# C++Builder project files
+EXTRA_DIST += \
+  codegear/gtest_all.cc \
+  codegear/gtest_link.cc \
+  codegear/gtest.cbproj \
+  codegear/gtest_main.cbproj \
+  codegear/gtest_unittest.cbproj \
+  codegear/gtest.groupproj
+
+# TODO([e-mail]): integrate scripts/gen_gtest_pred_impl.py into
+#   the build system such that a user can specify the maximum predicate
+#   arity here and have the script automatically generate the
+#   corresponding .h and .cc files.
+
+# Scripts and utilities
+bin_SCRIPTS = scripts/gtest-config
+CLEANFILES = $(bin_SCRIPTS)
+
+# Distribute and install M4 macro
+m4datadir = $(datadir)/aclocal
+m4data_DATA = m4/gtest.m4
+EXTRA_DIST += $(m4data_DATA)
+
+# We define the global AM_CPPFLAGS as everything we compile includes from these
+# directories.
+AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include
+
+# Build rules for libraries.
+lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la
+
+lib_libgtest_la_SOURCES = src/gtest.cc \
+                          src/gtest-death-test.cc \
+                          src/gtest-filepath.cc \
+                          src/gtest-internal-inl.h \
+                          src/gtest-port.cc \
+                          src/gtest-test-part.cc \
+                          src/gtest-typed-test.cc
+
+pkginclude_HEADERS = include/gtest/gtest.h \
+                     include/gtest/gtest-death-test.h \
+                     include/gtest/gtest-message.h \
+                     include/gtest/gtest-param-test.h \
+                     include/gtest/gtest_pred_impl.h \
+                     include/gtest/gtest_prod.h \
+                     include/gtest/gtest-spi.h \
+                     include/gtest/gtest-test-part.h \
+                     include/gtest/gtest-typed-test.h
+
+pkginclude_internaldir = $(pkgincludedir)/internal
+pkginclude_internal_HEADERS = \
+  include/gtest/internal/gtest-death-test-internal.h \
+  include/gtest/internal/gtest-filepath.h \
+  include/gtest/internal/gtest-internal.h \
+  include/gtest/internal/gtest-linked_ptr.h \
+  include/gtest/internal/gtest-param-util-generated.h \
+  include/gtest/internal/gtest-param-util.h \
+  include/gtest/internal/gtest-port.h \
+  include/gtest/internal/gtest-string.h \
+  include/gtest/internal/gtest-tuple.h \
+  include/gtest/internal/gtest-type-util.h
+
+lib_libgtest_main_la_SOURCES = src/gtest_main.cc
+lib_libgtest_main_la_LIBADD = lib/libgtest.la
+
+# Bulid rules for samples and tests. Automake's naming for some of
+# these variables isn't terribly obvious, so this is a brief
+# reference:
+#
+# TESTS -- Programs run automatically by "make check"
+# check_PROGRAMS -- Programs built by "make check" but not necessarily run
+
+noinst_LTLIBRARIES = samples/libsamples.la
+
+samples_libsamples_la_SOURCES = samples/sample1.cc \
+                                samples/sample1.h \
+                                samples/sample2.cc \
+                                samples/sample2.h \
+                                samples/sample3-inl.h \
+                                samples/sample4.cc \
+                                samples/sample4.h
+
+TESTS=
+TESTS_ENVIRONMENT = GTEST_SOURCE_DIR="$(srcdir)/test" \
+                    GTEST_BUILD_DIR="$(top_builddir)/test"
+check_PROGRAMS=
+
+TESTS += samples/sample1_unittest
+check_PROGRAMS += samples/sample1_unittest
+samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc
+samples_sample1_unittest_LDADD = lib/libgtest_main.la \
+                                 samples/libsamples.la
+
+TESTS += samples/sample2_unittest
+check_PROGRAMS += samples/sample2_unittest
+samples_sample2_unittest_SOURCES = samples/sample2_unittest.cc
+samples_sample2_unittest_LDADD = lib/libgtest_main.la \
+                                 samples/libsamples.la
+
+TESTS += samples/sample3_unittest
+check_PROGRAMS += samples/sample3_unittest
+samples_sample3_unittest_SOURCES = samples/sample3_unittest.cc
+samples_sample3_unittest_LDADD = lib/libgtest_main.la \
+                                 samples/libsamples.la
+
+TESTS += samples/sample4_unittest
+check_PROGRAMS += samples/sample4_unittest
+samples_sample4_unittest_SOURCES = samples/sample4_unittest.cc
+samples_sample4_unittest_LDADD = lib/libgtest_main.la \
+                                 samples/libsamples.la
+
+TESTS += samples/sample5_unittest
+check_PROGRAMS += samples/sample5_unittest
+samples_sample5_unittest_SOURCES = samples/sample5_unittest.cc
+samples_sample5_unittest_LDADD = lib/libgtest_main.la \
+                                 samples/libsamples.la
+
+TESTS += samples/sample6_unittest
+check_PROGRAMS += samples/sample6_unittest
+samples_sample6_unittest_SOURCES = samples/prime_tables.h \
+                                   samples/sample6_unittest.cc
+samples_sample6_unittest_LDADD = lib/libgtest_main.la \
+                                 samples/libsamples.la
+
+TESTS += samples/sample7_unittest
+check_PROGRAMS += samples/sample7_unittest
+samples_sample7_unittest_SOURCES = samples/prime_tables.h \
+                                   samples/sample7_unittest.cc
+samples_sample7_unittest_LDADD = lib/libgtest_main.la \
+                                 samples/libsamples.la
+
+TESTS += samples/sample8_unittest
+check_PROGRAMS += samples/sample8_unittest
+samples_sample8_unittest_SOURCES = samples/prime_tables.h \
+                                   samples/sample8_unittest.cc
+samples_sample8_unittest_LDADD = lib/libgtest_main.la \
+                                 samples/libsamples.la
+
+TESTS += test/gtest-death-test_test
+check_PROGRAMS += test/gtest-death-test_test
+test_gtest_death_test_test_SOURCES = test/gtest-death-test_test.cc
+test_gtest_death_test_test_CXXFLAGS = $(AM_CXXFLAGS) $(PTHREAD_CFLAGS)
+test_gtest_death_test_test_LDADD = $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) \
+                                   lib/libgtest_main.la
+
+TESTS += test/gtest_environment_test
+check_PROGRAMS += test/gtest_environment_test
+test_gtest_environment_test_SOURCES = test/gtest_environment_test.cc
+test_gtest_environment_test_LDADD = lib/libgtest.la
+
+TESTS += test/gtest-filepath_test
+check_PROGRAMS += test/gtest-filepath_test
+test_gtest_filepath_test_SOURCES = test/gtest-filepath_test.cc
+test_gtest_filepath_test_LDADD = lib/libgtest_main.la
+
+TESTS += test/gtest-linked_ptr_test
+check_PROGRAMS += test/gtest-linked_ptr_test
+test_gtest_linked_ptr_test_SOURCES = test/gtest-linked_ptr_test.cc
+test_gtest_linked_ptr_test_LDADD = lib/libgtest_main.la
+
+TESTS += test/gtest_main_unittest
+check_PROGRAMS += test/gtest_main_unittest
+test_gtest_main_unittest_SOURCES = test/gtest_main_unittest.cc
+test_gtest_main_unittest_LDADD = lib/libgtest_main.la
+
+TESTS += test/gtest-message_test
+check_PROGRAMS += test/gtest-message_test
+test_gtest_message_test_SOURCES = test/gtest-message_test.cc
+test_gtest_message_test_LDADD = lib/libgtest_main.la
+
+TESTS += test/gtest_no_test_unittest
+check_PROGRAMS += test/gtest_no_test_unittest
+test_gtest_no_test_unittest_SOURCES = test/gtest_no_test_unittest.cc
+test_gtest_no_test_unittest_LDADD = lib/libgtest.la
+
+TESTS += test/gtest-options_test
+check_PROGRAMS += test/gtest-options_test
+test_gtest_options_test_SOURCES = test/gtest-options_test.cc
+test_gtest_options_test_LDADD = lib/libgtest_main.la
+
+TESTS += test/gtest-param-test_test
+check_PROGRAMS += test/gtest-param-test_test
+test_gtest_param_test_test_SOURCES = test/gtest-param-test_test.cc \
+                                     test/gtest-param-test2_test.cc \
+                                     test/gtest-param-test_test.h
+test_gtest_param_test_test_LDADD = lib/libgtest.la
+
+TESTS += test/gtest-port_test
+check_PROGRAMS += test/gtest-port_test
+test_gtest_port_test_SOURCES = test/gtest-port_test.cc
+test_gtest_port_test_LDADD = lib/libgtest_main.la
+
+TESTS += test/gtest_pred_impl_unittest
+check_PROGRAMS += test/gtest_pred_impl_unittest
+test_gtest_pred_impl_unittest_SOURCES = test/gtest_pred_impl_unittest.cc
+test_gtest_pred_impl_unittest_LDADD = lib/libgtest_main.la
+
+TESTS += test/gtest_prod_test
+check_PROGRAMS += test/gtest_prod_test
+test_gtest_prod_test_SOURCES = test/gtest_prod_test.cc \
+                               test/production.cc \
+                               test/production.h
+test_gtest_prod_test_LDADD = lib/libgtest_main.la
+
+TESTS += test/gtest_repeat_test
+check_PROGRAMS += test/gtest_repeat_test
+test_gtest_repeat_test_SOURCES = test/gtest_repeat_test.cc
+test_gtest_repeat_test_LDADD = lib/libgtest.la
+
+TESTS += test/gtest_sole_header_test
+check_PROGRAMS += test/gtest_sole_header_test
+test_gtest_sole_header_test_SOURCES = test/gtest_sole_header_test.cc
+test_gtest_sole_header_test_LDADD = lib/libgtest_main.la
+
+TESTS += test/gtest_stress_test
+check_PROGRAMS += test/gtest_stress_test
+test_gtest_stress_test_SOURCES = test/gtest_stress_test.cc
+test_gtest_stress_test_LDADD = lib/libgtest.la
+
+TESTS += test/gtest-test-part_test
+check_PROGRAMS += test/gtest-test-part_test
+test_gtest_test_part_test_SOURCES = test/gtest-test-part_test.cc
+test_gtest_test_part_test_LDADD = lib/libgtest_main.la
+
+TESTS += test/gtest_throw_on_failure_ex_test
+check_PROGRAMS += test/gtest_throw_on_failure_ex_test
+test_gtest_throw_on_failure_ex_test_SOURCES = \
+    test/gtest_throw_on_failure_ex_test.cc \
+    src/gtest-all.cc
+test_gtest_throw_on_failure_ex_test_CXXFLAGS = $(AM_CXXFLAGS) -fexceptions
+
+TESTS += test/gtest-typed-test_test
+check_PROGRAMS += test/gtest-typed-test_test
+test_gtest_typed_test_test_SOURCES = test/gtest-typed-test_test.cc \
+                                     test/gtest-typed-test2_test.cc \
+                                     test/gtest-typed-test_test.h
+test_gtest_typed_test_test_LDADD = lib/libgtest_main.la
+
+TESTS += test/gtest_unittest
+check_PROGRAMS += test/gtest_unittest
+test_gtest_unittest_SOURCES = test/gtest_unittest.cc
+test_gtest_unittest_LDADD = lib/libgtest_main.la
+
+TESTS += test/gtest-unittest-api_test
+check_PROGRAMS += test/gtest-unittest-api_test
+test_gtest_unittest_api_test_SOURCES = test/gtest-unittest-api_test.cc
+test_gtest_unittest_api_test_LDADD = lib/libgtest_main.la
+
+# Verifies that Google Test works when RTTI is disabled.
+TESTS += test/gtest_no_rtti_test
+check_PROGRAMS += test/gtest_no_rtti_test
+test_gtest_no_rtti_test_SOURCES = test/gtest_unittest.cc \
+                                  src/gtest-all.cc \
+                                  src/gtest_main.cc
+test_gtest_no_rtti_test_CXXFLAGS = $(AM_CXXFLAGS) -fno-rtti -DGTEST_HAS_RTTI=0
+
+# Verifies that Google Test's own TR1 tuple implementation works.
+TESTS += test/gtest-tuple_test
+check_PROGRAMS += test/gtest-tuple_test
+test_gtest_tuple_test_SOURCES = test/gtest-tuple_test.cc \
+                                src/gtest-all.cc \
+                                src/gtest_main.cc
+test_gtest_tuple_test_CXXFLAGS = $(AM_CXXFLAGS) -DGTEST_USE_OWN_TR1_TUPLE=1
+
+# Verifies that Google Test's features that use its own TR1 tuple work.
+TESTS += test/gtest_use_own_tuple_test
+check_PROGRAMS += test/gtest_use_own_tuple_test
+test_gtest_use_own_tuple_test_SOURCES = test/gtest-param-test_test.cc \
+                                        test/gtest-param-test2_test.cc \
+                                        src/gtest-all.cc
+test_gtest_use_own_tuple_test_CXXFLAGS = \
+    $(AM_CXXFLAGS) -DGTEST_USE_OWN_TR1_TUPLE=1
+
+# The following tests depend on the presence of a Python installation and are
+# keyed off of it. TODO([e-mail]): While we currently only attempt
+# to build and execute these tests if Autoconf has found Python v2.4 on the
+# system, we don't use the PYTHON variable it specified as the valid
+# interpreter. The problem is that TESTS_ENVIRONMENT is a global variable, and
+# thus we cannot distinguish between C++ unit tests and Python unit tests.
+if HAVE_PYTHON
+check_SCRIPTS =
+
+# These two Python modules are used by multiple Python tests below.
+check_SCRIPTS += test/gtest_test_utils.py \
+                 test/gtest_xml_test_utils.py
+
+check_PROGRAMS += test/gtest_break_on_failure_unittest_
+test_gtest_break_on_failure_unittest__SOURCES = \
+  test/gtest_break_on_failure_unittest_.cc
+test_gtest_break_on_failure_unittest__LDADD = lib/libgtest.la
+check_SCRIPTS += test/gtest_break_on_failure_unittest.py
+TESTS += test/gtest_break_on_failure_unittest.py
+
+check_PROGRAMS += test/gtest_color_test_
+test_gtest_color_test__SOURCES = test/gtest_color_test_.cc
+test_gtest_color_test__LDADD = lib/libgtest.la
+check_SCRIPTS += test/gtest_color_test.py
+TESTS += test/gtest_color_test.py
+
+check_PROGRAMS += test/gtest_env_var_test_
+test_gtest_env_var_test__SOURCES = test/gtest_env_var_test_.cc
+test_gtest_env_var_test__LDADD = lib/libgtest.la
+check_SCRIPTS += test/gtest_env_var_test.py
+TESTS += test/gtest_env_var_test.py
+
+check_PROGRAMS += test/gtest_filter_unittest_
+test_gtest_filter_unittest__SOURCES = test/gtest_filter_unittest_.cc
+test_gtest_filter_unittest__LDADD = lib/libgtest.la
+check_SCRIPTS += test/gtest_filter_unittest.py
+TESTS += test/gtest_filter_unittest.py
+
+check_PROGRAMS += test/gtest_help_test_
+test_gtest_help_test__SOURCES = test/gtest_help_test_.cc
+test_gtest_help_test__LDADD = lib/libgtest_main.la
+check_SCRIPTS += test/gtest_help_test.py
+TESTS += test/gtest_help_test.py
+
+check_PROGRAMS += test/gtest_list_tests_unittest_
+test_gtest_list_tests_unittest__SOURCES = test/gtest_list_tests_unittest_.cc
+test_gtest_list_tests_unittest__LDADD = lib/libgtest.la
+check_SCRIPTS += test/gtest_list_tests_unittest.py
+TESTS += test/gtest_list_tests_unittest.py
+
+check_PROGRAMS += test/gtest_output_test_
+test_gtest_output_test__SOURCES = test/gtest_output_test_.cc
+test_gtest_output_test__LDADD = lib/libgtest.la
+check_SCRIPTS += test/gtest_output_test.py
+EXTRA_DIST += test/gtest_output_test_golden_lin.txt \
+              test/gtest_output_test_golden_win.txt
+TESTS += test/gtest_output_test.py
+
+check_PROGRAMS += test/gtest_throw_on_failure_test_
+test_gtest_throw_on_failure_test__SOURCES = \
+  test/gtest_throw_on_failure_test_.cc \
+  src/gtest-all.cc
+test_gtest_throw_on_failure_test__CXXFLAGS = $(AM_CXXFLAGS) -fno-exceptions
+check_SCRIPTS += test/gtest_throw_on_failure_test.py
+TESTS += test/gtest_throw_on_failure_test.py
+
+check_PROGRAMS += test/gtest_uninitialized_test_
+test_gtest_uninitialized_test__SOURCES = test/gtest_uninitialized_test_.cc
+test_gtest_uninitialized_test__LDADD = lib/libgtest.la
+check_SCRIPTS += test/gtest_uninitialized_test.py
+TESTS += test/gtest_uninitialized_test.py
+
+check_PROGRAMS += test/gtest_xml_outfile1_test_
+test_gtest_xml_outfile1_test__SOURCES = test/gtest_xml_outfile1_test_.cc
+test_gtest_xml_outfile1_test__LDADD = lib/libgtest_main.la
+check_PROGRAMS += test/gtest_xml_outfile2_test_
+test_gtest_xml_outfile2_test__SOURCES = test/gtest_xml_outfile2_test_.cc
+test_gtest_xml_outfile2_test__LDADD = lib/libgtest_main.la
+check_SCRIPTS += test/gtest_xml_outfiles_test.py
+TESTS += test/gtest_xml_outfiles_test.py
+
+check_PROGRAMS += test/gtest_xml_output_unittest_
+test_gtest_xml_output_unittest__SOURCES = test/gtest_xml_output_unittest_.cc
+test_gtest_xml_output_unittest__LDADD = lib/libgtest_main.la
+check_SCRIPTS += test/gtest_xml_output_unittest.py
+TESTS += test/gtest_xml_output_unittest.py
+
+# TODO([e-mail]): make the build script compile and run the
+#   negative-compilation tests.  (The test/gtest_nc* files are unfinished
+#   implementation of tests for verifying that certain kinds of misuse
+#   of Google Test don't compile.)
+EXTRA_DIST += $(check_SCRIPTS) \
+              test/gtest_nc.cc \
+              test/gtest_nc_test.py
+
+endif

=== removed file 'gtest/Makefile.am'
--- gtest/Makefile.am	2009-06-24 00:19:03 +0000
+++ gtest/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,390 +0,0 @@
-# Automake file
-
-# TODO([e-mail]): automate the generation of *.h from *.h.pump.
-
-# Nonstandard package files for distribution
-EXTRA_DIST = \
-  CHANGES \
-  CONTRIBUTORS \
-  include/gtest/gtest-param-test.h.pump \
-  include/gtest/internal/gtest-type-util.h.pump \
-  include/gtest/internal/gtest-param-util-generated.h.pump \
-  make/Makefile \
-  scons/SConscript \
-  scripts/fuse_gtest_files.py \
-  scripts/gen_gtest_pred_impl.py \
-  scripts/test/Makefile \
-  test/gtest_all_test.cc
-
-# MSVC project files
-EXTRA_DIST += \
-  msvc/gtest.sln \
-  msvc/gtest.vcproj \
-  msvc/gtest_color_test_.vcproj \
-  msvc/gtest_env_var_test_.vcproj \
-  msvc/gtest_environment_test.vcproj \
-  msvc/gtest_main.vcproj \
-  msvc/gtest_output_test_.vcproj \
-  msvc/gtest_prod_test.vcproj \
-  msvc/gtest_uninitialized_test_.vcproj \
-  msvc/gtest_unittest.vcproj
-
-# xcode project files
-EXTRA_DIST += \
-  xcode/Config/DebugProject.xcconfig \
-  xcode/Config/FrameworkTarget.xcconfig \
-  xcode/Config/General.xcconfig \
-  xcode/Config/ReleaseProject.xcconfig \
-  xcode/Config/TestTarget.xcconfig \
-  xcode/Config/InternalTestTarget.xcconfig \
-  xcode/Config/InternalPythonTestTarget.xcconfig \
-  xcode/Resources/Info.plist \
-  xcode/Scripts/versiongenerate.py \
-  xcode/Scripts/runtests.sh \
-  xcode/gtest.xcodeproj/project.pbxproj
-
-# xcode sample files
-EXTRA_DIST += \
-  xcode/Samples/FrameworkSample/Info.plist \
-  xcode/Samples/FrameworkSample/widget_test.cc \
-  xcode/Samples/FrameworkSample/widget.cc \
-  xcode/Samples/FrameworkSample/widget.h \
-  xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
-
-# C++Builder project files
-EXTRA_DIST += \
-  codegear/gtest_all.cc \
-  codegear/gtest_link.cc \
-  codegear/gtest.cbproj \
-  codegear/gtest_main.cbproj \
-  codegear/gtest_unittest.cbproj \
-  codegear/gtest.groupproj
-
-# TODO([e-mail]): integrate scripts/gen_gtest_pred_impl.py into
-#   the build system such that a user can specify the maximum predicate
-#   arity here and have the script automatically generate the
-#   corresponding .h and .cc files.
-
-# Scripts and utilities
-bin_SCRIPTS = scripts/gtest-config
-CLEANFILES = $(bin_SCRIPTS)
-
-# Distribute and install M4 macro
-m4datadir = $(datadir)/aclocal
-m4data_DATA = m4/gtest.m4
-EXTRA_DIST += $(m4data_DATA)
-
-# We define the global AM_CPPFLAGS as everything we compile includes from these
-# directories.
-AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include
-
-# Build rules for libraries.
-lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la
-
-lib_libgtest_la_SOURCES = src/gtest.cc \
-                          src/gtest-death-test.cc \
-                          src/gtest-filepath.cc \
-                          src/gtest-internal-inl.h \
-                          src/gtest-port.cc \
-                          src/gtest-test-part.cc \
-                          src/gtest-typed-test.cc
-
-pkginclude_HEADERS = include/gtest/gtest.h \
-                     include/gtest/gtest-death-test.h \
-                     include/gtest/gtest-message.h \
-                     include/gtest/gtest-param-test.h \
-                     include/gtest/gtest_pred_impl.h \
-                     include/gtest/gtest_prod.h \
-                     include/gtest/gtest-spi.h \
-                     include/gtest/gtest-test-part.h \
-                     include/gtest/gtest-typed-test.h
-
-pkginclude_internaldir = $(pkgincludedir)/internal
-pkginclude_internal_HEADERS = \
-  include/gtest/internal/gtest-death-test-internal.h \
-  include/gtest/internal/gtest-filepath.h \
-  include/gtest/internal/gtest-internal.h \
-  include/gtest/internal/gtest-linked_ptr.h \
-  include/gtest/internal/gtest-param-util-generated.h \
-  include/gtest/internal/gtest-param-util.h \
-  include/gtest/internal/gtest-port.h \
-  include/gtest/internal/gtest-string.h \
-  include/gtest/internal/gtest-type-util.h
-
-lib_libgtest_main_la_SOURCES = src/gtest_main.cc
-lib_libgtest_main_la_LIBADD = lib/libgtest.la
-
-# Bulid rules for samples and tests. Automake's naming for some of
-# these variables isn't terribly obvious, so this is a brief
-# reference:
-#
-# TESTS -- Programs run automatically by "make check"
-# check_PROGRAMS -- Programs built by "make check" but not necessarily run
-
-noinst_LTLIBRARIES = samples/libsamples.la
-
-samples_libsamples_la_SOURCES = samples/sample1.cc \
-                                samples/sample1.h \
-                                samples/sample2.cc \
-                                samples/sample2.h \
-                                samples/sample3-inl.h \
-                                samples/sample4.cc \
-                                samples/sample4.h
-
-TESTS=
-TESTS_ENVIRONMENT = GTEST_SOURCE_DIR="$(srcdir)/test" \
-                    GTEST_BUILD_DIR="$(top_builddir)/test"
-check_PROGRAMS=
-
-TESTS += samples/sample1_unittest
-check_PROGRAMS += samples/sample1_unittest
-samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc
-samples_sample1_unittest_LDADD = lib/libgtest_main.la \
-                                 samples/libsamples.la
-
-TESTS += samples/sample2_unittest
-check_PROGRAMS += samples/sample2_unittest
-samples_sample2_unittest_SOURCES = samples/sample2_unittest.cc
-samples_sample2_unittest_LDADD = lib/libgtest_main.la \
-                                 samples/libsamples.la
-
-TESTS += samples/sample3_unittest
-check_PROGRAMS += samples/sample3_unittest
-samples_sample3_unittest_SOURCES = samples/sample3_unittest.cc
-samples_sample3_unittest_LDADD = lib/libgtest_main.la \
-                                 samples/libsamples.la
-
-TESTS += samples/sample4_unittest
-check_PROGRAMS += samples/sample4_unittest
-samples_sample4_unittest_SOURCES = samples/sample4_unittest.cc
-samples_sample4_unittest_LDADD = lib/libgtest_main.la \
-                                 samples/libsamples.la
-
-TESTS += samples/sample5_unittest
-check_PROGRAMS += samples/sample5_unittest
-samples_sample5_unittest_SOURCES = samples/sample5_unittest.cc
-samples_sample5_unittest_LDADD = lib/libgtest_main.la \
-                                 samples/libsamples.la
-
-TESTS += samples/sample6_unittest
-check_PROGRAMS += samples/sample6_unittest
-samples_sample6_unittest_SOURCES = samples/prime_tables.h \
-                                   samples/sample6_unittest.cc
-samples_sample6_unittest_LDADD = lib/libgtest_main.la \
-                                 samples/libsamples.la
-
-TESTS += samples/sample7_unittest
-check_PROGRAMS += samples/sample7_unittest
-samples_sample7_unittest_SOURCES = samples/prime_tables.h \
-                                   samples/sample7_unittest.cc
-samples_sample7_unittest_LDADD = lib/libgtest_main.la \
-                                 samples/libsamples.la
-
-TESTS += samples/sample8_unittest
-check_PROGRAMS += samples/sample8_unittest
-samples_sample8_unittest_SOURCES = samples/prime_tables.h \
-                                   samples/sample8_unittest.cc
-samples_sample8_unittest_LDADD = lib/libgtest_main.la \
-                                 samples/libsamples.la
-
-TESTS += test/gtest-death-test_test
-check_PROGRAMS += test/gtest-death-test_test
-test_gtest_death_test_test_SOURCES = test/gtest-death-test_test.cc
-test_gtest_death_test_test_CXXFLAGS = $(AM_CXXFLAGS) $(PTHREAD_CFLAGS)
-test_gtest_death_test_test_LDADD = $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) \
-                                   lib/libgtest_main.la
-
-TESTS += test/gtest_environment_test
-check_PROGRAMS += test/gtest_environment_test
-test_gtest_environment_test_SOURCES = test/gtest_environment_test.cc
-test_gtest_environment_test_LDADD = lib/libgtest.la
-
-TESTS += test/gtest-filepath_test
-check_PROGRAMS += test/gtest-filepath_test
-test_gtest_filepath_test_SOURCES = test/gtest-filepath_test.cc
-test_gtest_filepath_test_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest-linked_ptr_test
-check_PROGRAMS += test/gtest-linked_ptr_test
-test_gtest_linked_ptr_test_SOURCES = test/gtest-linked_ptr_test.cc
-test_gtest_linked_ptr_test_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest_main_unittest
-check_PROGRAMS += test/gtest_main_unittest
-test_gtest_main_unittest_SOURCES = test/gtest_main_unittest.cc
-test_gtest_main_unittest_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest-message_test
-check_PROGRAMS += test/gtest-message_test
-test_gtest_message_test_SOURCES = test/gtest-message_test.cc
-test_gtest_message_test_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest_no_test_unittest
-check_PROGRAMS += test/gtest_no_test_unittest
-test_gtest_no_test_unittest_SOURCES = test/gtest_no_test_unittest.cc
-test_gtest_no_test_unittest_LDADD = lib/libgtest.la
-
-TESTS += test/gtest-options_test
-check_PROGRAMS += test/gtest-options_test
-test_gtest_options_test_SOURCES = test/gtest-options_test.cc
-test_gtest_options_test_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest-param-test_test
-check_PROGRAMS += test/gtest-param-test_test
-test_gtest_param_test_test_SOURCES = test/gtest-param-test_test.cc \
-                                     test/gtest-param-test2_test.cc \
-                                     test/gtest-param-test_test.h
-test_gtest_param_test_test_LDADD = lib/libgtest.la
-
-TESTS += test/gtest-port_test
-check_PROGRAMS += test/gtest-port_test
-test_gtest_port_test_SOURCES = test/gtest-port_test.cc
-test_gtest_port_test_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest_pred_impl_unittest
-check_PROGRAMS += test/gtest_pred_impl_unittest
-test_gtest_pred_impl_unittest_SOURCES = test/gtest_pred_impl_unittest.cc
-test_gtest_pred_impl_unittest_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest_prod_test
-check_PROGRAMS += test/gtest_prod_test
-test_gtest_prod_test_SOURCES = test/gtest_prod_test.cc \
-                               test/production.cc \
-                               test/production.h
-test_gtest_prod_test_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest_repeat_test
-check_PROGRAMS += test/gtest_repeat_test
-test_gtest_repeat_test_SOURCES = test/gtest_repeat_test.cc
-test_gtest_repeat_test_LDADD = lib/libgtest.la
-
-TESTS += test/gtest_sole_header_test
-check_PROGRAMS += test/gtest_sole_header_test
-test_gtest_sole_header_test_SOURCES = test/gtest_sole_header_test.cc
-test_gtest_sole_header_test_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest_stress_test
-check_PROGRAMS += test/gtest_stress_test
-test_gtest_stress_test_SOURCES = test/gtest_stress_test.cc
-test_gtest_stress_test_LDADD = lib/libgtest.la
-
-TESTS += test/gtest-test-part_test
-check_PROGRAMS += test/gtest-test-part_test
-test_gtest_test_part_test_SOURCES = test/gtest-test-part_test.cc
-test_gtest_test_part_test_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest_throw_on_failure_ex_test
-check_PROGRAMS += test/gtest_throw_on_failure_ex_test
-test_gtest_throw_on_failure_ex_test_SOURCES = \
-    test/gtest_throw_on_failure_ex_test.cc \
-    src/gtest-all.cc
-test_gtest_throw_on_failure_ex_test_CXXFLAGS = $(AM_CXXFLAGS) -fexceptions
-
-TESTS += test/gtest-typed-test_test
-check_PROGRAMS += test/gtest-typed-test_test
-test_gtest_typed_test_test_SOURCES = test/gtest-typed-test_test.cc \
-                                     test/gtest-typed-test2_test.cc \
-                                     test/gtest-typed-test_test.h
-test_gtest_typed_test_test_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest_unittest
-check_PROGRAMS += test/gtest_unittest
-test_gtest_unittest_SOURCES = test/gtest_unittest.cc
-test_gtest_unittest_LDADD = lib/libgtest_main.la
-
-# The following tests depend on the presence of a Python installation and are
-# keyed off of it. TODO([e-mail]): While we currently only attempt
-# to build and execute these tests if Autoconf has found Python v2.4 on the
-# system, we don't use the PYTHON variable it specified as the valid
-# interpreter. The problem is that TESTS_ENVIRONMENT is a global variable, and
-# thus we cannot distinguish between C++ unit tests and Python unit tests.
-if HAVE_PYTHON
-check_SCRIPTS =
-
-# These two Python modules are used by multiple Python tests below.
-check_SCRIPTS += test/gtest_test_utils.py \
-                 test/gtest_xml_test_utils.py
-
-check_PROGRAMS += test/gtest_break_on_failure_unittest_
-test_gtest_break_on_failure_unittest__SOURCES = \
-  test/gtest_break_on_failure_unittest_.cc
-test_gtest_break_on_failure_unittest__LDADD = lib/libgtest.la
-check_SCRIPTS += test/gtest_break_on_failure_unittest.py
-TESTS += test/gtest_break_on_failure_unittest.py
-
-check_PROGRAMS += test/gtest_color_test_
-test_gtest_color_test__SOURCES = test/gtest_color_test_.cc
-test_gtest_color_test__LDADD = lib/libgtest.la
-check_SCRIPTS += test/gtest_color_test.py
-TESTS += test/gtest_color_test.py
-
-check_PROGRAMS += test/gtest_env_var_test_
-test_gtest_env_var_test__SOURCES = test/gtest_env_var_test_.cc
-test_gtest_env_var_test__LDADD = lib/libgtest.la
-check_SCRIPTS += test/gtest_env_var_test.py
-TESTS += test/gtest_env_var_test.py
-
-check_PROGRAMS += test/gtest_filter_unittest_
-test_gtest_filter_unittest__SOURCES = test/gtest_filter_unittest_.cc
-test_gtest_filter_unittest__LDADD = lib/libgtest.la
-check_SCRIPTS += test/gtest_filter_unittest.py
-TESTS += test/gtest_filter_unittest.py
-
-check_PROGRAMS += test/gtest_help_test_
-test_gtest_help_test__SOURCES = test/gtest_help_test_.cc
-test_gtest_help_test__LDADD = lib/libgtest_main.la
-check_SCRIPTS += test/gtest_help_test.py
-TESTS += test/gtest_help_test.py
-
-check_PROGRAMS += test/gtest_list_tests_unittest_
-test_gtest_list_tests_unittest__SOURCES = test/gtest_list_tests_unittest_.cc
-test_gtest_list_tests_unittest__LDADD = lib/libgtest.la
-check_SCRIPTS += test/gtest_list_tests_unittest.py
-TESTS += test/gtest_list_tests_unittest.py
-
-check_PROGRAMS += test/gtest_output_test_
-test_gtest_output_test__SOURCES = test/gtest_output_test_.cc
-test_gtest_output_test__LDADD = lib/libgtest.la
-check_SCRIPTS += test/gtest_output_test.py
-EXTRA_DIST += test/gtest_output_test_golden_lin.txt \
-              test/gtest_output_test_golden_win.txt
-TESTS += test/gtest_output_test.py
-
-check_PROGRAMS += test/gtest_throw_on_failure_test_
-test_gtest_throw_on_failure_test__SOURCES = \
-  test/gtest_throw_on_failure_test_.cc \
-  src/gtest-all.cc
-test_gtest_throw_on_failure_test__CXXFLAGS = $(AM_CXXFLAGS) -fno-exceptions
-check_SCRIPTS += test/gtest_throw_on_failure_test.py
-TESTS += test/gtest_throw_on_failure_test.py
-
-check_PROGRAMS += test/gtest_uninitialized_test_
-test_gtest_uninitialized_test__SOURCES = test/gtest_uninitialized_test_.cc
-test_gtest_uninitialized_test__LDADD = lib/libgtest.la
-check_SCRIPTS += test/gtest_uninitialized_test.py
-TESTS += test/gtest_uninitialized_test.py
-
-check_PROGRAMS += test/gtest_xml_outfile1_test_
-test_gtest_xml_outfile1_test__SOURCES = test/gtest_xml_outfile1_test_.cc
-test_gtest_xml_outfile1_test__LDADD = lib/libgtest_main.la
-check_PROGRAMS += test/gtest_xml_outfile2_test_
-test_gtest_xml_outfile2_test__SOURCES = test/gtest_xml_outfile2_test_.cc
-test_gtest_xml_outfile2_test__LDADD = lib/libgtest_main.la
-check_SCRIPTS += test/gtest_xml_outfiles_test.py
-TESTS += test/gtest_xml_outfiles_test.py
-
-check_PROGRAMS += test/gtest_xml_output_unittest_
-test_gtest_xml_output_unittest__SOURCES = test/gtest_xml_output_unittest_.cc
-test_gtest_xml_output_unittest__LDADD = lib/libgtest_main.la
-check_SCRIPTS += test/gtest_xml_output_unittest.py
-TESTS += test/gtest_xml_output_unittest.py
-
-# TODO([e-mail]): make the build script compile and run the
-#   negative-compilation tests.  (The test/gtest_nc* files are unfinished
-#   implementation of tests for verifying that certain kinds of misuse
-#   of Google Test don't compile.)
-EXTRA_DIST += $(check_SCRIPTS) \
-              test/gtest_nc.cc \
-              test/gtest_nc_test.py
-
-endif

=== added file 'gtest/Makefile.in'
--- gtest/Makefile.in	1970-01-01 00:00:00 +0000
+++ gtest/Makefile.in	2010-01-18 04:34:16 +0000
@@ -0,0 +1,2202 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Automake file
+
+# TODO([e-mail]): automate the generation of *.h from *.h.pump.
+
+
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+TESTS = samples/sample1_unittest$(EXEEXT) \
+	samples/sample2_unittest$(EXEEXT) \
+	samples/sample3_unittest$(EXEEXT) \
+	samples/sample4_unittest$(EXEEXT) \
+	samples/sample5_unittest$(EXEEXT) \
+	samples/sample6_unittest$(EXEEXT) \
+	samples/sample7_unittest$(EXEEXT) \
+	samples/sample8_unittest$(EXEEXT) \
+	test/gtest-death-test_test$(EXEEXT) \
+	test/gtest_environment_test$(EXEEXT) \
+	test/gtest-filepath_test$(EXEEXT) \
+	test/gtest-linked_ptr_test$(EXEEXT) \
+	test/gtest_main_unittest$(EXEEXT) \
+	test/gtest-message_test$(EXEEXT) \
+	test/gtest_no_test_unittest$(EXEEXT) \
+	test/gtest-options_test$(EXEEXT) \
+	test/gtest-param-test_test$(EXEEXT) \
+	test/gtest-port_test$(EXEEXT) \
+	test/gtest_pred_impl_unittest$(EXEEXT) \
+	test/gtest_prod_test$(EXEEXT) test/gtest_repeat_test$(EXEEXT) \
+	test/gtest_sole_header_test$(EXEEXT) \
+	test/gtest_stress_test$(EXEEXT) \
+	test/gtest-test-part_test$(EXEEXT) \
+	test/gtest_throw_on_failure_ex_test$(EXEEXT) \
+	test/gtest-typed-test_test$(EXEEXT) \
+	test/gtest_unittest$(EXEEXT) \
+	test/gtest-unittest-api_test$(EXEEXT) \
+	test/gtest_no_rtti_test$(EXEEXT) \
+	test/gtest-tuple_test$(EXEEXT) \
+	test/gtest_use_own_tuple_test$(EXEEXT) $(am__append_2)
+check_PROGRAMS = samples/sample1_unittest$(EXEEXT) \
+	samples/sample2_unittest$(EXEEXT) \
+	samples/sample3_unittest$(EXEEXT) \
+	samples/sample4_unittest$(EXEEXT) \
+	samples/sample5_unittest$(EXEEXT) \
+	samples/sample6_unittest$(EXEEXT) \
+	samples/sample7_unittest$(EXEEXT) \
+	samples/sample8_unittest$(EXEEXT) \
+	test/gtest-death-test_test$(EXEEXT) \
+	test/gtest_environment_test$(EXEEXT) \
+	test/gtest-filepath_test$(EXEEXT) \
+	test/gtest-linked_ptr_test$(EXEEXT) \
+	test/gtest_main_unittest$(EXEEXT) \
+	test/gtest-message_test$(EXEEXT) \
+	test/gtest_no_test_unittest$(EXEEXT) \
+	test/gtest-options_test$(EXEEXT) \
+	test/gtest-param-test_test$(EXEEXT) \
+	test/gtest-port_test$(EXEEXT) \
+	test/gtest_pred_impl_unittest$(EXEEXT) \
+	test/gtest_prod_test$(EXEEXT) test/gtest_repeat_test$(EXEEXT) \
+	test/gtest_sole_header_test$(EXEEXT) \
+	test/gtest_stress_test$(EXEEXT) \
+	test/gtest-test-part_test$(EXEEXT) \
+	test/gtest_throw_on_failure_ex_test$(EXEEXT) \
+	test/gtest-typed-test_test$(EXEEXT) \
+	test/gtest_unittest$(EXEEXT) \
+	test/gtest-unittest-api_test$(EXEEXT) \
+	test/gtest_no_rtti_test$(EXEEXT) \
+	test/gtest-tuple_test$(EXEEXT) \
+	test/gtest_use_own_tuple_test$(EXEEXT) $(am__EXEEXT_1)
+@HAVE_PYTHON_TRUE@am__append_1 =  \
+@HAVE_PYTHON_TRUE@	test/gtest_break_on_failure_unittest_ \
+@HAVE_PYTHON_TRUE@	test/gtest_color_test_ \
+@HAVE_PYTHON_TRUE@	test/gtest_env_var_test_ \
+@HAVE_PYTHON_TRUE@	test/gtest_filter_unittest_ \
+@HAVE_PYTHON_TRUE@	test/gtest_help_test_ \
+@HAVE_PYTHON_TRUE@	test/gtest_list_tests_unittest_ \
+@HAVE_PYTHON_TRUE@	test/gtest_output_test_ \
+@HAVE_PYTHON_TRUE@	test/gtest_throw_on_failure_test_ \
+@HAVE_PYTHON_TRUE@	test/gtest_uninitialized_test_ \
+@HAVE_PYTHON_TRUE@	test/gtest_xml_outfile1_test_ \
+@HAVE_PYTHON_TRUE@	test/gtest_xml_outfile2_test_ \
+@HAVE_PYTHON_TRUE@	test/gtest_xml_output_unittest_
+@HAVE_PYTHON_TRUE@am__append_2 =  \
+@HAVE_PYTHON_TRUE@	test/gtest_break_on_failure_unittest.py \
+@HAVE_PYTHON_TRUE@	test/gtest_color_test.py \
+@HAVE_PYTHON_TRUE@	test/gtest_env_var_test.py \
+@HAVE_PYTHON_TRUE@	test/gtest_filter_unittest.py \
+@HAVE_PYTHON_TRUE@	test/gtest_help_test.py \
+@HAVE_PYTHON_TRUE@	test/gtest_list_tests_unittest.py \
+@HAVE_PYTHON_TRUE@	test/gtest_output_test.py \
+@HAVE_PYTHON_TRUE@	test/gtest_throw_on_failure_test.py \
+@HAVE_PYTHON_TRUE@	test/gtest_uninitialized_test.py \
+@HAVE_PYTHON_TRUE@	test/gtest_xml_outfiles_test.py \
+@HAVE_PYTHON_TRUE@	test/gtest_xml_output_unittest.py
+
+# TODO([e-mail]): make the build script compile and run the
+#   negative-compilation tests.  (The test/gtest_nc* files are unfinished
+#   implementation of tests for verifying that certain kinds of misuse
+#   of Google Test don't compile.)
+@HAVE_PYTHON_TRUE@am__append_3 =  \
+@HAVE_PYTHON_TRUE@	test/gtest_output_test_golden_lin.txt \
+@HAVE_PYTHON_TRUE@	test/gtest_output_test_golden_win.txt \
+@HAVE_PYTHON_TRUE@	$(check_SCRIPTS) test/gtest_nc.cc \
+@HAVE_PYTHON_TRUE@	test/gtest_nc_test.py
+subdir = .
+DIST_COMMON = README $(am__configure_deps) $(pkginclude_HEADERS) \
+	$(pkginclude_internal_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(top_srcdir)/build-aux/config.h.in \
+	$(top_srcdir)/configure $(top_srcdir)/scripts/gtest-config.in \
+	COPYING build-aux/config.guess build-aux/config.sub \
+	build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \
+	build-aux/missing
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/build-aux/config.h
+CONFIG_CLEAN_FILES = scripts/gtest-config
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+	"$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgincludedir)" \
+	"$(DESTDIR)$(pkginclude_internaldir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+lib_libgtest_la_LIBADD =
+am__dirstamp = $(am__leading_dot)dirstamp
+am_lib_libgtest_la_OBJECTS = src/gtest.lo src/gtest-death-test.lo \
+	src/gtest-filepath.lo src/gtest-port.lo src/gtest-test-part.lo \
+	src/gtest-typed-test.lo
+lib_libgtest_la_OBJECTS = $(am_lib_libgtest_la_OBJECTS)
+lib_libgtest_main_la_DEPENDENCIES = lib/libgtest.la
+am_lib_libgtest_main_la_OBJECTS = src/gtest_main.lo
+lib_libgtest_main_la_OBJECTS = $(am_lib_libgtest_main_la_OBJECTS)
+samples_libsamples_la_LIBADD =
+am_samples_libsamples_la_OBJECTS = samples/sample1.lo \
+	samples/sample2.lo samples/sample4.lo
+samples_libsamples_la_OBJECTS = $(am_samples_libsamples_la_OBJECTS)
+@HAVE_PYTHON_TRUE@am__EXEEXT_1 = test/gtest_break_on_failure_unittest_$(EXEEXT) \
+@HAVE_PYTHON_TRUE@	test/gtest_color_test_$(EXEEXT) \
+@HAVE_PYTHON_TRUE@	test/gtest_env_var_test_$(EXEEXT) \
+@HAVE_PYTHON_TRUE@	test/gtest_filter_unittest_$(EXEEXT) \
+@HAVE_PYTHON_TRUE@	test/gtest_help_test_$(EXEEXT) \
+@HAVE_PYTHON_TRUE@	test/gtest_list_tests_unittest_$(EXEEXT) \
+@HAVE_PYTHON_TRUE@	test/gtest_output_test_$(EXEEXT) \
+@HAVE_PYTHON_TRUE@	test/gtest_throw_on_failure_test_$(EXEEXT) \
+@HAVE_PYTHON_TRUE@	test/gtest_uninitialized_test_$(EXEEXT) \
+@HAVE_PYTHON_TRUE@	test/gtest_xml_outfile1_test_$(EXEEXT) \
+@HAVE_PYTHON_TRUE@	test/gtest_xml_outfile2_test_$(EXEEXT) \
+@HAVE_PYTHON_TRUE@	test/gtest_xml_output_unittest_$(EXEEXT)
+am_samples_sample1_unittest_OBJECTS =  \
+	samples/sample1_unittest.$(OBJEXT)
+samples_sample1_unittest_OBJECTS =  \
+	$(am_samples_sample1_unittest_OBJECTS)
+samples_sample1_unittest_DEPENDENCIES = lib/libgtest_main.la \
+	samples/libsamples.la
+am_samples_sample2_unittest_OBJECTS =  \
+	samples/sample2_unittest.$(OBJEXT)
+samples_sample2_unittest_OBJECTS =  \
+	$(am_samples_sample2_unittest_OBJECTS)
+samples_sample2_unittest_DEPENDENCIES = lib/libgtest_main.la \
+	samples/libsamples.la
+am_samples_sample3_unittest_OBJECTS =  \
+	samples/sample3_unittest.$(OBJEXT)
+samples_sample3_unittest_OBJECTS =  \
+	$(am_samples_sample3_unittest_OBJECTS)
+samples_sample3_unittest_DEPENDENCIES = lib/libgtest_main.la \
+	samples/libsamples.la
+am_samples_sample4_unittest_OBJECTS =  \
+	samples/sample4_unittest.$(OBJEXT)
+samples_sample4_unittest_OBJECTS =  \
+	$(am_samples_sample4_unittest_OBJECTS)
+samples_sample4_unittest_DEPENDENCIES = lib/libgtest_main.la \
+	samples/libsamples.la
+am_samples_sample5_unittest_OBJECTS =  \
+	samples/sample5_unittest.$(OBJEXT)
+samples_sample5_unittest_OBJECTS =  \
+	$(am_samples_sample5_unittest_OBJECTS)
+samples_sample5_unittest_DEPENDENCIES = lib/libgtest_main.la \
+	samples/libsamples.la
+am_samples_sample6_unittest_OBJECTS =  \
+	samples/sample6_unittest.$(OBJEXT)
+samples_sample6_unittest_OBJECTS =  \
+	$(am_samples_sample6_unittest_OBJECTS)
+samples_sample6_unittest_DEPENDENCIES = lib/libgtest_main.la \
+	samples/libsamples.la
+am_samples_sample7_unittest_OBJECTS =  \
+	samples/sample7_unittest.$(OBJEXT)
+samples_sample7_unittest_OBJECTS =  \
+	$(am_samples_sample7_unittest_OBJECTS)
+samples_sample7_unittest_DEPENDENCIES = lib/libgtest_main.la \
+	samples/libsamples.la
+am_samples_sample8_unittest_OBJECTS =  \
+	samples/sample8_unittest.$(OBJEXT)
+samples_sample8_unittest_OBJECTS =  \
+	$(am_samples_sample8_unittest_OBJECTS)
+samples_sample8_unittest_DEPENDENCIES = lib/libgtest_main.la \
+	samples/libsamples.la
+am_test_gtest_death_test_test_OBJECTS = test/test_gtest_death_test_test-gtest-death-test_test.$(OBJEXT)
+test_gtest_death_test_test_OBJECTS =  \
+	$(am_test_gtest_death_test_test_OBJECTS)
+am__DEPENDENCIES_1 =
+test_gtest_death_test_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) lib/libgtest_main.la
+test_gtest_death_test_test_LINK = $(LIBTOOL) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(test_gtest_death_test_test_CXXFLAGS) $(CXXFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_gtest_filepath_test_OBJECTS =  \
+	test/gtest-filepath_test.$(OBJEXT)
+test_gtest_filepath_test_OBJECTS =  \
+	$(am_test_gtest_filepath_test_OBJECTS)
+test_gtest_filepath_test_DEPENDENCIES = lib/libgtest_main.la
+am_test_gtest_linked_ptr_test_OBJECTS =  \
+	test/gtest-linked_ptr_test.$(OBJEXT)
+test_gtest_linked_ptr_test_OBJECTS =  \
+	$(am_test_gtest_linked_ptr_test_OBJECTS)
+test_gtest_linked_ptr_test_DEPENDENCIES = lib/libgtest_main.la
+am_test_gtest_message_test_OBJECTS =  \
+	test/gtest-message_test.$(OBJEXT)
+test_gtest_message_test_OBJECTS =  \
+	$(am_test_gtest_message_test_OBJECTS)
+test_gtest_message_test_DEPENDENCIES = lib/libgtest_main.la
+am_test_gtest_options_test_OBJECTS =  \
+	test/gtest-options_test.$(OBJEXT)
+test_gtest_options_test_OBJECTS =  \
+	$(am_test_gtest_options_test_OBJECTS)
+test_gtest_options_test_DEPENDENCIES = lib/libgtest_main.la
+am_test_gtest_param_test_test_OBJECTS =  \
+	test/gtest-param-test_test.$(OBJEXT) \
+	test/gtest-param-test2_test.$(OBJEXT)
+test_gtest_param_test_test_OBJECTS =  \
+	$(am_test_gtest_param_test_test_OBJECTS)
+test_gtest_param_test_test_DEPENDENCIES = lib/libgtest.la
+am_test_gtest_port_test_OBJECTS = test/gtest-port_test.$(OBJEXT)
+test_gtest_port_test_OBJECTS = $(am_test_gtest_port_test_OBJECTS)
+test_gtest_port_test_DEPENDENCIES = lib/libgtest_main.la
+am_test_gtest_test_part_test_OBJECTS =  \
+	test/gtest-test-part_test.$(OBJEXT)
+test_gtest_test_part_test_OBJECTS =  \
+	$(am_test_gtest_test_part_test_OBJECTS)
+test_gtest_test_part_test_DEPENDENCIES = lib/libgtest_main.la
+am_test_gtest_tuple_test_OBJECTS =  \
+	test/test_gtest_tuple_test-gtest-tuple_test.$(OBJEXT) \
+	src/test_gtest_tuple_test-gtest-all.$(OBJEXT) \
+	src/test_gtest_tuple_test-gtest_main.$(OBJEXT)
+test_gtest_tuple_test_OBJECTS = $(am_test_gtest_tuple_test_OBJECTS)
+test_gtest_tuple_test_LDADD = $(LDADD)
+test_gtest_tuple_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(test_gtest_tuple_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_test_gtest_typed_test_test_OBJECTS =  \
+	test/gtest-typed-test_test.$(OBJEXT) \
+	test/gtest-typed-test2_test.$(OBJEXT)
+test_gtest_typed_test_test_OBJECTS =  \
+	$(am_test_gtest_typed_test_test_OBJECTS)
+test_gtest_typed_test_test_DEPENDENCIES = lib/libgtest_main.la
+am_test_gtest_unittest_api_test_OBJECTS =  \
+	test/gtest-unittest-api_test.$(OBJEXT)
+test_gtest_unittest_api_test_OBJECTS =  \
+	$(am_test_gtest_unittest_api_test_OBJECTS)
+test_gtest_unittest_api_test_DEPENDENCIES = lib/libgtest_main.la
+am__test_gtest_break_on_failure_unittest__SOURCES_DIST =  \
+	test/gtest_break_on_failure_unittest_.cc
+@HAVE_PYTHON_TRUE@am_test_gtest_break_on_failure_unittest__OBJECTS = test/gtest_break_on_failure_unittest_.$(OBJEXT)
+test_gtest_break_on_failure_unittest__OBJECTS =  \
+	$(am_test_gtest_break_on_failure_unittest__OBJECTS)
+@HAVE_PYTHON_TRUE@test_gtest_break_on_failure_unittest__DEPENDENCIES =  \
+@HAVE_PYTHON_TRUE@	lib/libgtest.la
+am__test_gtest_color_test__SOURCES_DIST = test/gtest_color_test_.cc
+@HAVE_PYTHON_TRUE@am_test_gtest_color_test__OBJECTS =  \
+@HAVE_PYTHON_TRUE@	test/gtest_color_test_.$(OBJEXT)
+test_gtest_color_test__OBJECTS = $(am_test_gtest_color_test__OBJECTS)
+@HAVE_PYTHON_TRUE@test_gtest_color_test__DEPENDENCIES =  \
+@HAVE_PYTHON_TRUE@	lib/libgtest.la
+am__test_gtest_env_var_test__SOURCES_DIST =  \
+	test/gtest_env_var_test_.cc
+@HAVE_PYTHON_TRUE@am_test_gtest_env_var_test__OBJECTS =  \
+@HAVE_PYTHON_TRUE@	test/gtest_env_var_test_.$(OBJEXT)
+test_gtest_env_var_test__OBJECTS =  \
+	$(am_test_gtest_env_var_test__OBJECTS)
+@HAVE_PYTHON_TRUE@test_gtest_env_var_test__DEPENDENCIES =  \
+@HAVE_PYTHON_TRUE@	lib/libgtest.la
+am_test_gtest_environment_test_OBJECTS =  \
+	test/gtest_environment_test.$(OBJEXT)
+test_gtest_environment_test_OBJECTS =  \
+	$(am_test_gtest_environment_test_OBJECTS)
+test_gtest_environment_test_DEPENDENCIES = lib/libgtest.la
+am__test_gtest_filter_unittest__SOURCES_DIST =  \
+	test/gtest_filter_unittest_.cc
+@HAVE_PYTHON_TRUE@am_test_gtest_filter_unittest__OBJECTS =  \
+@HAVE_PYTHON_TRUE@	test/gtest_filter_unittest_.$(OBJEXT)
+test_gtest_filter_unittest__OBJECTS =  \
+	$(am_test_gtest_filter_unittest__OBJECTS)
+@HAVE_PYTHON_TRUE@test_gtest_filter_unittest__DEPENDENCIES =  \
+@HAVE_PYTHON_TRUE@	lib/libgtest.la
+am__test_gtest_help_test__SOURCES_DIST = test/gtest_help_test_.cc
+@HAVE_PYTHON_TRUE@am_test_gtest_help_test__OBJECTS =  \
+@HAVE_PYTHON_TRUE@	test/gtest_help_test_.$(OBJEXT)
+test_gtest_help_test__OBJECTS = $(am_test_gtest_help_test__OBJECTS)
+@HAVE_PYTHON_TRUE@test_gtest_help_test__DEPENDENCIES =  \
+@HAVE_PYTHON_TRUE@	lib/libgtest_main.la
+am__test_gtest_list_tests_unittest__SOURCES_DIST =  \
+	test/gtest_list_tests_unittest_.cc
+@HAVE_PYTHON_TRUE@am_test_gtest_list_tests_unittest__OBJECTS =  \
+@HAVE_PYTHON_TRUE@	test/gtest_list_tests_unittest_.$(OBJEXT)
+test_gtest_list_tests_unittest__OBJECTS =  \
+	$(am_test_gtest_list_tests_unittest__OBJECTS)
+@HAVE_PYTHON_TRUE@test_gtest_list_tests_unittest__DEPENDENCIES =  \
+@HAVE_PYTHON_TRUE@	lib/libgtest.la
+am_test_gtest_main_unittest_OBJECTS =  \
+	test/gtest_main_unittest.$(OBJEXT)
+test_gtest_main_unittest_OBJECTS =  \
+	$(am_test_gtest_main_unittest_OBJECTS)
+test_gtest_main_unittest_DEPENDENCIES = lib/libgtest_main.la
+am_test_gtest_no_rtti_test_OBJECTS =  \
+	test/test_gtest_no_rtti_test-gtest_unittest.$(OBJEXT) \
+	src/test_gtest_no_rtti_test-gtest-all.$(OBJEXT) \
+	src/test_gtest_no_rtti_test-gtest_main.$(OBJEXT)
+test_gtest_no_rtti_test_OBJECTS =  \
+	$(am_test_gtest_no_rtti_test_OBJECTS)
+test_gtest_no_rtti_test_LDADD = $(LDADD)
+test_gtest_no_rtti_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(test_gtest_no_rtti_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_test_gtest_no_test_unittest_OBJECTS =  \
+	test/gtest_no_test_unittest.$(OBJEXT)
+test_gtest_no_test_unittest_OBJECTS =  \
+	$(am_test_gtest_no_test_unittest_OBJECTS)
+test_gtest_no_test_unittest_DEPENDENCIES = lib/libgtest.la
+am__test_gtest_output_test__SOURCES_DIST = test/gtest_output_test_.cc
+@HAVE_PYTHON_TRUE@am_test_gtest_output_test__OBJECTS =  \
+@HAVE_PYTHON_TRUE@	test/gtest_output_test_.$(OBJEXT)
+test_gtest_output_test__OBJECTS =  \
+	$(am_test_gtest_output_test__OBJECTS)
+@HAVE_PYTHON_TRUE@test_gtest_output_test__DEPENDENCIES =  \
+@HAVE_PYTHON_TRUE@	lib/libgtest.la
+am_test_gtest_pred_impl_unittest_OBJECTS =  \
+	test/gtest_pred_impl_unittest.$(OBJEXT)
+test_gtest_pred_impl_unittest_OBJECTS =  \
+	$(am_test_gtest_pred_impl_unittest_OBJECTS)
+test_gtest_pred_impl_unittest_DEPENDENCIES = lib/libgtest_main.la
+am_test_gtest_prod_test_OBJECTS = test/gtest_prod_test.$(OBJEXT) \
+	test/production.$(OBJEXT)
+test_gtest_prod_test_OBJECTS = $(am_test_gtest_prod_test_OBJECTS)
+test_gtest_prod_test_DEPENDENCIES = lib/libgtest_main.la
+am_test_gtest_repeat_test_OBJECTS = test/gtest_repeat_test.$(OBJEXT)
+test_gtest_repeat_test_OBJECTS = $(am_test_gtest_repeat_test_OBJECTS)
+test_gtest_repeat_test_DEPENDENCIES = lib/libgtest.la
+am_test_gtest_sole_header_test_OBJECTS =  \
+	test/gtest_sole_header_test.$(OBJEXT)
+test_gtest_sole_header_test_OBJECTS =  \
+	$(am_test_gtest_sole_header_test_OBJECTS)
+test_gtest_sole_header_test_DEPENDENCIES = lib/libgtest_main.la
+am_test_gtest_stress_test_OBJECTS = test/gtest_stress_test.$(OBJEXT)
+test_gtest_stress_test_OBJECTS = $(am_test_gtest_stress_test_OBJECTS)
+test_gtest_stress_test_DEPENDENCIES = lib/libgtest.la
+am_test_gtest_throw_on_failure_ex_test_OBJECTS = test/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.$(OBJEXT) \
+	src/test_gtest_throw_on_failure_ex_test-gtest-all.$(OBJEXT)
+test_gtest_throw_on_failure_ex_test_OBJECTS =  \
+	$(am_test_gtest_throw_on_failure_ex_test_OBJECTS)
+test_gtest_throw_on_failure_ex_test_LDADD = $(LDADD)
+test_gtest_throw_on_failure_ex_test_LINK = $(LIBTOOL) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(test_gtest_throw_on_failure_ex_test_CXXFLAGS) $(CXXFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+am__test_gtest_throw_on_failure_test__SOURCES_DIST =  \
+	test/gtest_throw_on_failure_test_.cc src/gtest-all.cc
+@HAVE_PYTHON_TRUE@am_test_gtest_throw_on_failure_test__OBJECTS = test/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.$(OBJEXT) \
+@HAVE_PYTHON_TRUE@	src/test_gtest_throw_on_failure_test_-gtest-all.$(OBJEXT)
+test_gtest_throw_on_failure_test__OBJECTS =  \
+	$(am_test_gtest_throw_on_failure_test__OBJECTS)
+test_gtest_throw_on_failure_test__LDADD = $(LDADD)
+test_gtest_throw_on_failure_test__LINK = $(LIBTOOL) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(test_gtest_throw_on_failure_test__CXXFLAGS) $(CXXFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+am__test_gtest_uninitialized_test__SOURCES_DIST =  \
+	test/gtest_uninitialized_test_.cc
+@HAVE_PYTHON_TRUE@am_test_gtest_uninitialized_test__OBJECTS =  \
+@HAVE_PYTHON_TRUE@	test/gtest_uninitialized_test_.$(OBJEXT)
+test_gtest_uninitialized_test__OBJECTS =  \
+	$(am_test_gtest_uninitialized_test__OBJECTS)
+@HAVE_PYTHON_TRUE@test_gtest_uninitialized_test__DEPENDENCIES =  \
+@HAVE_PYTHON_TRUE@	lib/libgtest.la
+am_test_gtest_unittest_OBJECTS = test/gtest_unittest.$(OBJEXT)
+test_gtest_unittest_OBJECTS = $(am_test_gtest_unittest_OBJECTS)
+test_gtest_unittest_DEPENDENCIES = lib/libgtest_main.la
+am_test_gtest_use_own_tuple_test_OBJECTS = test/test_gtest_use_own_tuple_test-gtest-param-test_test.$(OBJEXT) \
+	test/test_gtest_use_own_tuple_test-gtest-param-test2_test.$(OBJEXT) \
+	src/test_gtest_use_own_tuple_test-gtest-all.$(OBJEXT)
+test_gtest_use_own_tuple_test_OBJECTS =  \
+	$(am_test_gtest_use_own_tuple_test_OBJECTS)
+test_gtest_use_own_tuple_test_LDADD = $(LDADD)
+test_gtest_use_own_tuple_test_LINK = $(LIBTOOL) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(test_gtest_use_own_tuple_test_CXXFLAGS) $(CXXFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+am__test_gtest_xml_outfile1_test__SOURCES_DIST =  \
+	test/gtest_xml_outfile1_test_.cc
+@HAVE_PYTHON_TRUE@am_test_gtest_xml_outfile1_test__OBJECTS =  \
+@HAVE_PYTHON_TRUE@	test/gtest_xml_outfile1_test_.$(OBJEXT)
+test_gtest_xml_outfile1_test__OBJECTS =  \
+	$(am_test_gtest_xml_outfile1_test__OBJECTS)
+@HAVE_PYTHON_TRUE@test_gtest_xml_outfile1_test__DEPENDENCIES =  \
+@HAVE_PYTHON_TRUE@	lib/libgtest_main.la
+am__test_gtest_xml_outfile2_test__SOURCES_DIST =  \
+	test/gtest_xml_outfile2_test_.cc
+@HAVE_PYTHON_TRUE@am_test_gtest_xml_outfile2_test__OBJECTS =  \
+@HAVE_PYTHON_TRUE@	test/gtest_xml_outfile2_test_.$(OBJEXT)
+test_gtest_xml_outfile2_test__OBJECTS =  \
+	$(am_test_gtest_xml_outfile2_test__OBJECTS)
+@HAVE_PYTHON_TRUE@test_gtest_xml_outfile2_test__DEPENDENCIES =  \
+@HAVE_PYTHON_TRUE@	lib/libgtest_main.la
+am__test_gtest_xml_output_unittest__SOURCES_DIST =  \
+	test/gtest_xml_output_unittest_.cc
+@HAVE_PYTHON_TRUE@am_test_gtest_xml_output_unittest__OBJECTS =  \
+@HAVE_PYTHON_TRUE@	test/gtest_xml_output_unittest_.$(OBJEXT)
+test_gtest_xml_output_unittest__OBJECTS =  \
+	$(am_test_gtest_xml_output_unittest__OBJECTS)
+@HAVE_PYTHON_TRUE@test_gtest_xml_output_unittest__DEPENDENCIES =  \
+@HAVE_PYTHON_TRUE@	lib/libgtest_main.la
+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(bin_SCRIPTS)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/build-aux
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(lib_libgtest_la_SOURCES) $(lib_libgtest_main_la_SOURCES) \
+	$(samples_libsamples_la_SOURCES) \
+	$(samples_sample1_unittest_SOURCES) \
+	$(samples_sample2_unittest_SOURCES) \
+	$(samples_sample3_unittest_SOURCES) \
+	$(samples_sample4_unittest_SOURCES) \
+	$(samples_sample5_unittest_SOURCES) \
+	$(samples_sample6_unittest_SOURCES) \
+	$(samples_sample7_unittest_SOURCES) \
+	$(samples_sample8_unittest_SOURCES) \
+	$(test_gtest_death_test_test_SOURCES) \
+	$(test_gtest_filepath_test_SOURCES) \
+	$(test_gtest_linked_ptr_test_SOURCES) \
+	$(test_gtest_message_test_SOURCES) \
+	$(test_gtest_options_test_SOURCES) \
+	$(test_gtest_param_test_test_SOURCES) \
+	$(test_gtest_port_test_SOURCES) \
+	$(test_gtest_test_part_test_SOURCES) \
+	$(test_gtest_tuple_test_SOURCES) \
+	$(test_gtest_typed_test_test_SOURCES) \
+	$(test_gtest_unittest_api_test_SOURCES) \
+	$(test_gtest_break_on_failure_unittest__SOURCES) \
+	$(test_gtest_color_test__SOURCES) \
+	$(test_gtest_env_var_test__SOURCES) \
+	$(test_gtest_environment_test_SOURCES) \
+	$(test_gtest_filter_unittest__SOURCES) \
+	$(test_gtest_help_test__SOURCES) \
+	$(test_gtest_list_tests_unittest__SOURCES) \
+	$(test_gtest_main_unittest_SOURCES) \
+	$(test_gtest_no_rtti_test_SOURCES) \
+	$(test_gtest_no_test_unittest_SOURCES) \
+	$(test_gtest_output_test__SOURCES) \
+	$(test_gtest_pred_impl_unittest_SOURCES) \
+	$(test_gtest_prod_test_SOURCES) \
+	$(test_gtest_repeat_test_SOURCES) \
+	$(test_gtest_sole_header_test_SOURCES) \
+	$(test_gtest_stress_test_SOURCES) \
+	$(test_gtest_throw_on_failure_ex_test_SOURCES) \
+	$(test_gtest_throw_on_failure_test__SOURCES) \
+	$(test_gtest_uninitialized_test__SOURCES) \
+	$(test_gtest_unittest_SOURCES) \
+	$(test_gtest_use_own_tuple_test_SOURCES) \
+	$(test_gtest_xml_outfile1_test__SOURCES) \
+	$(test_gtest_xml_outfile2_test__SOURCES) \
+	$(test_gtest_xml_output_unittest__SOURCES)
+DIST_SOURCES = $(lib_libgtest_la_SOURCES) \
+	$(lib_libgtest_main_la_SOURCES) \
+	$(samples_libsamples_la_SOURCES) \
+	$(samples_sample1_unittest_SOURCES) \
+	$(samples_sample2_unittest_SOURCES) \
+	$(samples_sample3_unittest_SOURCES) \
+	$(samples_sample4_unittest_SOURCES) \
+	$(samples_sample5_unittest_SOURCES) \
+	$(samples_sample6_unittest_SOURCES) \
+	$(samples_sample7_unittest_SOURCES) \
+	$(samples_sample8_unittest_SOURCES) \
+	$(test_gtest_death_test_test_SOURCES) \
+	$(test_gtest_filepath_test_SOURCES) \
+	$(test_gtest_linked_ptr_test_SOURCES) \
+	$(test_gtest_message_test_SOURCES) \
+	$(test_gtest_options_test_SOURCES) \
+	$(test_gtest_param_test_test_SOURCES) \
+	$(test_gtest_port_test_SOURCES) \
+	$(test_gtest_test_part_test_SOURCES) \
+	$(test_gtest_tuple_test_SOURCES) \
+	$(test_gtest_typed_test_test_SOURCES) \
+	$(test_gtest_unittest_api_test_SOURCES) \
+	$(am__test_gtest_break_on_failure_unittest__SOURCES_DIST) \
+	$(am__test_gtest_color_test__SOURCES_DIST) \
+	$(am__test_gtest_env_var_test__SOURCES_DIST) \
+	$(test_gtest_environment_test_SOURCES) \
+	$(am__test_gtest_filter_unittest__SOURCES_DIST) \
+	$(am__test_gtest_help_test__SOURCES_DIST) \
+	$(am__test_gtest_list_tests_unittest__SOURCES_DIST) \
+	$(test_gtest_main_unittest_SOURCES) \
+	$(test_gtest_no_rtti_test_SOURCES) \
+	$(test_gtest_no_test_unittest_SOURCES) \
+	$(am__test_gtest_output_test__SOURCES_DIST) \
+	$(test_gtest_pred_impl_unittest_SOURCES) \
+	$(test_gtest_prod_test_SOURCES) \
+	$(test_gtest_repeat_test_SOURCES) \
+	$(test_gtest_sole_header_test_SOURCES) \
+	$(test_gtest_stress_test_SOURCES) \
+	$(test_gtest_throw_on_failure_ex_test_SOURCES) \
+	$(am__test_gtest_throw_on_failure_test__SOURCES_DIST) \
+	$(am__test_gtest_uninitialized_test__SOURCES_DIST) \
+	$(test_gtest_unittest_SOURCES) \
+	$(test_gtest_use_own_tuple_test_SOURCES) \
+	$(am__test_gtest_xml_outfile1_test__SOURCES_DIST) \
+	$(am__test_gtest_xml_outfile2_test__SOURCES_DIST) \
+	$(am__test_gtest_xml_output_unittest__SOURCES_DIST)
+m4dataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(m4data_DATA)
+pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+pkginclude_internalHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).zip
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+PYTHON = @PYTHON@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+acx_pthread_config = @acx_pthread_config@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+# Nonstandard package files for distribution
+
+# MSVC project files
+
+# xcode project files
+
+# xcode sample files
+
+# C++Builder project files
+EXTRA_DIST = CHANGES CONTRIBUTORS \
+	include/gtest/gtest-param-test.h.pump \
+	include/gtest/internal/gtest-tuple.h.pump \
+	include/gtest/internal/gtest-type-util.h.pump \
+	include/gtest/internal/gtest-param-util-generated.h.pump \
+	make/Makefile scons/SConscript scripts/fuse_gtest_files.py \
+	scripts/gen_gtest_pred_impl.py scripts/test/Makefile \
+	test/gtest_all_test.cc msvc/gtest.sln msvc/gtest.vcproj \
+	msvc/gtest_color_test_.vcproj msvc/gtest_env_var_test_.vcproj \
+	msvc/gtest_environment_test.vcproj msvc/gtest_main.vcproj \
+	msvc/gtest_output_test_.vcproj msvc/gtest_prod_test.vcproj \
+	msvc/gtest_uninitialized_test_.vcproj \
+	msvc/gtest_unittest.vcproj xcode/Config/DebugProject.xcconfig \
+	xcode/Config/FrameworkTarget.xcconfig \
+	xcode/Config/General.xcconfig \
+	xcode/Config/ReleaseProject.xcconfig \
+	xcode/Config/TestTarget.xcconfig \
+	xcode/Config/InternalTestTarget.xcconfig \
+	xcode/Config/InternalPythonTestTarget.xcconfig \
+	xcode/Resources/Info.plist xcode/Scripts/versiongenerate.py \
+	xcode/Scripts/runtests.sh \
+	xcode/gtest.xcodeproj/project.pbxproj \
+	xcode/Samples/FrameworkSample/Info.plist \
+	xcode/Samples/FrameworkSample/widget_test.cc \
+	xcode/Samples/FrameworkSample/widget.cc \
+	xcode/Samples/FrameworkSample/widget.h \
+	xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj \
+	codegear/gtest_all.cc codegear/gtest_link.cc \
+	codegear/gtest.cbproj codegear/gtest_main.cbproj \
+	codegear/gtest_unittest.cbproj codegear/gtest.groupproj \
+	$(m4data_DATA) $(am__append_3)
+
+# TODO([e-mail]): integrate scripts/gen_gtest_pred_impl.py into
+#   the build system such that a user can specify the maximum predicate
+#   arity here and have the script automatically generate the
+#   corresponding .h and .cc files.
+
+# Scripts and utilities
+bin_SCRIPTS = scripts/gtest-config
+CLEANFILES = $(bin_SCRIPTS)
+
+# Distribute and install M4 macro
+m4datadir = $(datadir)/aclocal
+m4data_DATA = m4/gtest.m4
+
+# We define the global AM_CPPFLAGS as everything we compile includes from these
+# directories.
+AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include
+
+# Build rules for libraries.
+lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la
+lib_libgtest_la_SOURCES = src/gtest.cc \
+                          src/gtest-death-test.cc \
+                          src/gtest-filepath.cc \
+                          src/gtest-internal-inl.h \
+                          src/gtest-port.cc \
+                          src/gtest-test-part.cc \
+                          src/gtest-typed-test.cc
+
+pkginclude_HEADERS = include/gtest/gtest.h \
+                     include/gtest/gtest-death-test.h \
+                     include/gtest/gtest-message.h \
+                     include/gtest/gtest-param-test.h \
+                     include/gtest/gtest_pred_impl.h \
+                     include/gtest/gtest_prod.h \
+                     include/gtest/gtest-spi.h \
+                     include/gtest/gtest-test-part.h \
+                     include/gtest/gtest-typed-test.h
+
+pkginclude_internaldir = $(pkgincludedir)/internal
+pkginclude_internal_HEADERS = \
+  include/gtest/internal/gtest-death-test-internal.h \
+  include/gtest/internal/gtest-filepath.h \
+  include/gtest/internal/gtest-internal.h \
+  include/gtest/internal/gtest-linked_ptr.h \
+  include/gtest/internal/gtest-param-util-generated.h \
+  include/gtest/internal/gtest-param-util.h \
+  include/gtest/internal/gtest-port.h \
+  include/gtest/internal/gtest-string.h \
+  include/gtest/internal/gtest-tuple.h \
+  include/gtest/internal/gtest-type-util.h
+
+lib_libgtest_main_la_SOURCES = src/gtest_main.cc
+lib_libgtest_main_la_LIBADD = lib/libgtest.la
+
+# Bulid rules for samples and tests. Automake's naming for some of
+# these variables isn't terribly obvious, so this is a brief
+# reference:
+#
+# TESTS -- Programs run automatically by "make check"
+# check_PROGRAMS -- Programs built by "make check" but not necessarily run
+noinst_LTLIBRARIES = samples/libsamples.la
+samples_libsamples_la_SOURCES = samples/sample1.cc \
+                                samples/sample1.h \
+                                samples/sample2.cc \
+                                samples/sample2.h \
+                                samples/sample3-inl.h \
+                                samples/sample4.cc \
+                                samples/sample4.h
+
+TESTS_ENVIRONMENT = GTEST_SOURCE_DIR="$(srcdir)/test" \
+                    GTEST_BUILD_DIR="$(top_builddir)/test"
+
+samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc
+samples_sample1_unittest_LDADD = lib/libgtest_main.la \
+                                 samples/libsamples.la
+
+samples_sample2_unittest_SOURCES = samples/sample2_unittest.cc
+samples_sample2_unittest_LDADD = lib/libgtest_main.la \
+                                 samples/libsamples.la
+
+samples_sample3_unittest_SOURCES = samples/sample3_unittest.cc
+samples_sample3_unittest_LDADD = lib/libgtest_main.la \
+                                 samples/libsamples.la
+
+samples_sample4_unittest_SOURCES = samples/sample4_unittest.cc
+samples_sample4_unittest_LDADD = lib/libgtest_main.la \
+                                 samples/libsamples.la
+
+samples_sample5_unittest_SOURCES = samples/sample5_unittest.cc
+samples_sample5_unittest_LDADD = lib/libgtest_main.la \
+                                 samples/libsamples.la
+
+samples_sample6_unittest_SOURCES = samples/prime_tables.h \
+                                   samples/sample6_unittest.cc
+
+samples_sample6_unittest_LDADD = lib/libgtest_main.la \
+                                 samples/libsamples.la
+
+samples_sample7_unittest_SOURCES = samples/prime_tables.h \
+                                   samples/sample7_unittest.cc
+
+samples_sample7_unittest_LDADD = lib/libgtest_main.la \
+                                 samples/libsamples.la
+
+samples_sample8_unittest_SOURCES = samples/prime_tables.h \
+                                   samples/sample8_unittest.cc
+
+samples_sample8_unittest_LDADD = lib/libgtest_main.la \
+                                 samples/libsamples.la
+
+test_gtest_death_test_test_SOURCES = test/gtest-death-test_test.cc
+test_gtest_death_test_test_CXXFLAGS = $(AM_CXXFLAGS) $(PTHREAD_CFLAGS)
+test_gtest_death_test_test_LDADD = $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) \
+                                   lib/libgtest_main.la
+
+test_gtest_environment_test_SOURCES = test/gtest_environment_test.cc
+test_gtest_environment_test_LDADD = lib/libgtest.la
+test_gtest_filepath_test_SOURCES = test/gtest-filepath_test.cc
+test_gtest_filepath_test_LDADD = lib/libgtest_main.la
+test_gtest_linked_ptr_test_SOURCES = test/gtest-linked_ptr_test.cc
+test_gtest_linked_ptr_test_LDADD = lib/libgtest_main.la
+test_gtest_main_unittest_SOURCES = test/gtest_main_unittest.cc
+test_gtest_main_unittest_LDADD = lib/libgtest_main.la
+test_gtest_message_test_SOURCES = test/gtest-message_test.cc
+test_gtest_message_test_LDADD = lib/libgtest_main.la
+test_gtest_no_test_unittest_SOURCES = test/gtest_no_test_unittest.cc
+test_gtest_no_test_unittest_LDADD = lib/libgtest.la
+test_gtest_options_test_SOURCES = test/gtest-options_test.cc
+test_gtest_options_test_LDADD = lib/libgtest_main.la
+test_gtest_param_test_test_SOURCES = test/gtest-param-test_test.cc \
+                                     test/gtest-param-test2_test.cc \
+                                     test/gtest-param-test_test.h
+
+test_gtest_param_test_test_LDADD = lib/libgtest.la
+test_gtest_port_test_SOURCES = test/gtest-port_test.cc
+test_gtest_port_test_LDADD = lib/libgtest_main.la
+test_gtest_pred_impl_unittest_SOURCES = test/gtest_pred_impl_unittest.cc
+test_gtest_pred_impl_unittest_LDADD = lib/libgtest_main.la
+test_gtest_prod_test_SOURCES = test/gtest_prod_test.cc \
+                               test/production.cc \
+                               test/production.h
+
+test_gtest_prod_test_LDADD = lib/libgtest_main.la
+test_gtest_repeat_test_SOURCES = test/gtest_repeat_test.cc
+test_gtest_repeat_test_LDADD = lib/libgtest.la
+test_gtest_sole_header_test_SOURCES = test/gtest_sole_header_test.cc
+test_gtest_sole_header_test_LDADD = lib/libgtest_main.la
+test_gtest_stress_test_SOURCES = test/gtest_stress_test.cc
+test_gtest_stress_test_LDADD = lib/libgtest.la
+test_gtest_test_part_test_SOURCES = test/gtest-test-part_test.cc
+test_gtest_test_part_test_LDADD = lib/libgtest_main.la
+test_gtest_throw_on_failure_ex_test_SOURCES = \
+    test/gtest_throw_on_failure_ex_test.cc \
+    src/gtest-all.cc
+
+test_gtest_throw_on_failure_ex_test_CXXFLAGS = $(AM_CXXFLAGS) -fexceptions
+test_gtest_typed_test_test_SOURCES = test/gtest-typed-test_test.cc \
+                                     test/gtest-typed-test2_test.cc \
+                                     test/gtest-typed-test_test.h
+
+test_gtest_typed_test_test_LDADD = lib/libgtest_main.la
+test_gtest_unittest_SOURCES = test/gtest_unittest.cc
+test_gtest_unittest_LDADD = lib/libgtest_main.la
+test_gtest_unittest_api_test_SOURCES = test/gtest-unittest-api_test.cc
+test_gtest_unittest_api_test_LDADD = lib/libgtest_main.la
+test_gtest_no_rtti_test_SOURCES = test/gtest_unittest.cc \
+                                  src/gtest-all.cc \
+                                  src/gtest_main.cc
+
+test_gtest_no_rtti_test_CXXFLAGS = $(AM_CXXFLAGS) -fno-rtti -DGTEST_HAS_RTTI=0
+test_gtest_tuple_test_SOURCES = test/gtest-tuple_test.cc \
+                                src/gtest-all.cc \
+                                src/gtest_main.cc
+
+test_gtest_tuple_test_CXXFLAGS = $(AM_CXXFLAGS) -DGTEST_USE_OWN_TR1_TUPLE=1
+test_gtest_use_own_tuple_test_SOURCES = test/gtest-param-test_test.cc \
+                                        test/gtest-param-test2_test.cc \
+                                        src/gtest-all.cc
+
+test_gtest_use_own_tuple_test_CXXFLAGS = \
+    $(AM_CXXFLAGS) -DGTEST_USE_OWN_TR1_TUPLE=1
+
+
+# The following tests depend on the presence of a Python installation and are
+# keyed off of it. TODO([e-mail]): While we currently only attempt
+# to build and execute these tests if Autoconf has found Python v2.4 on the
+# system, we don't use the PYTHON variable it specified as the valid
+# interpreter. The problem is that TESTS_ENVIRONMENT is a global variable, and
+# thus we cannot distinguish between C++ unit tests and Python unit tests.
+
+# These two Python modules are used by multiple Python tests below.
+@HAVE_PYTHON_TRUE@check_SCRIPTS = test/gtest_test_utils.py \
+@HAVE_PYTHON_TRUE@	test/gtest_xml_test_utils.py \
+@HAVE_PYTHON_TRUE@	test/gtest_break_on_failure_unittest.py \
+@HAVE_PYTHON_TRUE@	test/gtest_color_test.py \
+@HAVE_PYTHON_TRUE@	test/gtest_env_var_test.py \
+@HAVE_PYTHON_TRUE@	test/gtest_filter_unittest.py \
+@HAVE_PYTHON_TRUE@	test/gtest_help_test.py \
+@HAVE_PYTHON_TRUE@	test/gtest_list_tests_unittest.py \
+@HAVE_PYTHON_TRUE@	test/gtest_output_test.py \
+@HAVE_PYTHON_TRUE@	test/gtest_throw_on_failure_test.py \
+@HAVE_PYTHON_TRUE@	test/gtest_uninitialized_test.py \
+@HAVE_PYTHON_TRUE@	test/gtest_xml_outfiles_test.py \
+@HAVE_PYTHON_TRUE@	test/gtest_xml_output_unittest.py
+@HAVE_PYTHON_TRUE@test_gtest_break_on_failure_unittest__SOURCES = \
+@HAVE_PYTHON_TRUE@  test/gtest_break_on_failure_unittest_.cc
+
+@HAVE_PYTHON_TRUE@test_gtest_break_on_failure_unittest__LDADD = lib/libgtest.la
+@HAVE_PYTHON_TRUE@test_gtest_color_test__SOURCES = test/gtest_color_test_.cc
+@HAVE_PYTHON_TRUE@test_gtest_color_test__LDADD = lib/libgtest.la
+@HAVE_PYTHON_TRUE@test_gtest_env_var_test__SOURCES = test/gtest_env_var_test_.cc
+@HAVE_PYTHON_TRUE@test_gtest_env_var_test__LDADD = lib/libgtest.la
+@HAVE_PYTHON_TRUE@test_gtest_filter_unittest__SOURCES = test/gtest_filter_unittest_.cc
+@HAVE_PYTHON_TRUE@test_gtest_filter_unittest__LDADD = lib/libgtest.la
+@HAVE_PYTHON_TRUE@test_gtest_help_test__SOURCES = test/gtest_help_test_.cc
+@HAVE_PYTHON_TRUE@test_gtest_help_test__LDADD = lib/libgtest_main.la
+@HAVE_PYTHON_TRUE@test_gtest_list_tests_unittest__SOURCES = test/gtest_list_tests_unittest_.cc
+@HAVE_PYTHON_TRUE@test_gtest_list_tests_unittest__LDADD = lib/libgtest.la
+@HAVE_PYTHON_TRUE@test_gtest_output_test__SOURCES = test/gtest_output_test_.cc
+@HAVE_PYTHON_TRUE@test_gtest_output_test__LDADD = lib/libgtest.la
+@HAVE_PYTHON_TRUE@test_gtest_throw_on_failure_test__SOURCES = \
+@HAVE_PYTHON_TRUE@  test/gtest_throw_on_failure_test_.cc \
+@HAVE_PYTHON_TRUE@  src/gtest-all.cc
+
+@HAVE_PYTHON_TRUE@test_gtest_throw_on_failure_test__CXXFLAGS = $(AM_CXXFLAGS) -fno-exceptions
+@HAVE_PYTHON_TRUE@test_gtest_uninitialized_test__SOURCES = test/gtest_uninitialized_test_.cc
+@HAVE_PYTHON_TRUE@test_gtest_uninitialized_test__LDADD = lib/libgtest.la
+@HAVE_PYTHON_TRUE@test_gtest_xml_outfile1_test__SOURCES = test/gtest_xml_outfile1_test_.cc
+@HAVE_PYTHON_TRUE@test_gtest_xml_outfile1_test__LDADD = lib/libgtest_main.la
+@HAVE_PYTHON_TRUE@test_gtest_xml_outfile2_test__SOURCES = test/gtest_xml_outfile2_test_.cc
+@HAVE_PYTHON_TRUE@test_gtest_xml_outfile2_test__LDADD = lib/libgtest_main.la
+@HAVE_PYTHON_TRUE@test_gtest_xml_output_unittest__SOURCES = test/gtest_xml_output_unittest_.cc
+@HAVE_PYTHON_TRUE@test_gtest_xml_output_unittest__LDADD = lib/libgtest_main.la
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cc .lo .o .obj
+am--refresh:
+	@:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+build-aux/config.h: build-aux/stamp-h1
+	@if test ! -f $@; then \
+	  rm -f build-aux/stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) build-aux/stamp-h1; \
+	else :; fi
+
+build-aux/stamp-h1: $(top_srcdir)/build-aux/config.h.in $(top_builddir)/config.status
+	@rm -f build-aux/stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status build-aux/config.h
+$(top_srcdir)/build-aux/config.h.in:  $(am__configure_deps) 
+	cd $(top_srcdir) && $(AUTOHEADER)
+	rm -f build-aux/stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f build-aux/config.h build-aux/stamp-h1
+scripts/gtest-config: $(top_builddir)/config.status $(top_srcdir)/scripts/gtest-config.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+src/$(am__dirstamp):
+	@$(MKDIR_P) src
+	@: > src/$(am__dirstamp)
+src/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/$(DEPDIR)
+	@: > src/$(DEPDIR)/$(am__dirstamp)
+src/gtest.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/gtest-death-test.lo: src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/gtest-filepath.lo: src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/gtest-port.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/gtest-test-part.lo: src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/gtest-typed-test.lo: src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+lib/$(am__dirstamp):
+	@$(MKDIR_P) lib
+	@: > lib/$(am__dirstamp)
+lib/libgtest.la: $(lib_libgtest_la_OBJECTS) $(lib_libgtest_la_DEPENDENCIES) lib/$(am__dirstamp)
+	$(CXXLINK) -rpath $(libdir) $(lib_libgtest_la_OBJECTS) $(lib_libgtest_la_LIBADD) $(LIBS)
+src/gtest_main.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+lib/libgtest_main.la: $(lib_libgtest_main_la_OBJECTS) $(lib_libgtest_main_la_DEPENDENCIES) lib/$(am__dirstamp)
+	$(CXXLINK) -rpath $(libdir) $(lib_libgtest_main_la_OBJECTS) $(lib_libgtest_main_la_LIBADD) $(LIBS)
+samples/$(am__dirstamp):
+	@$(MKDIR_P) samples
+	@: > samples/$(am__dirstamp)
+samples/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) samples/$(DEPDIR)
+	@: > samples/$(DEPDIR)/$(am__dirstamp)
+samples/sample1.lo: samples/$(am__dirstamp) \
+	samples/$(DEPDIR)/$(am__dirstamp)
+samples/sample2.lo: samples/$(am__dirstamp) \
+	samples/$(DEPDIR)/$(am__dirstamp)
+samples/sample4.lo: samples/$(am__dirstamp) \
+	samples/$(DEPDIR)/$(am__dirstamp)
+samples/libsamples.la: $(samples_libsamples_la_OBJECTS) $(samples_libsamples_la_DEPENDENCIES) samples/$(am__dirstamp)
+	$(CXXLINK)  $(samples_libsamples_la_OBJECTS) $(samples_libsamples_la_LIBADD) $(LIBS)
+
+clean-checkPROGRAMS:
+	@list='$(check_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+samples/sample1_unittest.$(OBJEXT): samples/$(am__dirstamp) \
+	samples/$(DEPDIR)/$(am__dirstamp)
+samples/sample1_unittest$(EXEEXT): $(samples_sample1_unittest_OBJECTS) $(samples_sample1_unittest_DEPENDENCIES) samples/$(am__dirstamp)
+	@rm -f samples/sample1_unittest$(EXEEXT)
+	$(CXXLINK) $(samples_sample1_unittest_OBJECTS) $(samples_sample1_unittest_LDADD) $(LIBS)
+samples/sample2_unittest.$(OBJEXT): samples/$(am__dirstamp) \
+	samples/$(DEPDIR)/$(am__dirstamp)
+samples/sample2_unittest$(EXEEXT): $(samples_sample2_unittest_OBJECTS) $(samples_sample2_unittest_DEPENDENCIES) samples/$(am__dirstamp)
+	@rm -f samples/sample2_unittest$(EXEEXT)
+	$(CXXLINK) $(samples_sample2_unittest_OBJECTS) $(samples_sample2_unittest_LDADD) $(LIBS)
+samples/sample3_unittest.$(OBJEXT): samples/$(am__dirstamp) \
+	samples/$(DEPDIR)/$(am__dirstamp)
+samples/sample3_unittest$(EXEEXT): $(samples_sample3_unittest_OBJECTS) $(samples_sample3_unittest_DEPENDENCIES) samples/$(am__dirstamp)
+	@rm -f samples/sample3_unittest$(EXEEXT)
+	$(CXXLINK) $(samples_sample3_unittest_OBJECTS) $(samples_sample3_unittest_LDADD) $(LIBS)
+samples/sample4_unittest.$(OBJEXT): samples/$(am__dirstamp) \
+	samples/$(DEPDIR)/$(am__dirstamp)
+samples/sample4_unittest$(EXEEXT): $(samples_sample4_unittest_OBJECTS) $(samples_sample4_unittest_DEPENDENCIES) samples/$(am__dirstamp)
+	@rm -f samples/sample4_unittest$(EXEEXT)
+	$(CXXLINK) $(samples_sample4_unittest_OBJECTS) $(samples_sample4_unittest_LDADD) $(LIBS)
+samples/sample5_unittest.$(OBJEXT): samples/$(am__dirstamp) \
+	samples/$(DEPDIR)/$(am__dirstamp)
+samples/sample5_unittest$(EXEEXT): $(samples_sample5_unittest_OBJECTS) $(samples_sample5_unittest_DEPENDENCIES) samples/$(am__dirstamp)
+	@rm -f samples/sample5_unittest$(EXEEXT)
+	$(CXXLINK) $(samples_sample5_unittest_OBJECTS) $(samples_sample5_unittest_LDADD) $(LIBS)
+samples/sample6_unittest.$(OBJEXT): samples/$(am__dirstamp) \
+	samples/$(DEPDIR)/$(am__dirstamp)
+samples/sample6_unittest$(EXEEXT): $(samples_sample6_unittest_OBJECTS) $(samples_sample6_unittest_DEPENDENCIES) samples/$(am__dirstamp)
+	@rm -f samples/sample6_unittest$(EXEEXT)
+	$(CXXLINK) $(samples_sample6_unittest_OBJECTS) $(samples_sample6_unittest_LDADD) $(LIBS)
+samples/sample7_unittest.$(OBJEXT): samples/$(am__dirstamp) \
+	samples/$(DEPDIR)/$(am__dirstamp)
+samples/sample7_unittest$(EXEEXT): $(samples_sample7_unittest_OBJECTS) $(samples_sample7_unittest_DEPENDENCIES) samples/$(am__dirstamp)
+	@rm -f samples/sample7_unittest$(EXEEXT)
+	$(CXXLINK) $(samples_sample7_unittest_OBJECTS) $(samples_sample7_unittest_LDADD) $(LIBS)
+samples/sample8_unittest.$(OBJEXT): samples/$(am__dirstamp) \
+	samples/$(DEPDIR)/$(am__dirstamp)
+samples/sample8_unittest$(EXEEXT): $(samples_sample8_unittest_OBJECTS) $(samples_sample8_unittest_DEPENDENCIES) samples/$(am__dirstamp)
+	@rm -f samples/sample8_unittest$(EXEEXT)
+	$(CXXLINK) $(samples_sample8_unittest_OBJECTS) $(samples_sample8_unittest_LDADD) $(LIBS)
+test/$(am__dirstamp):
+	@$(MKDIR_P) test
+	@: > test/$(am__dirstamp)
+test/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) test/$(DEPDIR)
+	@: > test/$(DEPDIR)/$(am__dirstamp)
+test/test_gtest_death_test_test-gtest-death-test_test.$(OBJEXT):  \
+	test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp)
+test/gtest-death-test_test$(EXEEXT): $(test_gtest_death_test_test_OBJECTS) $(test_gtest_death_test_test_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest-death-test_test$(EXEEXT)
+	$(test_gtest_death_test_test_LINK) $(test_gtest_death_test_test_OBJECTS) $(test_gtest_death_test_test_LDADD) $(LIBS)
+test/gtest-filepath_test.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest-filepath_test$(EXEEXT): $(test_gtest_filepath_test_OBJECTS) $(test_gtest_filepath_test_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest-filepath_test$(EXEEXT)
+	$(CXXLINK) $(test_gtest_filepath_test_OBJECTS) $(test_gtest_filepath_test_LDADD) $(LIBS)
+test/gtest-linked_ptr_test.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest-linked_ptr_test$(EXEEXT): $(test_gtest_linked_ptr_test_OBJECTS) $(test_gtest_linked_ptr_test_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest-linked_ptr_test$(EXEEXT)
+	$(CXXLINK) $(test_gtest_linked_ptr_test_OBJECTS) $(test_gtest_linked_ptr_test_LDADD) $(LIBS)
+test/gtest-message_test.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest-message_test$(EXEEXT): $(test_gtest_message_test_OBJECTS) $(test_gtest_message_test_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest-message_test$(EXEEXT)
+	$(CXXLINK) $(test_gtest_message_test_OBJECTS) $(test_gtest_message_test_LDADD) $(LIBS)
+test/gtest-options_test.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest-options_test$(EXEEXT): $(test_gtest_options_test_OBJECTS) $(test_gtest_options_test_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest-options_test$(EXEEXT)
+	$(CXXLINK) $(test_gtest_options_test_OBJECTS) $(test_gtest_options_test_LDADD) $(LIBS)
+test/gtest-param-test_test.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest-param-test2_test.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest-param-test_test$(EXEEXT): $(test_gtest_param_test_test_OBJECTS) $(test_gtest_param_test_test_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest-param-test_test$(EXEEXT)
+	$(CXXLINK) $(test_gtest_param_test_test_OBJECTS) $(test_gtest_param_test_test_LDADD) $(LIBS)
+test/gtest-port_test.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest-port_test$(EXEEXT): $(test_gtest_port_test_OBJECTS) $(test_gtest_port_test_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest-port_test$(EXEEXT)
+	$(CXXLINK) $(test_gtest_port_test_OBJECTS) $(test_gtest_port_test_LDADD) $(LIBS)
+test/gtest-test-part_test.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest-test-part_test$(EXEEXT): $(test_gtest_test_part_test_OBJECTS) $(test_gtest_test_part_test_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest-test-part_test$(EXEEXT)
+	$(CXXLINK) $(test_gtest_test_part_test_OBJECTS) $(test_gtest_test_part_test_LDADD) $(LIBS)
+test/test_gtest_tuple_test-gtest-tuple_test.$(OBJEXT):  \
+	test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp)
+src/test_gtest_tuple_test-gtest-all.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/test_gtest_tuple_test-gtest_main.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+test/gtest-tuple_test$(EXEEXT): $(test_gtest_tuple_test_OBJECTS) $(test_gtest_tuple_test_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest-tuple_test$(EXEEXT)
+	$(test_gtest_tuple_test_LINK) $(test_gtest_tuple_test_OBJECTS) $(test_gtest_tuple_test_LDADD) $(LIBS)
+test/gtest-typed-test_test.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest-typed-test2_test.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest-typed-test_test$(EXEEXT): $(test_gtest_typed_test_test_OBJECTS) $(test_gtest_typed_test_test_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest-typed-test_test$(EXEEXT)
+	$(CXXLINK) $(test_gtest_typed_test_test_OBJECTS) $(test_gtest_typed_test_test_LDADD) $(LIBS)
+test/gtest-unittest-api_test.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest-unittest-api_test$(EXEEXT): $(test_gtest_unittest_api_test_OBJECTS) $(test_gtest_unittest_api_test_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest-unittest-api_test$(EXEEXT)
+	$(CXXLINK) $(test_gtest_unittest_api_test_OBJECTS) $(test_gtest_unittest_api_test_LDADD) $(LIBS)
+test/gtest_break_on_failure_unittest_.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_break_on_failure_unittest_$(EXEEXT): $(test_gtest_break_on_failure_unittest__OBJECTS) $(test_gtest_break_on_failure_unittest__DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_break_on_failure_unittest_$(EXEEXT)
+	$(CXXLINK) $(test_gtest_break_on_failure_unittest__OBJECTS) $(test_gtest_break_on_failure_unittest__LDADD) $(LIBS)
+test/gtest_color_test_.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_color_test_$(EXEEXT): $(test_gtest_color_test__OBJECTS) $(test_gtest_color_test__DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_color_test_$(EXEEXT)
+	$(CXXLINK) $(test_gtest_color_test__OBJECTS) $(test_gtest_color_test__LDADD) $(LIBS)
+test/gtest_env_var_test_.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_env_var_test_$(EXEEXT): $(test_gtest_env_var_test__OBJECTS) $(test_gtest_env_var_test__DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_env_var_test_$(EXEEXT)
+	$(CXXLINK) $(test_gtest_env_var_test__OBJECTS) $(test_gtest_env_var_test__LDADD) $(LIBS)
+test/gtest_environment_test.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_environment_test$(EXEEXT): $(test_gtest_environment_test_OBJECTS) $(test_gtest_environment_test_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_environment_test$(EXEEXT)
+	$(CXXLINK) $(test_gtest_environment_test_OBJECTS) $(test_gtest_environment_test_LDADD) $(LIBS)
+test/gtest_filter_unittest_.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_filter_unittest_$(EXEEXT): $(test_gtest_filter_unittest__OBJECTS) $(test_gtest_filter_unittest__DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_filter_unittest_$(EXEEXT)
+	$(CXXLINK) $(test_gtest_filter_unittest__OBJECTS) $(test_gtest_filter_unittest__LDADD) $(LIBS)
+test/gtest_help_test_.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_help_test_$(EXEEXT): $(test_gtest_help_test__OBJECTS) $(test_gtest_help_test__DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_help_test_$(EXEEXT)
+	$(CXXLINK) $(test_gtest_help_test__OBJECTS) $(test_gtest_help_test__LDADD) $(LIBS)
+test/gtest_list_tests_unittest_.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_list_tests_unittest_$(EXEEXT): $(test_gtest_list_tests_unittest__OBJECTS) $(test_gtest_list_tests_unittest__DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_list_tests_unittest_$(EXEEXT)
+	$(CXXLINK) $(test_gtest_list_tests_unittest__OBJECTS) $(test_gtest_list_tests_unittest__LDADD) $(LIBS)
+test/gtest_main_unittest.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_main_unittest$(EXEEXT): $(test_gtest_main_unittest_OBJECTS) $(test_gtest_main_unittest_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_main_unittest$(EXEEXT)
+	$(CXXLINK) $(test_gtest_main_unittest_OBJECTS) $(test_gtest_main_unittest_LDADD) $(LIBS)
+test/test_gtest_no_rtti_test-gtest_unittest.$(OBJEXT):  \
+	test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp)
+src/test_gtest_no_rtti_test-gtest-all.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/test_gtest_no_rtti_test-gtest_main.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+test/gtest_no_rtti_test$(EXEEXT): $(test_gtest_no_rtti_test_OBJECTS) $(test_gtest_no_rtti_test_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_no_rtti_test$(EXEEXT)
+	$(test_gtest_no_rtti_test_LINK) $(test_gtest_no_rtti_test_OBJECTS) $(test_gtest_no_rtti_test_LDADD) $(LIBS)
+test/gtest_no_test_unittest.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_no_test_unittest$(EXEEXT): $(test_gtest_no_test_unittest_OBJECTS) $(test_gtest_no_test_unittest_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_no_test_unittest$(EXEEXT)
+	$(CXXLINK) $(test_gtest_no_test_unittest_OBJECTS) $(test_gtest_no_test_unittest_LDADD) $(LIBS)
+test/gtest_output_test_.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_output_test_$(EXEEXT): $(test_gtest_output_test__OBJECTS) $(test_gtest_output_test__DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_output_test_$(EXEEXT)
+	$(CXXLINK) $(test_gtest_output_test__OBJECTS) $(test_gtest_output_test__LDADD) $(LIBS)
+test/gtest_pred_impl_unittest.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_pred_impl_unittest$(EXEEXT): $(test_gtest_pred_impl_unittest_OBJECTS) $(test_gtest_pred_impl_unittest_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_pred_impl_unittest$(EXEEXT)
+	$(CXXLINK) $(test_gtest_pred_impl_unittest_OBJECTS) $(test_gtest_pred_impl_unittest_LDADD) $(LIBS)
+test/gtest_prod_test.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/production.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_prod_test$(EXEEXT): $(test_gtest_prod_test_OBJECTS) $(test_gtest_prod_test_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_prod_test$(EXEEXT)
+	$(CXXLINK) $(test_gtest_prod_test_OBJECTS) $(test_gtest_prod_test_LDADD) $(LIBS)
+test/gtest_repeat_test.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_repeat_test$(EXEEXT): $(test_gtest_repeat_test_OBJECTS) $(test_gtest_repeat_test_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_repeat_test$(EXEEXT)
+	$(CXXLINK) $(test_gtest_repeat_test_OBJECTS) $(test_gtest_repeat_test_LDADD) $(LIBS)
+test/gtest_sole_header_test.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_sole_header_test$(EXEEXT): $(test_gtest_sole_header_test_OBJECTS) $(test_gtest_sole_header_test_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_sole_header_test$(EXEEXT)
+	$(CXXLINK) $(test_gtest_sole_header_test_OBJECTS) $(test_gtest_sole_header_test_LDADD) $(LIBS)
+test/gtest_stress_test.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_stress_test$(EXEEXT): $(test_gtest_stress_test_OBJECTS) $(test_gtest_stress_test_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_stress_test$(EXEEXT)
+	$(CXXLINK) $(test_gtest_stress_test_OBJECTS) $(test_gtest_stress_test_LDADD) $(LIBS)
+test/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.$(OBJEXT):  \
+	test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp)
+src/test_gtest_throw_on_failure_ex_test-gtest-all.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+test/gtest_throw_on_failure_ex_test$(EXEEXT): $(test_gtest_throw_on_failure_ex_test_OBJECTS) $(test_gtest_throw_on_failure_ex_test_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_throw_on_failure_ex_test$(EXEEXT)
+	$(test_gtest_throw_on_failure_ex_test_LINK) $(test_gtest_throw_on_failure_ex_test_OBJECTS) $(test_gtest_throw_on_failure_ex_test_LDADD) $(LIBS)
+test/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.$(OBJEXT):  \
+	test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp)
+src/test_gtest_throw_on_failure_test_-gtest-all.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+test/gtest_throw_on_failure_test_$(EXEEXT): $(test_gtest_throw_on_failure_test__OBJECTS) $(test_gtest_throw_on_failure_test__DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_throw_on_failure_test_$(EXEEXT)
+	$(test_gtest_throw_on_failure_test__LINK) $(test_gtest_throw_on_failure_test__OBJECTS) $(test_gtest_throw_on_failure_test__LDADD) $(LIBS)
+test/gtest_uninitialized_test_.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_uninitialized_test_$(EXEEXT): $(test_gtest_uninitialized_test__OBJECTS) $(test_gtest_uninitialized_test__DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_uninitialized_test_$(EXEEXT)
+	$(CXXLINK) $(test_gtest_uninitialized_test__OBJECTS) $(test_gtest_uninitialized_test__LDADD) $(LIBS)
+test/gtest_unittest.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_unittest$(EXEEXT): $(test_gtest_unittest_OBJECTS) $(test_gtest_unittest_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_unittest$(EXEEXT)
+	$(CXXLINK) $(test_gtest_unittest_OBJECTS) $(test_gtest_unittest_LDADD) $(LIBS)
+test/test_gtest_use_own_tuple_test-gtest-param-test_test.$(OBJEXT):  \
+	test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp)
+test/test_gtest_use_own_tuple_test-gtest-param-test2_test.$(OBJEXT):  \
+	test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp)
+src/test_gtest_use_own_tuple_test-gtest-all.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+test/gtest_use_own_tuple_test$(EXEEXT): $(test_gtest_use_own_tuple_test_OBJECTS) $(test_gtest_use_own_tuple_test_DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_use_own_tuple_test$(EXEEXT)
+	$(test_gtest_use_own_tuple_test_LINK) $(test_gtest_use_own_tuple_test_OBJECTS) $(test_gtest_use_own_tuple_test_LDADD) $(LIBS)
+test/gtest_xml_outfile1_test_.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_xml_outfile1_test_$(EXEEXT): $(test_gtest_xml_outfile1_test__OBJECTS) $(test_gtest_xml_outfile1_test__DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_xml_outfile1_test_$(EXEEXT)
+	$(CXXLINK) $(test_gtest_xml_outfile1_test__OBJECTS) $(test_gtest_xml_outfile1_test__LDADD) $(LIBS)
+test/gtest_xml_outfile2_test_.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_xml_outfile2_test_$(EXEEXT): $(test_gtest_xml_outfile2_test__OBJECTS) $(test_gtest_xml_outfile2_test__DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_xml_outfile2_test_$(EXEEXT)
+	$(CXXLINK) $(test_gtest_xml_outfile2_test__OBJECTS) $(test_gtest_xml_outfile2_test__LDADD) $(LIBS)
+test/gtest_xml_output_unittest_.$(OBJEXT): test/$(am__dirstamp) \
+	test/$(DEPDIR)/$(am__dirstamp)
+test/gtest_xml_output_unittest_$(EXEEXT): $(test_gtest_xml_output_unittest__OBJECTS) $(test_gtest_xml_output_unittest__DEPENDENCIES) test/$(am__dirstamp)
+	@rm -f test/gtest_xml_output_unittest_$(EXEEXT)
+	$(CXXLINK) $(test_gtest_xml_output_unittest__OBJECTS) $(test_gtest_xml_output_unittest__LDADD) $(LIBS)
+install-binSCRIPTS: $(bin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f $$d$$p; then \
+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-binSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f samples/sample1.$(OBJEXT)
+	-rm -f samples/sample1.lo
+	-rm -f samples/sample1_unittest.$(OBJEXT)
+	-rm -f samples/sample2.$(OBJEXT)
+	-rm -f samples/sample2.lo
+	-rm -f samples/sample2_unittest.$(OBJEXT)
+	-rm -f samples/sample3_unittest.$(OBJEXT)
+	-rm -f samples/sample4.$(OBJEXT)
+	-rm -f samples/sample4.lo
+	-rm -f samples/sample4_unittest.$(OBJEXT)
+	-rm -f samples/sample5_unittest.$(OBJEXT)
+	-rm -f samples/sample6_unittest.$(OBJEXT)
+	-rm -f samples/sample7_unittest.$(OBJEXT)
+	-rm -f samples/sample8_unittest.$(OBJEXT)
+	-rm -f src/gtest-death-test.$(OBJEXT)
+	-rm -f src/gtest-death-test.lo
+	-rm -f src/gtest-filepath.$(OBJEXT)
+	-rm -f src/gtest-filepath.lo
+	-rm -f src/gtest-port.$(OBJEXT)
+	-rm -f src/gtest-port.lo
+	-rm -f src/gtest-test-part.$(OBJEXT)
+	-rm -f src/gtest-test-part.lo
+	-rm -f src/gtest-typed-test.$(OBJEXT)
+	-rm -f src/gtest-typed-test.lo
+	-rm -f src/gtest.$(OBJEXT)
+	-rm -f src/gtest.lo
+	-rm -f src/gtest_main.$(OBJEXT)
+	-rm -f src/gtest_main.lo
+	-rm -f src/test_gtest_no_rtti_test-gtest-all.$(OBJEXT)
+	-rm -f src/test_gtest_no_rtti_test-gtest_main.$(OBJEXT)
+	-rm -f src/test_gtest_throw_on_failure_ex_test-gtest-all.$(OBJEXT)
+	-rm -f src/test_gtest_throw_on_failure_test_-gtest-all.$(OBJEXT)
+	-rm -f src/test_gtest_tuple_test-gtest-all.$(OBJEXT)
+	-rm -f src/test_gtest_tuple_test-gtest_main.$(OBJEXT)
+	-rm -f src/test_gtest_use_own_tuple_test-gtest-all.$(OBJEXT)
+	-rm -f test/gtest-filepath_test.$(OBJEXT)
+	-rm -f test/gtest-linked_ptr_test.$(OBJEXT)
+	-rm -f test/gtest-message_test.$(OBJEXT)
+	-rm -f test/gtest-options_test.$(OBJEXT)
+	-rm -f test/gtest-param-test2_test.$(OBJEXT)
+	-rm -f test/gtest-param-test_test.$(OBJEXT)
+	-rm -f test/gtest-port_test.$(OBJEXT)
+	-rm -f test/gtest-test-part_test.$(OBJEXT)
+	-rm -f test/gtest-typed-test2_test.$(OBJEXT)
+	-rm -f test/gtest-typed-test_test.$(OBJEXT)
+	-rm -f test/gtest-unittest-api_test.$(OBJEXT)
+	-rm -f test/gtest_break_on_failure_unittest_.$(OBJEXT)
+	-rm -f test/gtest_color_test_.$(OBJEXT)
+	-rm -f test/gtest_env_var_test_.$(OBJEXT)
+	-rm -f test/gtest_environment_test.$(OBJEXT)
+	-rm -f test/gtest_filter_unittest_.$(OBJEXT)
+	-rm -f test/gtest_help_test_.$(OBJEXT)
+	-rm -f test/gtest_list_tests_unittest_.$(OBJEXT)
+	-rm -f test/gtest_main_unittest.$(OBJEXT)
+	-rm -f test/gtest_no_test_unittest.$(OBJEXT)
+	-rm -f test/gtest_output_test_.$(OBJEXT)
+	-rm -f test/gtest_pred_impl_unittest.$(OBJEXT)
+	-rm -f test/gtest_prod_test.$(OBJEXT)
+	-rm -f test/gtest_repeat_test.$(OBJEXT)
+	-rm -f test/gtest_sole_header_test.$(OBJEXT)
+	-rm -f test/gtest_stress_test.$(OBJEXT)
+	-rm -f test/gtest_uninitialized_test_.$(OBJEXT)
+	-rm -f test/gtest_unittest.$(OBJEXT)
+	-rm -f test/gtest_xml_outfile1_test_.$(OBJEXT)
+	-rm -f test/gtest_xml_outfile2_test_.$(OBJEXT)
+	-rm -f test/gtest_xml_output_unittest_.$(OBJEXT)
+	-rm -f test/production.$(OBJEXT)
+	-rm -f test/test_gtest_death_test_test-gtest-death-test_test.$(OBJEXT)
+	-rm -f test/test_gtest_no_rtti_test-gtest_unittest.$(OBJEXT)
+	-rm -f test/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.$(OBJEXT)
+	-rm -f test/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.$(OBJEXT)
+	-rm -f test/test_gtest_tuple_test-gtest-tuple_test.$(OBJEXT)
+	-rm -f test/test_gtest_use_own_tuple_test-gtest-param-test2_test.$(OBJEXT)
+	-rm -f test/test_gtest_use_own_tuple_test-gtest-param-test_test.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c