diff options
| author | Jan Djärv | 2013-06-03 20:47:35 +0200 |
|---|---|---|
| committer | Jan Djärv | 2013-06-03 20:47:35 +0200 |
| commit | 55a87246bae97514b6e927b9401b2b79592b8b91 (patch) | |
| tree | a262392c54564b2a26bd639be1e58eea10b5102c /src/process.c | |
| parent | 3d5ee10aa258a500e0b70b5eabe9d58cb3ab051e (diff) | |
| download | emacs-55a87246bae97514b6e927b9401b2b79592b8b91.tar.gz emacs-55a87246bae97514b6e927b9401b2b79592b8b91.zip | |
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.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, | |||
| 4528 | } | 4528 | } |
| 4529 | #endif | 4529 | #endif |
| 4530 | 4530 | ||
| 4531 | #if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS) | 4531 | #if defined (HAVE_GLIB) |
| 4532 | nfds = xg_select | 4532 | nfds = xg_select |
| 4533 | #elif defined (HAVE_NS) | 4533 | #elif defined (HAVE_NS) |
| 4534 | nfds = ns_select | 4534 | nfds = ns_select |