Fix compilation issues for GNUStep and GLIB conflicts.

* configure.ac (HAVE_GLIB): Only set XGSELOBJ if HAVE_NS = no.
(with_file_notification): Don't set to gfile if with_ns = yes.

* src/process.c (wait_reading_process_output): Check for NS before GLIB.
GLIB may be linked in due to rsvg, but ns_select must be called.

* src/xgselect.c (xg_select): Remove call to window_system_available
and g_main_context_pending at the top, so Gdk events (i.e. file
notify) are processed when Emacs is started with -nw.

* src/xgselect.c: Remove unneeded include xterm.h

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.

diff --git a/configure.ac b/configure.ac
index f23a9334a73fea25b64357af52095733208afd60..9c51d2113a5058a45a4996d03b51cdc4ba5ab5ed 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2317,7 +2317,9 @@ if test "${with_file_notification}" = "yes"; then
    if test "${opsys}" = "mingw32"; then
       with_file_notification=w32
    else
-      with_file_notification=gfile
+      if test "${with_ns}" != yes; then
+        with_file_notification=gfile
+      fi
    fi
 fi
 
@@ -3627,7 +3629,9 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM(
 AC_MSG_RESULT([$links_glib])
 if test "${links_glib}" = "yes"; then
   AC_DEFINE(HAVE_GLIB, 1, [Define to 1 if GLib is linked in.])
-  XGSELOBJ=xgselect.o
+  if test "$HAVE_NS" = no;then
+    XGSELOBJ=xgselect.o
+  fi
 fi
 AC_SUBST(XGSELOBJ)
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 7d650885f1919d75824136bbbccbde0d76a9e441..629f90678e6b08926d164be9f6b02767a8c8f5c4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2013-06-08  Jan Djärv  <jan.h.d@swipnet.se>
 
+       * xgselect.c: Remove unneeded include xterm.h
+
+       * process.c (wait_reading_process_output): Check for NS before GLIB.
+       GLIB may be linked in due to rsvg, but ns_select must be called.
+
        * xgselect.c (xg_select): Remove call to window_system_available
        and g_main_context_pending at the top, so Gdk events (i.e. file
        notify) are processed when Emacs is started with -nw.

diff --git a/src/process.c b/src/process.c
index 6ae02494d368763ed12d9369163dab03ef8da922..e51b45bd64f3da7d0b69a968d6ae4ebfea1316a8 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -4528,10 +4528,10 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
            }
 #endif
 
-#if defined (HAVE_GLIB)
-          nfds = xg_select
-#elif defined (HAVE_NS)
-         nfds = ns_select
+#if defined (HAVE_NS)
+          nfds = ns_select
+#elif defined (HAVE_GLIB)
+         nfds = xg_select
 #else
          nfds = pselect
 #endif

diff --git a/src/xgselect.c b/src/xgselect.c
index e2d14f12e9ff2920b4e128dc1a4412b81ca8c84b..4d90298a9d915a5e55685049cd23802b95fa53a9 100644 (file)
--- a/src/xgselect.c
+++ b/src/xgselect.c
@@ -25,7 +25,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <glib.h>
 #include <errno.h>
-#include "xterm.h"
 #include "frame.h"
 
 int