diff options
| author | Michael Albinus | 2015-11-09 10:00:56 +0100 |
|---|---|---|
| committer | Michael Albinus | 2015-11-25 15:07:10 +0100 |
| commit | e3354e2265bc442e4c7b84b806be482db88581a2 (patch) | |
| tree | 21c79b24540c150ada3fe3b7c7941985327cc16f /src/Makefile.in | |
| parent | c6457cef92342d586d894504fdefc1bec1367725 (diff) | |
| download | emacs-e3354e2265bc442e4c7b84b806be482db88581a2.tar.gz emacs-e3354e2265bc442e4c7b84b806be482db88581a2.zip | |
Add kqueue support
* configure.ac (--with-file-notification): Add kqueue.
(top): Remove special test for "${HAVE_NS}" and
${with_file_notification}, this is handled inside gfilenotify
tests. Add kqueue tests. Use NOTIFY_CFLAGS and NOTIFY_LIBS
instead of library specific variables.
* src/Makefile.in: Use NOTIFY_CFLAGS and NOTIFY_LIBS.
* src/emacs.c (main): Call globals_of_kqueue and syms_of_kqueue.
* src/kqueue.c: New file.
* src/lisp.h: Declare extern globals_of_kqueue and syms_of_kqueue.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index d667c55ee33..d7ad3954579 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -160,12 +160,13 @@ SETTINGS_LIBS = @SETTINGS_LIBS@ | |||
| 160 | ## gtkutil.o if USE_GTK, else empty. | 160 | ## gtkutil.o if USE_GTK, else empty. |
| 161 | GTK_OBJ=@GTK_OBJ@ | 161 | GTK_OBJ=@GTK_OBJ@ |
| 162 | 162 | ||
| 163 | ## gfilenotify.o if HAVE_GFILENOTIFY. | ||
| 164 | ## inotify.o if HAVE_INOTIFY. | 163 | ## inotify.o if HAVE_INOTIFY. |
| 164 | ## kqueue.o if HAVE_KQUEUE. | ||
| 165 | ## gfilenotify.o if HAVE_GFILENOTIFY. | ||
| 165 | ## w32notify.o if HAVE_W32NOTIFY. | 166 | ## w32notify.o if HAVE_W32NOTIFY. |
| 166 | NOTIFY_OBJ = @NOTIFY_OBJ@ | 167 | NOTIFY_OBJ = @NOTIFY_OBJ@ |
| 167 | GFILENOTIFY_CFLAGS = @GFILENOTIFY_CFLAGS@ | 168 | NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ |
| 168 | GFILENOTIFY_LIBS = @GFILENOTIFY_LIBS@ | 169 | NOTIFY_LIBS = @NOTIFY_LIBS@ |
| 169 | 170 | ||
| 170 | ## -ltermcap, or -lncurses, or -lcurses, or "". | 171 | ## -ltermcap, or -lncurses, or -lcurses, or "". |
| 171 | LIBS_TERMCAP=@LIBS_TERMCAP@ | 172 | LIBS_TERMCAP=@LIBS_TERMCAP@ |
| @@ -355,7 +356,7 @@ ALL_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I$(srcdir) \ | |||
| 355 | $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) $(XFIXES_CFLAGS) \ | 356 | $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) $(XFIXES_CFLAGS) \ |
| 356 | $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \ | 357 | $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \ |
| 357 | $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \ | 358 | $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \ |
| 358 | $(LIBGNUTLS_CFLAGS) $(GFILENOTIFY_CFLAGS) $(CAIRO_CFLAGS) \ | 359 | $(LIBGNUTLS_CFLAGS) $(NOTIFY_CFLAGS) $(CAIRO_CFLAGS) \ |
| 359 | $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAGS) | 360 | $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAGS) |
| 360 | ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS) | 361 | ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS) |
| 361 | 362 | ||
| @@ -468,7 +469,7 @@ LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \ | |||
| 468 | $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ | 469 | $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ |
| 469 | $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ | 470 | $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ |
| 470 | $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) \ | 471 | $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) \ |
| 471 | $(GFILENOTIFY_LIBS) $(LIB_MATH) $(LIBZ) | 472 | $(NOTIFY_LIBS) $(LIB_MATH) $(LIBZ) |
| 472 | 473 | ||
| 473 | $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) | 474 | $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) |
| 474 | $(MAKE) -C ../leim leim-list.el EMACS="$(bootstrap_exe)" | 475 | $(MAKE) -C ../leim leim-list.el EMACS="$(bootstrap_exe)" |