pool: Change transaction handling
[strongswan.git] / configure.ac
index af8a34b..66cbfa9 100644 (file)
@@ -19,7 +19,7 @@
 #  initialize & set some vars
 # ============================
 
-AC_INIT([strongSwan],[5.1.1dr3])
+AC_INIT([strongSwan],[5.1.1rc1])
 AM_INIT_AUTOMAKE([tar-ustar subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 AC_CONFIG_MACRO_DIR([m4/config])
@@ -624,7 +624,7 @@ AC_CHECK_FUNC(
                [AC_DEFINE([HAVE_PRINTF_FUNCTION], [], [have register_printf_function()])],
                [
                        AC_MSG_NOTICE([printf does not support custom format specifiers!])
-                       vstr=true
+                       builtin_printf=true
                ]
        )]
 )
@@ -632,6 +632,11 @@ AC_CHECK_FUNC(
 if test x$vstr = xtrue; then
        AC_CHECK_LIB([vstr],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([Vstr string library not found])],[])
        AC_DEFINE([USE_VSTR], [], [use vstring library for printf hooks])
+       builtin_printf=false
+fi
+
+if test x$builtin_printf = xtrue; then
+       AC_DEFINE([USE_BUILTIN_PRINTF], [], [using builtin printf for printf hooks])
 fi
 
 if test x$gmp = xtrue; then
@@ -1008,8 +1013,8 @@ ADD_PLUGIN([pkcs7],                [s charon scepclient pki scripts nm cmd])
 ADD_PLUGIN([pkcs8],                [s charon openac scepclient pki scripts manager medsrv attest nm cmd])
 ADD_PLUGIN([pkcs12],               [s charon scepclient pki scripts cmd])
 ADD_PLUGIN([pgp],                  [s charon])
-ADD_PLUGIN([dnskey],               [s charon])
-ADD_PLUGIN([sshkey],               [s charon nm cmd])
+ADD_PLUGIN([dnskey],               [s charon pki])
+ADD_PLUGIN([sshkey],               [s charon pki nm cmd])
 ADD_PLUGIN([ipseckey],             [c charon])
 ADD_PLUGIN([pem],                  [s charon openac scepclient pki scripts manager medsrv attest nm cmd])
 ADD_PLUGIN([padlock],              [s charon])
@@ -1278,6 +1283,7 @@ AM_CONDITIONAL(USE_FILE_CONFIG, test x$stroke = xtrue)
 AM_CONDITIONAL(USE_IPSEC_SCRIPT, test x$stroke = xtrue -o x$tools = xtrue -o x$conftest = xtrue)
 AM_CONDITIONAL(USE_LIBCAP, test x$capabilities = xlibcap)
 AM_CONDITIONAL(USE_VSTR, test x$vstr = xtrue)
+AM_CONDITIONAL(USE_BUILTIN_PRINTF, test x$builtin_printf = xtrue)
 AM_CONDITIONAL(USE_SIMAKA, test x$simaka = xtrue)
 AM_CONDITIONAL(USE_TLS, test x$tls = xtrue)
 AM_CONDITIONAL(USE_RADIUS, test x$radius = xtrue)
@@ -1472,6 +1478,7 @@ AC_CONFIG_FILES([
        src/scepclient/Makefile
        src/pki/Makefile
        src/pki/man/Makefile
+       src/pool/Makefile
        src/dumm/Makefile
        src/dumm/ext/extconf.rb
        src/libfast/Makefile
@@ -1493,15 +1500,17 @@ AC_CONFIG_FILES([
        man/ipsec.secrets.5
        man/strongswan.conf.5
        src/charon-cmd/charon-cmd.8
-       src/pki/man/ipsec-pki.8
-       src/pki/man/pki---gen.8
-       src/pki/man/pki---issue.8
-       src/pki/man/pki---keyid.8
-       src/pki/man/pki---pkcs7.8
-       src/pki/man/pki---print.8
-       src/pki/man/pki---req.8
-       src/pki/man/pki---self.8
-       src/pki/man/pki---signcrl.8
+       src/pki/man/pki.1
+       src/pki/man/pki---gen.1
+       src/pki/man/pki---issue.1
+       src/pki/man/pki---keyid.1
+       src/pki/man/pki---pkcs7.1
+       src/pki/man/pki---print.1
+       src/pki/man/pki---pub.1
+       src/pki/man/pki---req.1
+       src/pki/man/pki---self.1
+       src/pki/man/pki---signcrl.1
+       src/pki/man/pki---verify.1
 ])
 
 AC_OUTPUT