From c52762ea6763b93772f13ad0fd2c89fb6d201018 Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@lanedo.com>
Date: Tue, 13 Mar 2012 16:42:49 +0100
Subject: [PATCH] build: require gudev >= 147

Since udev 147 the gudev API is no longer marked as experimental, and therefore
`G_UDEV_API_IS_SUBJECT_TO_CHANGE' is no longer needed.
---
 configure.ac         | 2 +-
 src/mm-manager.c     | 2 --
 src/mm-plugin-base.c | 7 ++-----
 src/mm-plugin-base.h | 2 --
 src/mm-port-probe.h  | 2 --
 test/lsudev.c        | 1 -
 6 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 47427f18..94bcc0f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,7 +86,7 @@ PKG_CHECK_MODULES(MMCLI,
 AC_SUBST(MMCLI_CFLAGS)
 AC_SUBST(LIBMM_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/src/mm-manager.c b/src/mm-manager.c
index aa0e55ba..49a6b418 100644
--- a/src/mm-manager.c
+++ b/src/mm-manager.c
@@ -20,8 +20,6 @@
 #include <ctype.h>
 
 #include <gmodule.h>
-
-#define G_UDEV_API_IS_SUBJECT_TO_CHANGE
 #include <gudev/gudev.h>
 
 #include <ModemManager.h>
diff --git a/src/mm-plugin-base.c b/src/mm-plugin-base.c
index f136f3f8..fc3c3888 100644
--- a/src/mm-plugin-base.c
+++ b/src/mm-plugin-base.c
@@ -18,18 +18,15 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-
 #include <sys/stat.h>
 #include <unistd.h>
-
 #include <string.h>
 
+#include <gudev/gudev.h>
+
 #include <ModemManager.h>
 #include <mm-errors-types.h>
 
-#define G_UDEV_API_IS_SUBJECT_TO_CHANGE
-#include <gudev/gudev.h>
-
 #include "mm-plugin-base.h"
 #include "mm-port-probe-cache.h"
 #include "mm-at-serial-port.h"
diff --git a/src/mm-plugin-base.h b/src/mm-plugin-base.h
index 11a5d137..3870fd89 100644
--- a/src/mm-plugin-base.h
+++ b/src/mm-plugin-base.h
@@ -18,8 +18,6 @@
 
 #include <glib.h>
 #include <glib-object.h>
-
-#define G_UDEV_API_IS_SUBJECT_TO_CHANGE
 #include <gudev/gudev.h>
 
 #include "mm-plugin.h"
diff --git a/src/mm-port-probe.h b/src/mm-port-probe.h
index 2eb4aa48..927ac387 100644
--- a/src/mm-port-probe.h
+++ b/src/mm-port-probe.h
@@ -19,8 +19,6 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <gio/gio.h>
-
-#define G_UDEV_API_IS_SUBJECT_TO_CHANGE
 #include <gudev/gudev.h>
 
 #include "mm-port-probe-at.h"
diff --git a/test/lsudev.c b/test/lsudev.c
index f5e40010..b4ff790b 100644
--- a/test/lsudev.c
+++ b/test/lsudev.c
@@ -17,7 +17,6 @@
  */
 
 #include <glib.h>
-#define G_UDEV_API_IS_SUBJECT_TO_CHANGE
 #include <gudev/gudev.h>
 
 #include <stdio.h>