From: Joakim Verona <joakim@verona.se>
Date: Mon, 12 Aug 2013 10:29:06 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2869
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5ff84f8a17c73bf63cc7532e14149380d9f83b3f;p=emacs.git

merge from trunk
---

5ff84f8a17c73bf63cc7532e14149380d9f83b3f
diff --cc configure.ac
index 49660f62519,3a311989887..7d433e95201
--- a/configure.ac
+++ b/configure.ac
@@@ -4851,12 -4817,9 +4856,13 @@@ echo "  Does Emacs use -lfreetype
  echo "  Does Emacs use -lm17n-flt?                              ${HAVE_M17N_FLT}"
  echo "  Does Emacs use -lotf?                                   ${HAVE_LIBOTF}"
  echo "  Does Emacs use -lxft?                                   ${HAVE_XFT}"
+ echo "  Does Emacs directly use zlib?                           ${HAVE_ZLIB}"
  
  echo "  Does Emacs use toolkit scroll bars?                     ${USE_TOOLKIT_SCROLL_BARS}"
 +
 +echo "  Does Emacs support Xwidgets?                            ${HAVE_XWIDGETS}"
 +echo "       Does xwidgets support webkit(requires gtk3)?       ${HAVE_WEBKIT}"
 +echo "       Does xwidgets support gobject introspection?       ${HAVE_GIR}"
  echo
  
  if test -n "${EMACSDATA}"; then