summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845>2018-09-24 09:26:42 +0000
committerjoe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845>2018-09-24 09:26:42 +0000
commitef6d3bb6d85adc7d383ada4990a711d85c21e59f (patch)
tree67a23cb51a8b5a2721ebbe9506dacdfcd698420d
parentc5877031b00ef923ac87e483fa20b7e7c10400c6 (diff)
downloadneon-ef6d3bb6d85adc7d383ada4990a711d85c21e59f.tar.gz
Merge r1990 from trunk:
* src/ne_utils.c: Add PKCS#11 and LFS support to neon version string. git-svn-id: http://svn.webdav.org/repos/projects/neon/branches/0.30.x@2010 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
-rw-r--r--src/ne_utils.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ne_utils.c b/src/ne_utils.c
index 5b120c8..a672f40 100644
--- a/src/ne_utils.c
+++ b/src/ne_utils.c
@@ -108,6 +108,9 @@ static const char version_string[] = "neon " NEON_VERSION ": "
#ifdef NE_HAVE_SOCKS
", SOCKSv5"
#endif
+#ifdef NE_HAVE_LFS
+ ", LFS"
+#endif
#ifdef HAVE_OPENSSL
#ifdef OPENSSL_VERSION_TEXT
", " OPENSSL_VERSION_TEXT
@@ -121,6 +124,9 @@ static const char version_string[] = "neon " NEON_VERSION ": "
#ifdef HAVE_SSPI
", SSPI"
#endif /* HAVE_SSPI */
+#ifdef HAVE_PAKCHOIS
+ ", PKCS#11"
+#endif
"."
;