[#625,!485] Fixed detection of log4plus in non-standard location

diff --git a/configure.ac b/configure.ac
index aff9787ab7cf19f70a73ff38a1ed7cc9dc2fd33b..8a7f05ae27ce1b00e70a49fe39255ea1a4d2642c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1034,6 +1034,8 @@ LIBS=$LIBS_SAVED
 # would allow explicit initialization. Newer versions (2.0.4 for sure, possibly
 # older as well) have it and it's recommended to use it. We detect whether
 # it's present or not and do explicit initalization if possible.
+CPPFLAGS_SAVED=$CPPFLAGS
+CPPFLAGS="$LOG4CPLUS_INCLUDES $CPPFLAGS"
 LIBS_SAVED="$LIBS"
 LIBS="$LOG4CPLUS_LIBS $LIBS"
 AC_MSG_CHECKING([log4cplus explicit initialization (log4cplus/initializer.h)])
@@ -1045,6 +1047,7 @@ AC_LINK_IFELSE(
          AC_DEFINE(LOG4CPLUS_INITIALIZER_H, [1], [Explicit initialization of log4cplus possible])],
         [AC_MSG_RESULT(no)])
 LIBS="$LIBS_SAVED"
+CPPFLAGS=$CPPFLAGS_SAVED
 
 #
 # Configure Boost header path