From: Tomek Mrugalski <tomasz@isc.org>
Date: Thu, 15 Aug 2019 19:36:15 +0000 (+0200)
Subject: [#625,!485] Fixed detection of log4plus in non-standard location
X-Git-Tag: Kea-1.6.0~41^2~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2F625-log4cplus-explicit-init;p=thirdparty%2Fkea.git

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

diff --git a/configure.ac b/configure.ac
index aff9787ab7..8a7f05ae27 100644
--- 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