From 8119ecf6b09150392e619ccedf59a66eb0b37f95 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 10 Mar 2011 03:19:27 -0600 Subject: [PATCH] core: depend on stable gudev API --- configure.ac | 2 +- libnm-glib/nm-device.c | 1 - src/nm-device-ethernet.c | 1 - src/nm-udev-manager.c | 1 - src/nm-udev-manager.h | 1 - src/settings/plugins/ifupdown/plugin.c | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 47826e518..80acf806e 100644 --- a/configure.ac +++ b/configure.ac @@ -244,7 +244,7 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0) AC_SUBST(GMODULE_CFLAGS) AC_SUBST(GMODULE_LIBS) -PKG_CHECK_MODULES(GUDEV, gudev-1.0) +PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147) AC_SUBST(GUDEV_CFLAGS) AC_SUBST(GUDEV_LIBS) diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index 7f0e5aa5c..7a36d7e1b 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -23,7 +23,6 @@ #include -#define G_UDEV_API_IS_SUBJECT_TO_CHANGE #include #include "NetworkManager.h" diff --git a/src/nm-device-ethernet.c b/src/nm-device-ethernet.c index 51472edb5..1bec392a8 100644 --- a/src/nm-device-ethernet.c +++ b/src/nm-device-ethernet.c @@ -34,7 +34,6 @@ #include #include -#define G_UDEV_API_IS_SUBJECT_TO_CHANGE #include #include diff --git a/src/nm-udev-manager.c b/src/nm-udev-manager.c index 5e3da0b8d..9972042af 100644 --- a/src/nm-udev-manager.c +++ b/src/nm-udev-manager.c @@ -29,7 +29,6 @@ #include "wireless-helper.h" -#define G_UDEV_API_IS_SUBJECT_TO_CHANGE #include #include "nm-udev-manager.h" diff --git a/src/nm-udev-manager.h b/src/nm-udev-manager.h index 06a2d35ce..e7866f96e 100644 --- a/src/nm-udev-manager.h +++ b/src/nm-udev-manager.h @@ -25,7 +25,6 @@ #include #include -#define G_UDEV_API_IS_SUBJECT_TO_CHANGE #include #include "nm-rfkill.h" diff --git a/src/settings/plugins/ifupdown/plugin.c b/src/settings/plugins/ifupdown/plugin.c index bd889b31a..b62285eea 100644 --- a/src/settings/plugins/ifupdown/plugin.c +++ b/src/settings/plugins/ifupdown/plugin.c @@ -52,7 +52,6 @@ #include -#define G_UDEV_API_IS_SUBJECT_TO_CHANGE #include #define ENI_INTERFACES_FILE "/etc/network/interfaces"