summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2011-03-09 11:55:06 +0100
committerRichard Hughes <richard@hughsie.com>2011-03-09 11:03:44 +0000
commitd1e5f6a4dafbb5b376f06775070146f9def54407 (patch)
treea9c41b080aa68bb83fe5af00b88a1fd292b4eb3d
parent8b9ee531330a0e4a4f81bbe046282bfd27675015 (diff)
Depend on stable GUdev API
The GUdev API was declared stable in udev release 147. Bump the version in the configure check and drop the G_UDEV_API_IS_SUBJECT_TO_CHANGE defines. Signed-off-by: Richard Hughes <richard@hughsie.com>
-rw-r--r--configure.ac2
-rw-r--r--src/Makefile.am1
-rw-r--r--src/linux/Makefile.am1
3 files changed, 1 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 1b420e1..6d71403 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,7 +191,7 @@ AC_SUBST(BACKEND, "$with_backend")
# only need GUdev on linux
have_idevice=no
if test x$with_backend = xlinux; then
- PKG_CHECK_MODULES(GUDEV, [gudev-1.0 >= 001])
+ PKG_CHECK_MODULES(GUDEV, [gudev-1.0 >= 147])
PKG_CHECK_MODULES(USB, [libusb-1.0 >= 1.0.0])
AC_ARG_WITH(idevice, AS_HELP_STRING([--without-idevice],[Build without libimobiledevice]),
with_idevice=$withval,with_idevice=yes)
diff --git a/src/Makefile.am b/src/Makefile.am
index 3572dfe..1cb9050 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,7 +12,6 @@ INCLUDES = \
-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-DPACKAGE_LIB_DIR=\""$(libdir)"\" \
-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
- -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
-DUP_COMPILATION \
-DUP_DISABLE_DEPRECATED \
-DG_LOG_DOMAIN=\"UPower\" \
diff --git a/src/linux/Makefile.am b/src/linux/Makefile.am
index c4646f7..446fc0f 100644
--- a/src/linux/Makefile.am
+++ b/src/linux/Makefile.am
@@ -3,7 +3,6 @@
INCLUDES = \
-I$(top_builddir)/src -I$(top_srcdir)/src \
-DUP_COMPILATION \
- -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
-DG_LOG_DOMAIN=\"UPower-Linux\" \
-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
-I$(top_srcdir)/libupower-glib \