From: jave <joakim@verona.se>
Date: Tue, 30 Dec 2014 17:49:48 +0000 (+0100)
Subject: Improved configury
X-Git-Tag: emacs-25.0.90~2632
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4105b6a93047045553e10795742a808b805c85b7;p=emacs.git

Improved configury

Check several conditions before trying to enable xwidgets.
---

diff --git a/configure.ac b/configure.ac
index 37de36096a7..e63b7514ed8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2500,15 +2500,14 @@ HAVE_XWIDGETS=no
 HAVE_WEBKIT=no
 HAVE_GIR=no
 
-if test "${with_xwidgets}" != "no"; then
+if test "${with_xwidgets}" != "no" && test "${USE_GTK_TOOLKIT}" = "GTK3"  && test "$window_system" != "none" ; then
    echo "xwidgets enabled, checking webkit, and others"
    HAVE_XWIDGETS=yes
    AC_DEFINE(HAVE_XWIDGETS, 1, [Define to 1 if you have xwidgets support.])        
-#xwidgets
-#TODO
-# - enable only if gtk/gtk3 enabled
-# - webkit
-# - only webkit_osr is good so remove plain webkit laterish
+dnl xwidgets
+dnl - enable only if GTK3 is enabled, and we have a window system
+dnl - check for webkit and gobject introspection
+
 
 #webkit version for gtk3. 
   WEBKIT_REQUIRED=1.4.0