[gimp/gimp-2-8] Bug 773920 - Could not load or add help system - TLS/SSL support not...
- From: Jehan Pagès <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-8] Bug 773920 - Could not load or add help system - TLS/SSL support not...
- Date: Wed, 10 May 2017 20:28:37 +0000 (UTC)
commit 9eafce47fbe1ff47a058ca51304b33bfc8d25c3a
Author: Jehan <jehan girinstud io>
Date: Wed May 10 22:25:06 2017 +0200
Bug 773920 - Could not load or add help system - TLS/SSL support not...
... available; install glib-networking
Mostly taken from commit bb196607693b2a8fa95f033966506cbf3c377d81,
adding hard-dependency on glib-networking.
The configure are now a bit different now, so it was just easier
to copy-paste and fix rather than cherry-picking.
configure.ac | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7eca5da..f64072a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -543,6 +543,31 @@ else
fi
AC_MSG_RESULT($have_glib_2_31)
+AC_MSG_CHECKING([for glib-networking (GIO TLS implementation)])
+gimp_save_CFLAGS="$CFLAGS"
+gimp_save_LIBS="$LIBS"
+CFLAGS="$CFLAGS $GIO_CFLAGS"
+LIBS="$LIBS $GIO_LIBS"
+AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <gio/gio.h>],
+ [return !g_tls_backend_supports_tls (g_tls_backend_get_default ());])],
+ [have_glib_networking="yes"],
+ [have_glib_networking="no"],
+ [have_glib_networking="unknown (cross-compiling)"])
+CFLAGS="$gimp_save_CFLAGS"
+LIBS="$gimp_save_LIBS"
+AC_MSG_RESULT($have_glib_networking)
+
+if test "x$have_glib_networking" = "xno"; then
+ AC_MSG_ERROR([Test for glib-networking failed. This is required.])
+elif test "x$have_glib_networking" != "xyes"; then
+ warning_glib_networking="
+WARNING: Test for glib-networking cannot be performed while cross-compiling.
+ Make sure glib-networking is installed, otherwise GIMP will not be able
+ to display the remote help pages through the help browser, nor will it
+ be able to open remote HTTPS (or other protocol using SSL/TLS) files.
+ HTTPS is becoming the expected standard and should not be considered
+ optional anymore."
+fi
# Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
gimp_save_LIBS=$LIBS
@@ -2500,5 +2525,5 @@ Optional Modules:
Tests:
Use xvfb-run $have_xvfb_run
-$have_recommended_xgettext $have_recommended_fontconfig
+$have_recommended_xgettext$have_recommended_fontconfig$warning_glib_networking
]);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]