X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=a265891916b24958955788dd428d9f8b45441bbc;hb=f7ed3649e606c31484a0339eb855de0ab0ca6163;hp=a5185f66533414c4841d8460cc68042e528fc78f;hpb=4eaa2004613786e02eaf108f5d65ee5eea247889;p=shibboleth%2Fcpp-opensaml.git

diff --git a/configure.ac b/configure.ac
index a5185f6..a265891 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,11 @@
 AC_PREREQ([2.50])
-AC_INIT([opensaml], [2.2.1], [mace-opensaml-users@internet2.edu], [saml])
+AC_INIT([opensaml], [2.4], [mace-opensaml-users@internet2.edu], [saml])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([opensaml], [2.2.1])
+AM_INIT_AUTOMAKE([opensaml], [2.4])
 
 sinclude(doxygen.m4)
 sinclude(acx_pthread.m4)
+sinclude(ax_create_pkgconfig_info.m4)
 
 # Docygen features
 DX_HTML_FEATURE(ON)
@@ -103,7 +104,7 @@ if test "x$SSLFLAGS" = "x" ; then
         if pkg-config openssl ; then
             SSLFLAGS="`$PKG_CONFIG --cflags openssl`"
         else
-            AC_MSG_ERROR([OpenSSL not supported by pkg-config, try --with-openssl instead])
+            AC_MSG_WARN([OpenSSL not supported by pkg-config, try --with-openssl instead])
         fi
     fi
 fi
@@ -132,7 +133,7 @@ AC_ARG_WITH(log4shib,
     fi
     ])
 if test -f "${LOG4SHIB_CONFIG}"; then
-    LDFLAGS="`${LOG4SHIB_CONFIG} --libs` $LDFLAGS"
+    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_TRY_LINK(
@@ -157,7 +158,7 @@ else
 	    ])
 	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])
-	    LDFLAGS="`${LOG4CPP_CONFIG} --libs` $LDFLAGS"
+	    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_TRY_LINK(
@@ -242,16 +243,21 @@ AC_ARG_WITH(xmltooling,
     fi])
 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>
-#include <xmltooling/version.h>],
-    [#if _XMLTOOLING_VERSION >= 10200
+	[
+#include <xmltooling/XMLToolingConfig.h>
+#include <xmltooling/version.h>
+	],
+	[
+#if _XMLTOOLING_VERSION >= 10400
 xmltooling::XMLToolingConfig::getConfig();
 #else
-#error Need XMLTooling version 1.2 or higher
-#endif],
-        [AC_DEFINE(HAVE_XMLTOOLING,1,[Define if xmltooling library was found])],
-        [AC_MSG_ERROR([unable to link with XMLTooling, or version was too old])])
+#error Need XMLTooling version 1.4 or higher
+#endif
+	],
+    [AC_DEFINE(HAVE_XMLTOOLING,1,[Define if xmltooling library was found])],
+    [AC_MSG_ERROR([unable to link with XMLTooling, or version was too old])])
 
 # Check for unit test support
 CXXTEST="/usr/bin/cxxtestgen.pl"
@@ -270,8 +276,12 @@ AC_SUBST(CXXTEST)
 AC_SUBST(CXXTESTFLAGS)
 AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST})
 
+AX_CREATE_PKGCONFIG_INFO(,,[$LIBS -lsaml],[OpenSAML library])
+
 AC_SUBST(DX_INCLUDE)
 LIBTOOL="$LIBTOOL --silent"
 
-# output makefiles
-AC_OUTPUT(Makefile saml/Makefile samltest/Makefile samlsign/Makefile schemas/Makefile doc/Makefile)
+# output packaging and makefiles
+AC_CONFIG_FILES([opensaml.spec pkginfo Portfile])
+AC_CONFIG_FILES([Makefile saml/Makefile samltest/Makefile samlsign/Makefile schemas/Makefile doc/Makefile])
+AC_OUTPUT