aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2012-12-10 12:27:33 -0800
committerPaul Eggert2012-12-10 12:27:33 -0800
commit7e77303ee5dc44594747e9c41688dd3273de7ea7 (patch)
tree87e93861858c10254ef2f3e4013093582be5d962
parentc868b91923f344c5e0e3be990da49643068500c1 (diff)
downloademacs-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--ChangeLog6
-rw-r--r--configure.ac7
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5969d5726fb..a351872f545 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
12012-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
12012-12-10 Daniel Colascione <dancol@dancol.org> 72012-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)
2187AC_SUBST(LIBGNUTLS_CFLAGS) 2187AC_SUBST(LIBGNUTLS_CFLAGS)
2188 2188
2189dnl inotify is only available on GNU/Linux. 2189dnl inotify is only available on GNU/Linux.
2190HAVE_INOTIFY=no
2191if test "${with_inotify}" = "yes"; then 2190if 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
2196fi 2195fi
2197if test "${HAVE_INOTIFY}" = "yes"; then 2196if 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.])
2199fi 2198fi
2200 2199
2201dnl Do not put whitespace before the #include statements below. 2200dnl Do not put whitespace before the #include statements below.