diff options
| author | Paul Eggert | 2012-12-10 12:27:33 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-12-10 12:27:33 -0800 |
| commit | 7e77303ee5dc44594747e9c41688dd3273de7ea7 (patch) | |
| tree | 87e93861858c10254ef2f3e4013093582be5d962 | |
| parent | c868b91923f344c5e0e3be990da49643068500c1 (diff) | |
| download | emacs-7e77303ee5dc44594747e9c41688dd3273de7ea7.tar.gz emacs-7e77303ee5dc44594747e9c41688dd3273de7ea7.zip | |
* configure.ac (HAVE_INOTIFY): Speed up configure-time test.
There's no need to test for any of three inotify functions,
since we use all three. Check for just the first one.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 9 insertions, 4 deletions
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-12-10 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * configure.ac (HAVE_INOTIFY): Speed up configure-time test. | ||
| 4 | There's no need to test for any of three inotify functions, | ||
| 5 | since we use all three. Check for just the first one. | ||
| 6 | |||
| 1 | 2012-12-10 Daniel Colascione <dancol@dancol.org> | 7 | 2012-12-10 Daniel Colascione <dancol@dancol.org> |
| 2 | 8 | ||
| 3 | * configure.ac (W32_RES, W32_RES_LINK, WINDRES): Teach the cygw32 | 9 | * configure.ac (W32_RES, W32_RES_LINK, WINDRES): Teach the cygw32 |
diff --git a/configure.ac b/configure.ac index 6f188a54bd7..f721c02f71f 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -2187,15 +2187,14 @@ AC_SUBST(LIBGNUTLS_LIBS) | |||
| 2187 | AC_SUBST(LIBGNUTLS_CFLAGS) | 2187 | AC_SUBST(LIBGNUTLS_CFLAGS) |
| 2188 | 2188 | ||
| 2189 | dnl inotify is only available on GNU/Linux. | 2189 | dnl inotify is only available on GNU/Linux. |
| 2190 | HAVE_INOTIFY=no | ||
| 2191 | if test "${with_inotify}" = "yes"; then | 2190 | if test "${with_inotify}" = "yes"; then |
| 2192 | AC_CHECK_HEADERS(sys/inotify.h) | 2191 | AC_CHECK_HEADERS(sys/inotify.h) |
| 2193 | if test "$ac_cv_header_sys_inotify_h" = yes ; then | 2192 | if test "$ac_cv_header_sys_inotify_h" = yes ; then |
| 2194 | AC_CHECK_FUNCS(inotify_init1 inotify_add_watch inotify_rm_watch, HAVE_INOTIFY=yes) | 2193 | AC_CHECK_FUNC(inotify_init1) |
| 2195 | fi | 2194 | fi |
| 2196 | fi | 2195 | fi |
| 2197 | if test "${HAVE_INOTIFY}" = "yes"; then | 2196 | if test "$ac_cv_func_inotify_init1" = yes; then |
| 2198 | AC_DEFINE(HAVE_INOTIFY, [1], [Define to 1 to use inotify]) | 2197 | AC_DEFINE(HAVE_INOTIFY, 1, [Define to 1 to use inotify.]) |
| 2199 | fi | 2198 | fi |
| 2200 | 2199 | ||
| 2201 | dnl Do not put whitespace before the #include statements below. | 2200 | dnl Do not put whitespace before the #include statements below. |