From: Joakim Verona <joakim@verona.se>
Date: Mon, 27 May 2013 21:14:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/trunk' into xwidget
X-Git-Tag: emacs-25.0.90~2909
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5cf62a1639c5993c1fd6b532f92325b28a13ee79;p=emacs.git

Merge remote-tracking branch 'origin/trunk' into xwidget

Conflicts:
	ChangeLog
	lisp/ChangeLog
	lisp/progmodes/octave.el
	src/Makefile.in
---

5cf62a1639c5993c1fd6b532f92325b28a13ee79
diff --cc src/Makefile.in
index d6516e812dd,c7a18363a5a..bf3c9bf3b6b
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@@ -324,8 -334,7 +343,8 @@@ ALL_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I
    -I$(lib) -I$(srcdir)/../lib \
    $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
    $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \
-   $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \
+   $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) \
 +  $(WEBKIT_CFLAGS) $(CLUTTER_CFLAGS) $(GIR_CFLAGS) \
    $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \
    $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \
    $(LIBGNUTLS_CFLAGS) \
@@@ -403,10 -412,9 +424,10 @@@ ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OB
  ## Construct full set of libraries to be linked.
  LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
     $(LIBX_OTHER) $(LIBSOUND) \
-    $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) \
+    $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_ACL) $(LIB_CLOCK_GETTIME) \
 +   $(WEBKIT_LIBS) $(CLUTTER_LIBS) $(GIR_LIBS) \
     $(LIB_EACCESS) $(LIB_FDATASYNC) $(LIB_TIMER_TIME) $(DBUS_LIBS) \
-    $(LIB_EXECINFO) \
+    $(LIB_EXECINFO) $(XRANDR_LIBS) $(XINERAMA_LIBS) \
     $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
     $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
     $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \