[PATCH xserver 3/6] automake,meson: Remove HAVE_LIBUDEV define.

Eric Anholt eric at anholt.net
Wed Aug 1 20:49:51 UTC 2018


CONFIG_UDEV and CONFIG_UDEV_KMS are the actual defines that are used
in the C code.

Signed-off-by: Eric Anholt <eric at anholt.net>
---
 configure.ac        | 1 -
 include/meson.build | 1 -
 2 files changed, 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7d5cb0d4d0ed..e0ebc78a1c73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -859,7 +859,6 @@ fi
 PKG_CHECK_MODULES(UDEV, $LIBUDEV, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])
 if test "x$CONFIG_UDEV" = xauto; then
 	CONFIG_UDEV="$HAVE_LIBUDEV"
-	AC_DEFINE(HAVE_LIBUDEV, 1, [Define to 1 if libudev is available.])
 fi
 AM_CONDITIONAL(CONFIG_UDEV, [test "x$CONFIG_UDEV" = xyes])
 if test "x$CONFIG_UDEV" = xyes; then
diff --git a/include/meson.build b/include/meson.build
index 9682827dd5e9..81a48af9642e 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -61,7 +61,6 @@ conf_data.set('HAVE_INPUTTHREAD', '1') # XXX
 conf_data.set('HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID', '1') # XXX
 conf_data.set('HAVE_LIBBSD', libbsd_dep.found())
 # XXX: HAVE_SYSTEMD_DAEMON
-# XXX: HAVE_LIBUDEV
 conf_data.set('CONFIG_UDEV', build_udev)
 conf_data.set('CONFIG_UDEV_KMS', build_udev)
 conf_data.set('HAVE_DBUS', build_dbus)
-- 
2.18.0



More information about the xorg-devel mailing list