Merge pull request #497 from pherl/config_h

Check HAVE_CONFIG_H before including "config.h"

Makefile.am

@@ -744,12 +744,9 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \
   CONTRIBUTORS.txt                     \
   CHANGES.txt                          \
   cmake/CMakeLists.txt                 \
-  cmake/config.h.in                    \
-  cmake/find_hash_map.cmake            \
   cmake/libprotobuf.cmake              \
   cmake/libprotobuf-lite.cmake         \
   cmake/libprotoc.cmake                \
-  cmake/pbconfig.h.in                  \
   cmake/protoc.cmake                   \
   cmake/README.md                      \
   cmake/tests.cmake                    \

cmake/CMakeLists.txt

@@ -8,11 +8,11 @@ if (MSVC)
   option(ZLIB "Build with zlib support" OFF)
 endif (MSVC)
 
+add_definitions(-DGOOGLE_PROTOBUF_CMAKE_BUILD)
+
 find_package(Threads REQUIRED)
 if (CMAKE_USE_PTHREADS_INIT)
-  set(HAVE_PTHREAD 1)
-else (CMAKE_USE_PTHREADS_INIT)
-  set(HAVE_PTHREAD 0)
+  add_definitions(-DHAVE_PTHREAD)
 endif (CMAKE_USE_PTHREADS_INIT)
 
 if (MSVC)
@@ -36,6 +36,10 @@ else (MSVC)
   endif (ZLIB_FOUND)
 endif (MSVC)
 
+if (HAVE_ZLIB)
+  add_definitions(-DHAVE_ZLIB)
+endif (HAVE_ZLIB)
+
 if (MSVC)
   if (BUILD_SHARED_LIBS)
     add_definitions(-DPROTOBUF_USE_DLLS)
@@ -43,10 +47,6 @@ if (MSVC)
   add_definitions(/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305)
 endif (MSVC)
 
-include(find_hash_map.cmake)
-
-configure_file(config.h.in config.h)
-configure_file(pbconfig.h.in google/protobuf/stubs/pbconfig.h)
 if (MSVC)
   string(REPLACE "/" "\\" PROTOBUF_SOURCE_WIN32_PATH ${protobuf_SOURCE_DIR})
   string(REPLACE "/" "\\" PROTOBUF_BINARY_WIN32_PATH ${protobuf_BINARY_DIR})

cmake/config.h.in

@@ -1,4 +0,0 @@
-#define GOOGLE_PROTOBUF_CMAKE_BUILD
-
-#define HAVE_PTHREAD ${HAVE_PTHREAD}
-#define HAVE_ZLIB ${HAVE_ZLIB}

cmake/find_hash_map.cmake

@@ -1,119 +0,0 @@
-include(CheckCXXSourceCompiles)
-
-function(find_hash_map)
-  set(HAVE_HASH_MAP 1 PARENT_SCOPE)
-  set(HAVE_HASH_SET 1 PARENT_SCOPE)
-  # Search for hash_map in the following order:
-  #  1. <unordered_map> ::std::unordered_map
-  #  2. <tr1/unordered_map> ::std::tr1::unordered_map
-  #  3. <hash_map> ::hash_map
-  #  4. <hash_map>  ::stdext::hash_map
-  #  5. <ext/hash_map> ::std::hash_map
-  #  6. <ext/hash_map> ::__gnu_cxx::hash_map
-  check_cxx_source_compiles("
-    #include <unordered_map>
-    int main() {  ::std::unordered_map<int, int> v; return v[0]; }
-  " HAS_STD_UNORDERED_MAP)
-  if (HAS_STD_UNORDERED_MAP)
-    set(HASH_NAMESPACE ::std PARENT_SCOPE)
-    set(HASH_MAP_H <unordered_map> PARENT_SCOPE)
-    set(HASH_MAP_CLASS unordered_map PARENT_SCOPE)
-    set(HASH_SET_H <unordered_set> PARENT_SCOPE)
-    set(HASH_SET_CLASS unordered_set PARENT_SCOPE)
-    return()
-  endif (HAS_STD_UNORDERED_MAP)
-
-  check_cxx_source_compiles("
-    #include <tr1/unordered_map>
-    int main() {  ::std::tr1::unordered_map<int, int> v; return v[0]; }
-  " HAS_STD_TR1_UNORDERED_MAP)
-  if (HAS_STD_TR1_UNORDERED_MAP)
-    set(HASH_NAMESPACE ::std::tr1 PARENT_SCOPE)
-    set(HASH_MAP_H <tr1/unordered_map> PARENT_SCOPE)
-    set(HASH_MAP_CLASS unordered_map PARENT_SCOPE)
-    set(HASH_SET_H <tr1/unordered_set> PARENT_SCOPE)
-    set(HASH_SET_CLASS unordered_set PARENT_SCOPE)
-    return()
-  endif (HAS_STD_TR1_UNORDERED_MAP)
-
-  check_cxx_source_compiles("
-    #include <hash_map>
-    int main() {  ::hash_map<int, int> v; return v[0]; }
-  " HAS_HASH_MAP)
-  if (HAS_HASH_MAP)
-    set(HASH_NAMESPACE :: PARENT_SCOPE)
-    set(HASH_MAP_H <hash_map> PARENT_SCOPE)
-    set(HASH_MAP_CLASS hash_map PARENT_SCOPE)
-    set(HASH_SET_H <hash_set> PARENT_SCOPE)
-    set(HASH_SET_CLASS hash_set PARENT_SCOPE)
-    return()
-  endif (HAS_HASH_MAP)
-
-  check_cxx_source_compiles("
-    #include <hash_map>
-    int main() {  ::stdext::hash_map<int, int> v; return v[0]; }
-  " HAS_STDEXT_HASH_MAP)
-  if (HAS_STDEXT_HASH_MAP)
-    set(HASH_NAMESPACE ::stdext PARENT_SCOPE)
-    set(HASH_MAP_H <hash_map> PARENT_SCOPE)
-    set(HASH_MAP_CLASS hash_map PARENT_SCOPE)
-    set(HASH_SET_H <hash_set> PARENT_SCOPE)
-    set(HASH_SET_CLASS hash_set PARENT_SCOPE)
-    return()
-  endif (HAS_STDEXT_HASH_MAP)
-
-  check_cxx_source_compiles("
-    #include <ext/hash_map>
-    int main() {  ::std::hash_map<int, int> v; return v[0]; }
-  " HAS_STD_HASH_MAP)
-  if (HAS_STD_HASH_MAP)
-    set(HASH_NAMESPACE ::std PARENT_SCOPE)
-    set(HASH_MAP_H <ext/hash_map> PARENT_SCOPE)
-    set(HASH_MAP_CLASS hash_map PARENT_SCOPE)
-    set(HASH_SET_H <ext/hash_set> PARENT_SCOPE)
-    set(HASH_SET_CLASS hash_set PARENT_SCOPE)
-    return()
-  endif (HAS_STD_HASH_MAP)
-
-  check_cxx_source_compiles("
-    #include <ext/hash_map>
-    int main() {  ::__gnu_cxx::hash_map<int, int> v; return v[0]; }
-  " HAS_GNU_CXX_HASH_MAP)
-  if (HAS_GNU_CXX_HASH_MAP)
-    set(HASH_NAMESPACE ::gnu_cxx PARENT_SCOPE)
-    set(HASH_MAP_H <ext/hash_map> PARENT_SCOPE)
-    set(HASH_MAP_CLASS hash_map PARENT_SCOPE)
-    set(HASH_SET_H <ext/hash_set> PARENT_SCOPE)
-    set(HASH_SET_CLASS hash_set PARENT_SCOPE)
-    return()
-  endif (HAS_GNU_CXX_HASH_MAP)
-
-  set(HAVE_HASH_MAP 0 PARENT_SCOPE)
-  set(HAVE_HASH_SET 0 PARENT_SCOPE)
-endfunction()
-
-function(find_hash_compare)
-  if (MSVC)
-    check_cxx_source_compiles("
-      #include ${HASH_MAP_H}
-      int main() { ::std::hash_compare<int> cp; return cp(0); }
-    " HAS_STD_HASH_COMPARE)
-    if (HAS_STD_HASH_COMPARE)
-      set(HASH_COMPARE ::std::hash_compare PARENT_SCOPE)
-      return()
-    endif (HAS_STD_HASH_COMPARE)
-
-    check_cxx_source_compiles("
-      #include ${HASH_MAP_H}
-      int main() { ::stdext::hash_compare<int> cp; return cp(0); }
-    " HAS_STDEXT_HASH_COMPARE)
-    if (HAS_STDEXT_HASH_COMPARE)
-      set(HASH_COMPARE ::stdext::hash_compare PARENT_SCOPE)
-      return()
-    endif (HAS_STDEXT_HASH_COMPARE)
-  endif (MSVC)
-  set(HASH_COMPARE PARENT_SCOPE)
-endfunction()
-
-find_hash_map()
-find_hash_compare()

cmake/pbconfig.h.in

@@ -1,9 +0,0 @@
-#define GOOGLE_PROTOBUF_HAVE_HASH_MAP ${HAVE_HASH_MAP}
-#define GOOGLE_PROTOBUF_HAVE_HASH_SET ${HAVE_HASH_MAP}
-
-#define GOOGLE_PROTOBUF_HASH_NAMESPACE ${HASH_NAMESPACE}
-#define GOOGLE_PROTOBUF_HASH_MAP_H ${HASH_MAP_H}
-#define GOOGLE_PROTOBUF_HASH_MAP_CLASS ${HASH_MAP_CLASS}
-#define GOOGLE_PROTOBUF_HASH_SET_H ${HASH_SET_H}
-#define GOOGLE_PROTOBUF_HASH_SET_CLASS ${HASH_SET_CLASS}
-#define GOOGLE_PROTOBUF_HASH_COMPARE ${HASH_COMPARE}

configure.ac

@@ -17,6 +17,9 @@ AC_INIT([Protocol Buffers],[3.0.0-alpha-4-pre],[protobuf@googlegroups.com],[prot
 AM_MAINTAINER_MODE([enable])
 
 AC_CONFIG_SRCDIR(src/google/protobuf/message.cc)
+# The config file is generated but not used by the source code, since we only
+# need very few of them, e.g. HAVE_PTHREAD and HAVE_ZLIB. Those macros are
+# passed down in CXXFLAGS manually in src/Makefile.am
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -146,6 +149,9 @@ AS_IF([test "$with_protoc" != "no"], [
 AM_CONDITIONAL([USE_EXTERNAL_PROTOC], [test "$with_protoc" != "no"])
 
 ACX_PTHREAD
+AM_CONDITIONAL([HAVE_PTHREAD], [test "x$acx_pthread_ok" = "xyes"])
+
+# We still keep this for improving pbconfig.h for unsupported platforms.
 AC_CXX_STL_HASH
 
 case "$target_os" in

src/Makefile.am

@@ -4,17 +4,25 @@ if HAVE_ZLIB
 GZCHECKPROGRAMS = zcgzip zcgunzip
 GZHEADERS = google/protobuf/io/gzip_stream.h
 GZTESTS = google/protobuf/io/gzip_stream_unittest.sh
+ZLIB_DEF = -DHAVE_ZLIB=1
 else
 GZCHECKPROGRAMS =
 GZHEADERS =
 GZTESTS =
+ZLIB_DEF =
+endif
+
+if HAVE_PTHREAD
+PTHREAD_DEF = -DHAVE_PTHREAD=1
+else
+PTHREAD_DEF =
 endif
 
 if GCC
 # These are good warnings to turn on by default
-NO_OPT_CXXFLAGS = $(PTHREAD_CFLAGS) -Wall -Wwrite-strings -Woverloaded-virtual -Wno-sign-compare
+NO_OPT_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) -Wall -Wwrite-strings -Woverloaded-virtual -Wno-sign-compare
 else
-NO_OPT_CXXFLAGS = $(PTHREAD_CFLAGS)
+NO_OPT_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF)
 endif
 
 AM_CXXFLAGS = $(NO_OPT_CXXFLAGS) $(PROTOBUF_OPT_FLAG)

src/google/protobuf/io/gzip_stream.cc

@@ -33,8 +33,6 @@
 // This file contains the implementation of classes GzipInputStream and
 // GzipOutputStream.
 
-#include "config.h"
-
 #if HAVE_ZLIB
 #include <google/protobuf/io/gzip_stream.h>
 

src/google/protobuf/io/zero_copy_stream_unittest.cc

@@ -46,8 +46,6 @@
 //   "parametized tests" so that one set of tests can be used on all the
 //   implementations.
 
-#include "config.h"
-
 #ifdef _MSC_VER
 #include <io.h>
 #else

src/google/protobuf/stubs/common.cc

@@ -36,8 +36,6 @@
 #include <errno.h>
 #include <vector>
 
-#include "config.h"
-
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN  // We only need minimal includes
 #include <windows.h>

src/google/protobuf/stubs/common_unittest.cc

@@ -39,8 +39,6 @@
 #include <google/protobuf/testing/googletest.h>
 #include <gtest/gtest.h>
 
-#include "config.h"
-
 namespace google {
 namespace protobuf {
 namespace {

src/google/protobuf/testing/zcgunzip.cc

@@ -38,8 +38,6 @@
 // Reads gzip stream on standard input and writes decompressed data to standard
 // output.
 
-#include "config.h"
-
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>

src/google/protobuf/testing/zcgzip.cc

@@ -38,8 +38,6 @@
 // Reads data on standard input and writes compressed gzip stream to standard
 // output.
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>