From: Joakim Verona <joakim@verona.se>
Date: Sun, 3 Jan 2016 10:46:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into xwidget_mvp
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5498c3509b2a69207c807d23c6013b148ce37bc4;p=emacs.git

Merge remote-tracking branch 'origin/master' into xwidget_mvp
---

5498c3509b2a69207c807d23c6013b148ce37bc4
diff --cc configure.ac
index 71fa6886b1f,94007a49537..ec5e7800448
--- a/configure.ac
+++ b/configure.ac
@@@ -5285,10 -5288,8 +5330,11 @@@ AS_ECHO(["  Does Emacs use -lXaw3d
    Does Emacs use -lotf?                                   ${HAVE_LIBOTF}
    Does Emacs use -lxft?                                   ${HAVE_XFT}
    Does Emacs directly use zlib?                           ${HAVE_ZLIB}
+   Does Emacs have dynamic modules support?                ${HAVE_MODULES}
    Does Emacs use toolkit scroll bars?                     ${USE_TOOLKIT_SCROLL_BARS}
 +  Does Emacs support Xwidgets?                            ${HAVE_XWIDGETS}
 +      Does xwidgets support webkit(requires gtk3)?        ${HAVE_WEBKIT}
 +      Does xwidgets support gobject introspection?        ${HAVE_GIR}
  "])
  
  if test -n "${EMACSDATA}"; then