From: Joakim Verona <joakim@verona.se>
Date: Mon, 25 May 2015 15:30:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into xwidget_mvp
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=97cc85a8a64d0fa0122773972330eabd0f638c2a;p=emacs.git

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

Conflicts:
	src/Makefile.in
---

97cc85a8a64d0fa0122773972330eabd0f638c2a
diff --cc src/Makefile.in
index 702b3163b69,172fa8e47cd..322b16f3cc0
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@@ -221,11 -218,8 +221,13 @@@ CFLAGS_SOUND= @CFLAGS_SOUND
  RSVG_LIBS= @RSVG_LIBS@
  RSVG_CFLAGS= @RSVG_CFLAGS@
  
 +WEBKIT_LIBS= @WEBKIT_LIBS@
 +WEBKIT_CFLAGS= @WEBKIT_CFLAGS@
 +
 +GIR_LIBS= @GIR_LIBS@
 +GIR_CFLAGS= @GIR_CFLAGS@
+ CAIRO_LIBS= @CAIRO_LIBS@
+ CAIRO_CFLAGS= @CAIRO_CFLAGS@
  
  IMAGEMAGICK_LIBS= @IMAGEMAGICK_LIBS@
  IMAGEMAGICK_CFLAGS= @IMAGEMAGICK_CFLAGS@
@@@ -357,10 -352,9 +360,10 @@@ ALL_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I
    $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \
    $(PNG_CFLAGS) $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \
    $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) $(XFIXES_CFLAGS) \
 +  $(WEBKIT_CFLAGS) $(GIR_CFLAGS) \
    $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \
    $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \
-   $(LIBGNUTLS_CFLAGS) $(GFILENOTIFY_CFLAGS) \
+   $(LIBGNUTLS_CFLAGS) $(GFILENOTIFY_CFLAGS) $(CAIRO_CFLAGS) \
    $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAGS)
  ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS)
  
@@@ -465,10 -461,9 +471,10 @@@ lisp = $(addprefix ${lispsource}/,${sho
  LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
     $(LIBX_OTHER) $(LIBSOUND) \
     $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_ACL) $(LIB_CLOCK_GETTIME) \
 +   $(WEBKIT_LIBS) $(GIR_LIBS) \
     $(LIB_EACCESS) $(LIB_FDATASYNC) $(LIB_TIMER_TIME) $(DBUS_LIBS) \
     $(LIB_EXECINFO) $(XRANDR_LIBS) $(XINERAMA_LIBS) $(XFIXES_LIBS) \
-    $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
+    $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) $(CAIRO_LIBS) \
     $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
     $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \
     $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) \