|
 |
9bca77 |
From f2df0777226cf446d682812f464f68e91cbd25b4 Mon Sep 17 00:00:00 2001
|
|
|
9bca77 |
From: Martin Pitt <martin@piware.de>
|
|
|
9bca77 |
Date: Sun, 28 Oct 2018 13:55:38 +0100
|
|
|
9bca77 |
Subject: [PATCH 2/2] Build system generated changes from patches
|
|
|
9bca77 |
|
|
|
9bca77 |
---
|
|
|
9bca77 |
configure | 90 ++++++++++++++++++++++++++++++++++++++++++++++++-------
|
|
|
9bca77 |
1 file changed, 80 insertions(+), 10 deletions(-)
|
|
|
9bca77 |
|
|
|
9bca77 |
diff --git a/configure b/configure
|
|
|
9bca77 |
index 841293e..665e89c 100755
|
|
|
9bca77 |
--- a/configure
|
|
|
9bca77 |
+++ b/configure
|
|
|
9bca77 |
@@ -1939,6 +1939,52 @@ fi
|
|
|
9bca77 |
|
|
|
9bca77 |
} # ac_fn_c_try_link
|
|
|
9bca77 |
|
|
|
9bca77 |
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
|
|
|
9bca77 |
+# ---------------------------------------------
|
|
|
9bca77 |
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
|
|
|
9bca77 |
+# accordingly.
|
|
|
9bca77 |
+ac_fn_c_check_decl ()
|
|
|
9bca77 |
+{
|
|
|
9bca77 |
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
|
9bca77 |
+ as_decl_name=`echo $2|sed 's/ *(.*//'`
|
|
|
9bca77 |
+ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
|
|
|
9bca77 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
|
|
|
9bca77 |
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
|
|
|
9bca77 |
+if eval \${$3+:} false; then :
|
|
|
9bca77 |
+ $as_echo_n "(cached) " >&6
|
|
|
9bca77 |
+else
|
|
|
9bca77 |
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
9bca77 |
+/* end confdefs.h. */
|
|
|
9bca77 |
+$4
|
|
|
9bca77 |
+int
|
|
|
9bca77 |
+main ()
|
|
|
9bca77 |
+{
|
|
|
9bca77 |
+#ifndef $as_decl_name
|
|
|
9bca77 |
+#ifdef __cplusplus
|
|
|
9bca77 |
+ (void) $as_decl_use;
|
|
|
9bca77 |
+#else
|
|
|
9bca77 |
+ (void) $as_decl_name;
|
|
|
9bca77 |
+#endif
|
|
|
9bca77 |
+#endif
|
|
|
9bca77 |
+
|
|
|
9bca77 |
+ ;
|
|
|
9bca77 |
+ return 0;
|
|
|
9bca77 |
+}
|
|
|
9bca77 |
+_ACEOF
|
|
|
9bca77 |
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
|
9bca77 |
+ eval "$3=yes"
|
|
|
9bca77 |
+else
|
|
|
9bca77 |
+ eval "$3=no"
|
|
|
9bca77 |
+fi
|
|
|
9bca77 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
9bca77 |
+fi
|
|
|
9bca77 |
+eval ac_res=\$$3
|
|
|
9bca77 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
|
9bca77 |
+$as_echo "$ac_res" >&6; }
|
|
|
9bca77 |
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
|
|
9bca77 |
+
|
|
|
9bca77 |
+} # ac_fn_c_check_decl
|
|
|
9bca77 |
+
|
|
|
9bca77 |
# ac_fn_c_check_func LINENO FUNC VAR
|
|
|
9bca77 |
# ----------------------------------
|
|
|
9bca77 |
# Tests whether FUNC exists, setting the cache variable VAR accordingly
|
|
|
9bca77 |
@@ -6891,6 +6937,30 @@ _ACEOF
|
|
|
9bca77 |
fi
|
|
|
9bca77 |
|
|
|
9bca77 |
|
|
|
9bca77 |
+ ac_fn_c_check_decl "$LINENO" "SSH_PUBLICKEY_HASH_SHA256" "ac_cv_have_decl_SSH_PUBLICKEY_HASH_SHA256" "#include <libssh/libssh.h>
|
|
|
9bca77 |
+"
|
|
|
9bca77 |
+if test "x$ac_cv_have_decl_SSH_PUBLICKEY_HASH_SHA256" = xyes; then :
|
|
|
9bca77 |
+ ac_have_decl=1
|
|
|
9bca77 |
+else
|
|
|
9bca77 |
+ ac_have_decl=0
|
|
|
9bca77 |
+fi
|
|
|
9bca77 |
+
|
|
|
9bca77 |
+cat >>confdefs.h <<_ACEOF
|
|
|
9bca77 |
+#define HAVE_DECL_SSH_PUBLICKEY_HASH_SHA256 $ac_have_decl
|
|
|
9bca77 |
+_ACEOF
|
|
|
9bca77 |
+ac_fn_c_check_decl "$LINENO" "ssh_get_fingerprint_hash" "ac_cv_have_decl_ssh_get_fingerprint_hash" "#include <libssh/libssh.h>
|
|
|
9bca77 |
+"
|
|
|
9bca77 |
+if test "x$ac_cv_have_decl_ssh_get_fingerprint_hash" = xyes; then :
|
|
|
9bca77 |
+ ac_have_decl=1
|
|
|
9bca77 |
+else
|
|
|
9bca77 |
+ ac_have_decl=0
|
|
|
9bca77 |
+fi
|
|
|
9bca77 |
+
|
|
|
9bca77 |
+cat >>confdefs.h <<_ACEOF
|
|
|
9bca77 |
+#define HAVE_DECL_SSH_GET_FINGERPRINT_HASH $ac_have_decl
|
|
|
9bca77 |
+_ACEOF
|
|
|
9bca77 |
+
|
|
|
9bca77 |
+
|
|
|
9bca77 |
COCKPIT_SSH_SESSION_CFLAGS="$COCKPIT_CFLAGS $LIBSSH_CFLAGS $KRB5_CFLAGS"
|
|
|
9bca77 |
COCKPIT_SSH_SESSION_LIBS="$COCKPIT_LIBS $LIBSSH_LIBS $KRB5_LIBS"
|
|
|
9bca77 |
|