Add protobuf 2.3.0 sources

This is the contents of protobuf-2.3.0.tar.bz2 from
http://code.google.com/p/protobuf/downloads/list.

Change-Id: Idfde09ce7ef5ac027b07ee83f2674fbbed5c30b2

1 files changed, 31 insertions, 14 deletions

diff --git a/m4/stl_hash.m4 b/m4/stl_hash.m4
index 912b954..08813c9 100644
--- a/m4/stl_hash.m4
+++ b/m4/stl_hash.m4
@@ -14,28 +14,45 @@ AC_DEFUN([AC_CXX_STL_HASH],
   [AC_MSG_CHECKING(the location of hash_map)
   AC_LANG_SAVE
    AC_LANG_CPLUSPLUS
-   ac_cv_cxx_hash_map=""
-   for location in ext/hash_map hash_map; do
-     for namespace in __gnu_cxx "" std stdext; do
-       if test -z "$ac_cv_cxx_hash_map"; then
-         AC_TRY_COMPILE([#include <$location>],
-                        [${namespace}::hash_map<int, int> t],
-                        [ac_cv_cxx_hash_map="<$location>";
-                         ac_cv_cxx_hash_namespace="$namespace";])
-       fi
+   ac_cv_cxx_hash_map_header=""
+   ac_cv_cxx_hash_map_class=""
+   for location in [tr1/unordered_map ext/hash_map hash_map]; do
+     for namespace in [std::tr1 __gnu_cxx "" std stdext]; do
+       for name in [unordered_map hash_map]; do
+
+         if test -z "$ac_cv_cxx_hash_map_header"; then
+
+           # On OSX 1.5 / GCC 4.0.1 (the standard compiler on that platform),
+           # calling find() on a const unordered_map does not compile.  So, we
+           # include a call to find() in our test to detect this broken
+           # implementation and avoid using it.  Note that ext/hash_map works
+           # fine on this platform, so we'll end up using that.
+           AC_TRY_COMPILE([#include <$location>],
+                          [const ${namespace}::$name<int, int> t;
+                           t.find(1);],
+                          [ac_cv_cxx_hash_map_header="<$location>";
+                           ac_cv_cxx_hash_namespace="$namespace";
+                           ac_cv_cxx_hash_map_class="$name";])
+         fi
+       done
      done
    done
-   ac_cv_cxx_hash_set=`echo "$ac_cv_cxx_hash_map" | sed s/map/set/`;
-   if test -n "$ac_cv_cxx_hash_map"; then
+   ac_cv_cxx_hash_set_header=`echo "$ac_cv_cxx_hash_map_header" | sed s/map/set/`;
+   ac_cv_cxx_hash_set_class=`echo "$ac_cv_cxx_hash_map_class" | sed s/map/set/`;
+   if test -n "$ac_cv_cxx_hash_map_header"; then
       AC_DEFINE(HAVE_HASH_MAP, 1, [define if the compiler has hash_map])
       AC_DEFINE(HAVE_HASH_SET, 1, [define if the compiler has hash_set])
-      AC_DEFINE_UNQUOTED(HASH_MAP_H,$ac_cv_cxx_hash_map,
+      AC_DEFINE_UNQUOTED(HASH_MAP_H,$ac_cv_cxx_hash_map_header,
                          [the location of <hash_map>])
-      AC_DEFINE_UNQUOTED(HASH_SET_H,$ac_cv_cxx_hash_set,
+      AC_DEFINE_UNQUOTED(HASH_SET_H,$ac_cv_cxx_hash_set_header,
                          [the location of <hash_set>])
+      AC_DEFINE_UNQUOTED(HASH_MAP_CLASS,$ac_cv_cxx_hash_map_class,
+                         [the name of <hash_set>])
+      AC_DEFINE_UNQUOTED(HASH_SET_CLASS,$ac_cv_cxx_hash_set_class,
+                         [the name of <hash_set>])
       AC_DEFINE_UNQUOTED(HASH_NAMESPACE,$ac_cv_cxx_hash_namespace,
                          [the namespace of hash_map/hash_set])
-      AC_MSG_RESULT([$ac_cv_cxx_hash_map])
+      AC_MSG_RESULT([$ac_cv_cxx_hash_map_header])
    else
       AC_MSG_RESULT()
       AC_MSG_WARN([could not find an STL hash_map])