From: Joakim Verona <joakim@verona.se>
Date: Sun, 18 Nov 2012 11:33:54 +0000 (+0100)
Subject: upstream
X-Git-Tag: emacs-25.0.90~3263
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e6206db4260932d795ab4e8bbe73c180dff23026;p=emacs.git

upstream
---

e6206db4260932d795ab4e8bbe73c180dff23026
diff --cc src/Makefile.in
index 20e9366592d,c24e421bbbc,d034ad04796..88e1fc544d0
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@@@ -404,8 -392,7 -393,7 +405,8 @@@@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OB
   LIBES = $(LIBS) $(W32_LIBS) $(LIBX_BASE) $(LIBIMAGE) \
      $(LIBX_OTHER) $(LIBSOUND) \
      $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) \
 -    $(LIB_TIMER_TIME) $(DBUS_LIBS) \
 ++   $(WEBKIT_LIBS) $(CLUTTER_LIBS) $(GIR_LIBS) \
-     $(LIB_TIMER_TIME) $(DBUS_LIBS) \
++    $(LIB_EACCESS) $(LIB_TIMER_TIME) $(DBUS_LIBS) \
      $(LIB_EXECINFO) \
      $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
      $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \