From 7b0acf7de3a37b08ba683a24db94e3980d4558cf Mon Sep 17 00:00:00 2001 From: Kubat <mael.martin31@gmail.com> Date: Sun, 2 Aug 2020 17:35:11 +0200 Subject: [PATCH] Add the jsonc and curl header to the check list --- configure | 8 +++++++- configure.ac | 2 ++ inc/lektor/lktconfig.h.in | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/configure b/configure index a96786c9..a5b760fe 100755 --- a/configure +++ b/configure @@ -2259,6 +2259,8 @@ $as_echo "$as_me: creating cache $cache_file" >&6;} fi as_fn_append ac_header_list " sqlite3.h" +as_fn_append ac_header_list " curl/curl.h" +as_fn_append ac_header_list " json-c/json.h" as_fn_append ac_header_list " stdnoreturn.h" as_fn_append ac_header_list " stddef.h" as_fn_append ac_header_list " inttypes.h" @@ -3820,6 +3822,10 @@ done + + + + @@ -13569,7 +13575,7 @@ if test "x${LKT_DEBUG_ENABLED}" = "xyes"; then else BASEFLAGS+=" -O3" fi -CFLAGS="${BASEFLAGS} -std=c18" +CFLAGS="${BASEFLAGS} -std=c11" ########## # OUTPUT # diff --git a/configure.ac b/configure.ac index c1f7102e..4a5f7dfe 100644 --- a/configure.ac +++ b/configure.ac @@ -22,6 +22,8 @@ AS_IF([test "$LKT_PATH_SOURCE" = "$LKT_PATH_BUILD"], AC_CHECK_LIB([sqlite3], [sqlite3_open_v2]) AC_CHECK_HEADERS_ONCE([ sqlite3.h + curl/curl.h + json-c/json.h stdnoreturn.h stddef.h inttypes.h diff --git a/inc/lektor/lktconfig.h.in b/inc/lektor/lktconfig.h.in index 58c06167..833b96d1 100644 --- a/inc/lektor/lktconfig.h.in +++ b/inc/lektor/lktconfig.h.in @@ -6,6 +6,9 @@ /* Define to 1 if you have the <ctypes.h> header file. */ #undef HAVE_CTYPES_H +/* Define to 1 if you have the <curl/curl.h> header file. */ +#undef HAVE_CURL_CURL_H + /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H @@ -15,6 +18,9 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the <json-c/json.h> header file. */ +#undef HAVE_JSON_C_JSON_H + /* Define to 1 if you have the `sqlite3' library (-lsqlite3). */ #undef HAVE_LIBSQLITE3 -- GitLab