Unix fixes

diff --git a/configure.ac b/configure.ac
index ecee958..7367fb3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.50])
 AC_INIT([opensaml], [2.0], [mace-opensaml-users@internet2.edu], [saml])
 AM_CONFIG_HEADER(config.h)
-AM_CONFIG_HEADER(saml/config_pub.h)
+#AM_CONFIG_HEADER(saml/config_pub.h)
 AM_INIT_AUTOMAKE([opensaml], [2.0])
 
 sinclude(doxygen.m4)
@@ -161,7 +161,7 @@ LIBS="-lxmltooling $LIBS"
 AC_CHECK_HEADER([xmltooling/XMLToolingConfig.h],,AC_MSG_ERROR([unable to find xmltooling header files]))
 AC_TRY_LINK(
     [#include <xmltooling/XMLToolingConfig.h>],
-    [XMLToolingConfig::getConfig().init()],
+    [xmltooling::XMLToolingConfig::getConfig().init()],
     [AC_DEFINE(HAVE_LIBXMLTOOLING,1,[Define if XML-Tooling library was found])],
     [AC_MSG_ERROR([unable to link with xmltooling library])]
     )

diff --git a/saml/Makefile.am b/saml/Makefile.am
index a57c0cb..139d5fb 100644 (file)
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -31,7 +31,7 @@ libsaml_la_SOURCES = \
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
-libxmltooling_la_LDFLAGS = -version-info 2:0:0
+libsaml_la_LDFLAGS = -version-info 2:0:0
 
 install-exec-hook:
        for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done