Use same name for DBUS_HAVE_LINUX_EPOLL cpp macro and Automake conditional

Reviewed-by: Simon McVittie <smcv@collabora.com>
Bug: https://gitlab.freedesktop.org/dbus/dbus/merge_requests/18

diff --git a/configure.ac b/configure.ac
index 05c18b5e414fa6bf3fa004df3bdb39c4c9f6af50..51a016dc7c7f1b1a5d40ceb6b39294a6fa6c0e2a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1011,7 +1011,7 @@ fi
 if test x$have_linux_epoll = xyes; then
   AC_DEFINE([DBUS_HAVE_LINUX_EPOLL], 1, [Define to use epoll(4) on Linux])
 fi
-AM_CONDITIONAL([HAVE_LINUX_EPOLL], [test x$have_linux_epoll = xyes])
+AM_CONDITIONAL([DBUS_HAVE_LINUX_EPOLL], [test x$have_linux_epoll = xyes])
 
 # kqueue checks
 if test x$enable_kqueue = xno ; then

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index e4a7f5a8465a6a3db0cb5c4fe95bf04c770e0d01..c003b3998fb145f88d676497bd4c8c269d0c400e 100644 (file)
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -120,7 +120,7 @@ DBUS_UTIL_arch_sources =                    \
        $(NULL)
 endif
 
-if HAVE_LINUX_EPOLL
+if DBUS_HAVE_LINUX_EPOLL
 DBUS_UTIL_arch_sources += dbus-socket-set-epoll.c
 endif