Add HAVE_GLIB check instead of checking individual libraries that use GLib.

* configure.ac (HAVE_GLIB): Add GLib check.  Set XGSELOBJ if GLib is
used.  Remove xgselect.o from XOBJ.

* src/Makefile.in (XGSELOBJ): New, xgselect.o if GLib is used, or empty.

* src/process.c (wait_reading_process_output): Call xg_select if HAVE_GLIB.

* src/xgselect.c: Replace #if defined ... with #ifdef HAVE_GLIB.

4 files changed, 16 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b3b6f4730f0..aeca77b2ba3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2013-06-03  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xgselect.c: Replace #if defined ... with #ifdef HAVE_GLIB.
+
+        * process.c (wait_reading_process_output): Call xg_select if HAVE_GLIB.
+
+        * Makefile.in (XGSELOBJ): New, xgselect.o if GLib is used, or empty.
+
 2013-06-03  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix minor problems found by static checking.
diff --git a/src/Makefile.in b/src/Makefile.in
index 0556bae1ecd..0e42f0ee6a0 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -205,10 +205,13 @@ LIBXMENU=@LIBXMENU@
 
 ## xmenu.o if HAVE_X_WINDOWS, else empty.
 XMENU_OBJ=@XMENU_OBJ@
-## xterm.o xfns.o xselect.o xrdb.o xsmfns.o xsettings.o xgselect.o if
+## xterm.o xfns.o xselect.o xrdb.o xsmfns.o xsettings.o if
 ## HAVE_X_WINDOWS, else empty.
 XOBJ=@XOBJ@
 
+# xgselect.o if linking with GLib, else empty
+XGSELOBJ=@XGSELOBJ@
+
 TOOLKIT_LIBW=@TOOLKIT_LIBW@
 
 ## Only used if HAVE_X11, in LIBX_OTHER.
@@ -371,7 +374,7 @@ base_obj = dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
         doprnt.o intervals.o textprop.o composite.o xml.o $(NOTIFY_OBJ) \
         profiler.o \
         $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \
-        $(W32_OBJ) $(WINDOW_SYSTEM_OBJ)
+        $(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ)
 obj = $(base_obj) $(NS_OBJC_OBJ)
 
 ## Object files used on some machine or other.
diff --git a/src/process.c b/src/process.c
index 8c4199e5eed..33035078df9 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4528,7 +4528,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
             }
 #endif
 
-#if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS)
+#if defined (HAVE_GLIB)
           nfds = xg_select
 #elif defined (HAVE_NS)
           nfds = ns_select
diff --git a/src/xgselect.c b/src/xgselect.c
index 0b5ad6ae70d..38b9705e976 100644
--- a/src/xgselect.c
+++ b/src/xgselect.c
@@ -21,7 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "xgselect.h"
 
-#if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS)
+#ifdef HAVE_GLIB
 
 #include <glib.h>
 #include <errno.h>
@@ -140,4 +140,4 @@ xg_select (int fds_lim, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
 
   return retval;
 }
-#endif /* USE_GTK || HAVE_GCONF || HAVE_GSETTINGS */
+#endif /* HAVE_GLIB */