Fix autotools build.

It looks like commit 3c49b93 modified the auto-generated file src/config.h.in
to add a definition of macro GOOGLE_GLOG_DLL_DECL. One of the autotools
reverts this change upon running "make", causing the build to fail when a
source file includes demangle.h.

To fix the problem, revert the change to src/config.h.in and include
glog/logging.h from demangle.h which provides a definition of that macro.

diff --git a/src/config.h.in b/src/config.h.in
index e41635a7e79da0687d62102d591864d0a874a15d..8190f2397a9e3a9c577e3f529ede3e7b040ca220 100644 (file)
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -178,12 +178,3 @@
 
 /* Puts following code inside the Google namespace */
 #undef _START_GOOGLE_NAMESPACE_
-
-// Annoying stuff for windows -- makes sure clients can import these functions
-#ifndef GOOGLE_GLOG_DLL_DECL
-# if defined(_WIN32) && !defined(__CYGWIN__)
-#   define GOOGLE_GLOG_DLL_DECL  __declspec(dllimport)
-# else
-#   define GOOGLE_GLOG_DLL_DECL
-# endif
-#endif

diff --git a/src/demangle.h b/src/demangle.h
index 265302997fc8ee0f7fa620afbafdae3609609248..991b6ffcf2e64b65d2e25a5222974a5deb8e352e 100644 (file)
--- a/src/demangle.h
+++ b/src/demangle.h
@@ -71,6 +71,7 @@
 #define BASE_DEMANGLE_H_
 
 #include "config.h"
+#include "glog/logging.h"
 
 _START_GOOGLE_NAMESPACE_