[#625,!485] Fixed conditional intialization detection for log4cplus

diff --git a/configure.ac b/configure.ac
index 0a15f6c48fa1bc64c1772d1fc150476e76b599bf..aff9787ab7cf19f70a73ff38a1ed7cc9dc2fd33b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1030,6 +1030,12 @@ AC_MSG_RESULT([$LOG4CPLUS_VERSION])
 CPPFLAGS=$CPPFLAGS_SAVED
 LIBS=$LIBS_SAVED
 
+# Older log4cplus versions (1.2.0) don't have the initializer.h header that
+# 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.
+LIBS_SAVED="$LIBS"
+LIBS="$LOG4CPLUS_LIBS $LIBS"
 AC_MSG_CHECKING([log4cplus explicit initialization (log4cplus/initializer.h)])
 AC_LINK_IFELSE(
         [AC_LANG_PROGRAM([#include <log4cplus/initializer.h>],
@@ -1038,6 +1044,7 @@ AC_LINK_IFELSE(
         [AC_MSG_RESULT([yes])
          AC_DEFINE(LOG4CPLUS_INITIALIZER_H, [1], [Explicit initialization of log4cplus possible])],
         [AC_MSG_RESULT(no)])
+LIBS="$LIBS_SAVED"
 
 #
 # Configure Boost header path