From ed58f3007d3045bc4f1ee1f0709d7d72a3cbb9b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Fri, 31 Oct 2014 16:24:33 +0100
Subject: [PATCH] ZXID: Added check for zxid_cgi.uri_path.
---
src/post_modules/ZXID/acconfig.h | 3 +++
src/post_modules/ZXID/configure.in | 22 ++++++++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/src/post_modules/ZXID/acconfig.h b/src/post_modules/ZXID/acconfig.h
index eeff856070..4aaba82624 100644
--- a/src/post_modules/ZXID/acconfig.h
+++ b/src/post_modules/ZXID/acconfig.h
@@ -16,4 +16,7 @@
/* Define this if your struct zxid_conf has the burl member. */
#undef HAVE_STRUCT_ZXID_CONF_BURL
+/* Define this if your struct zxid_cgi has the uri_path member. */
+#undef HAVE_STRUCT_ZXID_CGI_URI_PATH
+
#endif
diff --git a/src/post_modules/ZXID/configure.in b/src/post_modules/ZXID/configure.in
index f735460d14..b9041f70bf 100644
--- a/src/post_modules/ZXID/configure.in
+++ b/src/post_modules/ZXID/configure.in
@@ -52,6 +52,28 @@ then
else
AC_MSG_RESULT(no)
fi
+
+ AC_MSG_CHECKING(if struct zxid_cgi has an uri_path member)
+ AC_CACHE_VAL(pike_cv_struct_zxid_cgi_uri_path, [
+ AC_TRY_COMPILE([
+#include <zx/zx.h>
+#include <zxid/zxid.h>
+ ], [
+ struct zxid_cgi cgi;
+ cgi.uri_path = "URI_PATH";
+ ], [
+ pike_cv_struct_zxid_cgi_uri_path="yes"
+ ], [
+ pike_cv_struct_zxid_cgit_uri_path="no"
+ ])
+ ])
+ if test "x$pike_cv_struct_zxid_cgi_uri_path" = "xyes"; then
+ # ZXID 1.18:2013-11-17 or later.
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_STRUCT_ZXID_CGI_URI_PATH)
+ else
+ AC_MSG_RESULT(no)
+ fi
else
LIBS="$ORIG_LIBS"
fi
--
GitLab