diff options
| author | Michael Albinus | 2013-06-03 21:38:06 +0200 |
|---|---|---|
| committer | Michael Albinus | 2013-06-03 21:38:06 +0200 |
| commit | b9110c6b2f796b5147b018c3d70df9d6af657eff (patch) | |
| tree | 063c52431c97cc96ffb47bc0a23917ed97fe290d | |
| parent | 9337e20653c80e332555d109b945180cf41171fa (diff) | |
| download | emacs-b9110c6b2f796b5147b018c3d70df9d6af657eff.tar.gz emacs-b9110c6b2f796b5147b018c3d70df9d6af657eff.zip | |
* configure.ac (HAVE_GFILENOTIFY): Check for gio >= 2.24.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 7 insertions, 2 deletions
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-06-03 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * configure.ac (HAVE_GFILENOTIFY): Check for gio >= 2.24. | ||
| 4 | |||
| 1 | 2013-06-03 Eli Zaretskii <eliz@gnu.org> | 5 | 2013-06-03 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * configure.ac (HAVE_GFILENOTIFY): Do not change $LIBS. | 7 | * configure.ac (HAVE_GFILENOTIFY): Do not change $LIBS. |
diff --git a/configure.ac b/configure.ac index 4e58cddf59e..f23a9334a73 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -2321,12 +2321,13 @@ if test "${with_file_notification}" = "yes"; then | |||
| 2321 | fi | 2321 | fi |
| 2322 | fi | 2322 | fi |
| 2323 | 2323 | ||
| 2324 | dnl g_file_monitor exists since glib 2.18. It has been tested under | 2324 | dnl g_file_monitor exists since glib 2.18. G_FILE_MONITOR_EVENT_MOVED |
| 2325 | dnl has been added in glib 2.24. It has been tested under | ||
| 2325 | dnl GNU/Linux only. We take precedence over inotify, but this makes | 2326 | dnl GNU/Linux only. We take precedence over inotify, but this makes |
| 2326 | dnl only sense when glib has been compiled with inotify support. How | 2327 | dnl only sense when glib has been compiled with inotify support. How |
| 2327 | dnl to check? | 2328 | dnl to check? |
| 2328 | if test "${with_file_notification}" = "gfile"; then | 2329 | if test "${with_file_notification}" = "gfile"; then |
| 2329 | PKG_CHECK_MODULES(GFILENOTIFY, gio-2.0 >= 2.18, HAVE_GFILENOTIFY=yes, HAVE_GFILENOTIFY=no) | 2330 | PKG_CHECK_MODULES(GFILENOTIFY, gio-2.0 >= 2.24, HAVE_GFILENOTIFY=yes, HAVE_GFILENOTIFY=no) |
| 2330 | if test "$HAVE_GFILENOTIFY" = "yes"; then | 2331 | if test "$HAVE_GFILENOTIFY" = "yes"; then |
| 2331 | AC_DEFINE(HAVE_GFILENOTIFY, 1, [Define to 1 if using GFile.]) | 2332 | AC_DEFINE(HAVE_GFILENOTIFY, 1, [Define to 1 if using GFile.]) |
| 2332 | NOTIFY_OBJ=gfilenotify.o | 2333 | NOTIFY_OBJ=gfilenotify.o |