[cpp-sp] 05/17: Use pkg-config for log4shib/log4cpp

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=ac8c3fc7c53d16e6411248560b415d2f076c7f5d

commit ac8c3fc7c53d16e6411248560b415d2f076c7f5d
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Thu Jul 14 12:29:22 2016 +0200

    Use pkg-config for log4shib/log4cpp
---
 configure.ac       | 55 ++++++------------------------------------------------
 shibsp/Makefile.am | 13 ++++++++++---
 util/Makefile.am   | 18 +++++++++++++-----
 3 files changed, 29 insertions(+), 57 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6aea6da..5182316 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,55 +169,12 @@ else
     AC_MSG_RESULT([yes, and it takes $ac_cv_ctime_args arguments])
 fi 
 
-# log4shib settings (favor this version over the log4cpp code)
-AC_PATH_PROG(LOG4SHIB_CONFIG,log4shib-config)
-AC_ARG_WITH(log4shib,
-    AS_HELP_STRING([--with-log4shib=PATH],[where log4shib-config is installed]),
-    [
-    LOG4SHIB_CONFIG="${with_log4shib}"
-    if ! test -f "${LOG4SHIB_CONFIG}"; then
-        LOG4SHIB_CONFIG="${with_log4shib}/bin/log4shib-config"
-    fi
-    ])
-if test -f "${LOG4SHIB_CONFIG}" ; then
-    LIBS="`${LOG4SHIB_CONFIG} --libs` $LIBS"
-    CPPFLAGS="`${LOG4SHIB_CONFIG} --cflags` $CPPFLAGS"
-    AC_CHECK_HEADER([log4shib/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4shib header files]))
-    AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM([[#include <log4shib/Category.hh>
-#include <log4shib/CategoryStream.hh>]],
-            [[log4shib::Category::getInstance("foo").errorStream() << log4shib::eol]])],
-        [AC_DEFINE([SHIBSP_LOG4SHIB],[1],[Define to 1 if log4shib library is used.])],
-        [AC_MSG_ERROR([unable to link with log4shib])])
-else
-    AC_MSG_WARN([log4shib-config not found, may need to use --with-log4shib option])
-    AC_MSG_WARN([will look for original log4cpp library])
-    
-    # log4cpp settings
-    AC_PATH_PROG(LOG4CPP_CONFIG,log4cpp-config)
-    AC_ARG_WITH(log4cpp,
-        AS_HELP_STRING([--with-log4cpp=PATH],[where log4cpp-config is installed]),
-        [
-        LOG4CPP_CONFIG="${with_log4cpp}"
-        if ! test -f "${LOG4CPP_CONFIG}"; then
-            LOG4CPP_CONFIG="${with_log4cpp}/bin/log4cpp-config"
-        fi
-        ])
-    if test -f "${LOG4CPP_CONFIG}"; then
-        AC_MSG_WARN([will try to use log4cpp, note that most non-Internet2 supplied versions are not thread-safe])
-        LIBS="`${LOG4CPP_CONFIG} --libs` $LIBS"
-        CPPFLAGS="`${LOG4CPP_CONFIG} --cflags` $CPPFLAGS"
-        AC_CHECK_HEADER([log4cpp/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4cpp header files]))
-        AC_LINK_IFELSE(
-            [AC_LANG_PROGRAM([[#include <log4cpp/Category.hh>
-#include <log4cpp/CategoryStream.hh>]],
-                [[log4cpp::Category::getInstance("foo").errorStream() << log4cpp::eol]])],
-            [AC_DEFINE([SHIBSP_LOG4CPP],[1],[Define to 1 if log4cpp library is used.])],
-            [AC_MSG_ERROR([unable to link with log4cpp, need version 1.0 or later])])
-    else
-        AC_MSG_ERROR([log4cpp-config not found, may need to use --with-log4cpp option])
-    fi
-fi
+AX_PKG_CHECK_MODULES([log4shib],,[log4shib],
+    [AC_DEFINE([SHIBSP_LOG4SHIB],[1],[Define to 1 if log4shib library is used.])],
+    [AX_PKG_CHECK_MODULES([log4cpp],,[log4cpp],
+        [AC_DEFINE([SHIBSP_LOG4CPP],[1],[Define to 1 if log4cpp library is used.])],,
+        [SHIBSP_LITE_REQUIRES],[SHIBSP_LITE_REQUIRES_PRIVATE])],,
+    [SHIBSP_LITE_REQUIRES],[SHIBSP_LITE_REQUIRES_PRIVATE])
 
 # Xerces settings
 AC_ARG_WITH(xerces,
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index e792086..9ea30ee 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -243,10 +243,17 @@ libshibsp_la_SOURCES = \
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
 libshibsp_la_LDFLAGS = -version-info 8:0:0
-libshibsp_la_LIBADD = $(XMLSEC_LIBS)
+libshibsp_la_CXXFLAGS = \
+    $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
+libshibsp_la_LIBADD = \
+    $(log4shib_LIBS) $(log4cpp_LIBS) \
+    $(XMLSEC_LIBS)
 libshibsp_lite_la_LDFLAGS = -version-info 8:0:0
-libshibsp_lite_la_LIBADD = $(LITE_LIBS)
-libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
+libshibsp_lite_la_CXXFLAGS = -DSHIBSP_LITE \
+    $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
+libshibsp_lite_la_LIBADD = \
+    $(log4shib_LIBS) $(log4cpp_LIBS) \
+    $(LITE_LIBS)
 
 pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
 pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@
diff --git a/util/Makefile.am b/util/Makefile.am
index 0817963..b735a4b 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -4,15 +4,23 @@ bin_PROGRAMS = mdquery resolvertest
 
 resolvertest_SOURCES = resolvertest.cpp
 
-resolvertest_LDADD = $(XMLSEC_LIBS) \
-	$(top_builddir)/shibsp/libshibsp.la
+resolvertest_CXXFLAGS = \
+	$(log4shib_CFLAGS) $(log4cpp_CFLAGS)
+resolvertest_LDADD = \
+	$(top_builddir)/shibsp/libshibsp.la \
+	$(log4shib_LIBS) $(log4cpp_LIBS) \
+	$(XMLSEC_LIBS)
 
 mdquery_SOURCES = mdquery.cpp
 
-mdquery_LDADD = $(XMLSEC_LIBS) \
-	$(top_builddir)/shibsp/libshibsp.la
-
 EXTRA_DIST = \
 	resource.h \
 	mdquery.rc \
 	resolvertest.rc
+
+mdquery_CXXFLAGS = \
+	$(log4shib_CFLAGS) $(log4cpp_CFLAGS)
+mdquery_LDADD = \
+	$(top_builddir)/shibsp/libshibsp.la \
+	$(log4shib_LIBS) $(log4cpp_LIBS) \
+	$(XMLSEC_LIBS)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.