[gimp/gimp-2-8] app: default to GIMP_HELP_BROWSER_WEB_BROWSER if there is no webkit



commit c4dc16825b2cad223c2856886a086bc908556ecb
Author: Michael Natterer <mitch gimp org>
Date:   Sun May 25 15:23:58 2014 +0200

    app: default to GIMP_HELP_BROWSER_WEB_BROWSER if there is no webkit
    
    (cherry picked from commit f1573c42d2ab9a582cdba6f5a1a242e98530531e)

 app/config/gimpguiconfig.c |    5 +++++
 configure.ac               |    3 +++
 2 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c
index a1fc464..58ad18b 100644
--- a/app/config/gimpguiconfig.c
+++ b/app/config/gimpguiconfig.c
@@ -33,7 +33,12 @@
 #include "gimp-intl.h"
 
 
+#ifdef HAVE_WEBKIT
 #define DEFAULT_HELP_BROWSER   GIMP_HELP_BROWSER_GIMP
+#else
+#define DEFAULT_HELP_BROWSER   GIMP_HELP_BROWSER_WEB_BROWSER
+#endif
+
 #define DEFAULT_THEME          "Default"
 
 #define DEFAULT_USER_MANUAL_ONLINE_URI \
diff --git a/configure.ac b/configure.ac
index d887d3a..ba0beb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1392,6 +1392,9 @@ else
 fi
 
 AC_SUBST(WEB_PAGE)
+if test "x$have_webkit" = "xyes"; then
+  AC_DEFINE(HAVE_WEBKIT, 1, [Define to 1 if webkit is available])
+fi
 AM_CONDITIONAL(HAVE_WEBKIT, test "x$have_webkit" = xyes)
 
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]