Add xmltooling to build

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2283 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/apache/Makefile.am b/apache/Makefile.am
index 54ada30..79960d9 100644 (file)
--- a/apache/Makefile.am
+++ b/apache/Makefile.am
@@ -7,7 +7,7 @@ modshib13dir = $(libexecdir)
 modshib13_LTLIBRARIES = mod_shib_13.la
 mod_shib_13_la_SOURCES = mod_shib_13.cpp
 mod_shib_13_la_CXXFLAGS = $(APXS_CFLAGS) -I$(APXS_INCLUDE)
-mod_shib_13_la_LDFLAGS = -module -avoid-version
+mod_shib_13_la_LDFLAGS = $(LITE_LIBS) -module -avoid-version
 mod_shib_13_la_LIBADD = \
   $(top_builddir)/shibsp/libshibsp.la
 
@@ -21,7 +21,7 @@ modshib20dir = $(libexecdir)
 modshib20_LTLIBRARIES = mod_shib_20.la
 mod_shib_20_la_SOURCES = mod_shib_20.cpp
 mod_shib_20_la_CXXFLAGS = $(APXS2_CFLAGS) -I$(APXS2_INCLUDE)
-mod_shib_20_la_LDFLAGS = -module -avoid-version
+mod_shib_20_la_LDFLAGS = $(LITE_LIBS) -module -avoid-version
 mod_shib_20_la_LIBADD = \
   $(top_builddir)/shibsp/libshibsp.la
 
@@ -35,7 +35,7 @@ modshib22dir = $(libexecdir)
 modshib22_LTLIBRARIES = mod_shib_22.la
 mod_shib_22_la_SOURCES = mod_shib_22.cpp
 mod_shib_22_la_CXXFLAGS = $(APXS22_CFLAGS) -I$(APXS22_INCLUDE)
-mod_shib_22_la_LDFLAGS = -module -avoid-version
+mod_shib_22_la_LDFLAGS = $(LITE_LIBS) -module -avoid-version
 mod_shib_22_la_LIBADD = \
   $(top_builddir)/shibsp/libshibsp.la
 

diff --git a/configure.ac b/configure.ac
index f94e281..25bdf6a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -120,6 +120,19 @@ AC_TRY_LINK(
         [AC_MSG_ERROR([unable to link with Xerces])])
 
 
+#XML-Tooling settings
+AC_ARG_WITH(xmltooling,
+            AC_HELP_STRING([--with-xmltooling=PATH], [where xmltooling-c is installed]),
+            [if test x_$with_xmltooling != x_/usr; then
+                LDFLAGS="-L${with_xmltooling}/lib $LDFLAGS"
+                CPPFLAGS="-I${with_xmltooling}/include $CPPFLAGS"
+            fi])
+LITE_LIBS="-lxmltooling-lite"
+XMLSEC_LIBS="-lxmltooling"
+AC_CHECK_HEADER([xmltooling/base.h],,
+                AC_MSG_ERROR([unable to find xmltooling header files]))
+
+
 # XML-Security settings
 AC_ARG_WITH(xmlsec,
             AC_HELP_STRING([--with-xmlsec=PATH], [where xmlsec is installed]),,
@@ -129,7 +142,7 @@ if test x_$with_xmlsec != x_/usr; then
     LDFLAGS="-L${with_xmlsec}/lib $LDFLAGS"
     CPPFLAGS="-I${with_xmlsec}/include $CPPFLAGS"
 fi        
-XMLSEC_LIBS="-lxml-security-c"
+XMLSEC_LIBS="-lxml-security-c $XMLSEC_LIBS"
 
 # save and append master libs
 save_LIBS="$LIBS"
@@ -183,6 +196,7 @@ opensaml::SAMLConfig::getConfig();
 # restore master libs
 LIBS="$save_LIBS"
 
+AC_SUBST(LITE_LIBS)
 AC_SUBST(XMLSEC_LIBS)
 
 # output the underlying makefiles

diff --git a/nsapi_shib/Makefile.am b/nsapi_shib/Makefile.am
index bc42824..8362f1f 100644 (file)
--- a/nsapi_shib/Makefile.am
+++ b/nsapi_shib/Makefile.am
@@ -5,7 +5,7 @@ nsapi_shibdir = $(libexecdir)
 nsapi_shib_LTLIBRARIES = nsapi_shib.la
 nsapi_shib_la_SOURCES = nsapi_shib.cpp
 nsapi_shib_la_CXXFLAGS = $(NSAPI_INCLUDE)
-nsapi_shib_la_LDFLAGS = -module -avoid-version
+nsapi_shib_la_LDFLAGS = $(LITE_LIBS) -module -avoid-version
 nsapi_shib_la_LIBADD = \
   $(top_builddir)/shibsp/libshibsp.la
 

diff --git a/shibd/Makefile.am b/shibd/Makefile.am
index baa7cad..2563e00 100644 (file)
--- a/shibd/Makefile.am
+++ b/shibd/Makefile.am
@@ -9,4 +9,6 @@ shibd_SOURCES = shibd.cpp
 shibd_LDADD = \
   $(top_builddir)/shibsp/libshibsp.la
 
+shibd_LDFLAGS = $(XMLSEC_LIBS)
+
 EXTRA_DIST = shibd.vcproj shibd_win32.cpp resource.h shibd.rc

diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index b851cff..35fb053 100644 (file)
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -178,7 +178,7 @@ libshibsp_la_SOURCES = \
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
 libshibsp_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 1:0:0
-libshibsp_lite_la_LDFLAGS = -version-info 1:0:0
+libshibsp_lite_la_LDFLAGS = $(LITE_LIBS) -version-info 1:0:0
 libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
 
 paths.h: ${srcdir}/paths.h.in Makefile ${top_builddir}/config.status