Bump version, add pkg-config support, version the schemas

[shibboleth/cpp-xmltooling.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ee72165..92ea9ff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,12 @@
 AC_PREREQ([2.50])
-AC_INIT([xmltooling], [1.2.1], [mace-opensaml-users@internet2.edu], [xmltooling])
+AC_INIT([xmltooling], [1.4], [mace-opensaml-users@internet2.edu], [xmltooling])
 AM_CONFIG_HEADER(config.h)
 AM_CONFIG_HEADER(xmltooling/config_pub.h)
-AM_INIT_AUTOMAKE([xmltooling], [1.2.1])
+AM_INIT_AUTOMAKE([xmltooling], [1.4])
 
 sinclude(doxygen.m4)
 sinclude(acx_pthread.m4)
+sinclude(ax_create_pkgconfig_info.m4)
 
 # Docygen features
 DX_HTML_FEATURE(ON)
@@ -233,7 +234,7 @@ if test x_$with_xmlsec != x_no; then
                 SSLLIBS="`$PKG_CONFIG --libs openssl`"
                 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
@@ -320,6 +321,7 @@ int i = 0;
        AC_EGREP_HEADER([CURLOPT_SSL_CTX_FUNCTION], [curl/curl.h],
                        [AC_MSG_RESULT(yes)],
                        [AC_MSG_ERROR([need libcurl that supports CURLOPT_SSL_CTX_FUNCTION])])
+    AC_CHECK_TYPE([curl_off_t],[AC_DEFINE([HAVE_CURL_OFF_T], [1], [Define to 1 if you have the 'curl_off_t' type.])])
 
        # restore master libs
        LIBS="$save_LIBS"
@@ -362,7 +364,11 @@ AC_SUBST(CXXTEST)
 AC_SUBST(CXXTESTFLAGS)
 AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST})
 
+AX_CREATE_PKGCONFIG_INFO(,,[$XMLSEC_LIBS -lxmltooling],[OpenSAML XMLTooling-C library])
+
 LIBTOOL="$LIBTOOL --silent"
 
-# output makefiles
-AC_OUTPUT(Makefile xmltooling/Makefile xmltoolingtest/Makefile schemas/Makefile doc/Makefile)
+# output packaging and makefiles
+AC_CONFIG_FILES([xmltooling.spec pkginfo Portfile])
+AC_CONFIG_FILES([Makefile xmltooling/Makefile xmltoolingtest/Makefile schemas/Makefile doc/Makefile])
+AC_OUTPUT