From 9455d3542a3f8fa8feb96cddfc96db0c34e2ed15 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Sat, 20 Oct 2018 22:25:06 +0200 Subject: [PATCH] Use same name for DBUS_HAVE_LINUX_EPOLL cpp macro and Automake conditional Reviewed-by: Simon McVittie Bug: https://gitlab.freedesktop.org/dbus/dbus/merge_requests/18 --- configure.ac | 2 +- dbus/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 05c18b5e4..51a016dc7 100644 --- 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 e4a7f5a84..c003b3998 100644 --- 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 -- 2.47.3