Fix compilation issues for GNUStep and GLIB conflicts.

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 35238bda9644465ceaa644b659e90da71de10fd3..04ad375f55edf5261cdc754b576be88ff5a09a72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * configure.ac (HAVE_GLIB): Only set XGSELOBJ if HAVE_NS = no.
+       (with_file_notification): Don't set to gfile if with_ns = yes.
+
 2013-06-07  Richard Copley  <rcopley@gmail.com>  (tiny change)
 
        * Makefile.in (msys_to_w32): Modify to support d:\foo file names.