[gnome-settings-daemon] build: Move udev check
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] build: Move udev check
- Date: Wed, 2 Nov 2011 20:12:11 +0000 (UTC)
commit 7d3bc677c5c3b1d70864ccc0a30c0f63298447aa
Author: Bastien Nocera <hadess hadess net>
Date: Mon Oct 31 16:15:46 2011 +0000
build: Move udev check
configure.ac | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f1d62c6..19254e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,6 +145,26 @@ fi
AC_SUBST(DBUS_SYS_DIR)
dnl ---------------------------------------------------------------------------
+dnl - GUdev integration (default enabled)
+dnl ---------------------------------------------------------------------------
+GUDEV_PKG=""
+AC_ARG_ENABLE(gudev, AS_HELP_STRING([--disable-gudev],[Disable GUdev support]), enable_gudev=$enableval)
+if test x$enable_gudev != xno; then
+ PKG_CHECK_MODULES(GUDEV, gudev-1.0, HAVE_GUDEV="yes", HAVE_GUDEV="no")
+ if test "x$HAVE_GUDEV" = "xyes"; then
+ AC_DEFINE(HAVE_GUDEV, 1, [define if GUdev is available])
+ GUDEV_PKG="gudev-1.0"
+ else
+ if test x$enable_gudev = xyes; then
+ AC_MSG_ERROR([GUdev enabled but not found])
+ fi
+ fi
+else
+ HAVE_GUDEV=no
+fi
+AM_CONDITIONAL(HAVE_GUDEV, test x$HAVE_GUDEV = xyes)
+
+dnl ---------------------------------------------------------------------------
dnl - common
dnl ---------------------------------------------------------------------------
@@ -232,25 +252,6 @@ AM_CONDITIONAL(HAVE_PACKAGEKIT, test "x$have_packagekit" = "xtrue")
AC_SUBST(PACKAGEKIT_CFLAGS)
AC_SUBST(PACKAGEKIT_LIBS)
-dnl ---------------------------------------------------------------------------
-dnl - GUdev integration (default enabled)
-dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(gudev, AS_HELP_STRING([--disable-gudev],[Disable GUdev support]), enable_gudev=$enableval)
-if test x$enable_gudev != xno; then
- PKG_CHECK_MODULES(GUDEV, gudev-1.0, HAVE_GUDEV="yes", HAVE_GUDEV="no")
- if test "x$HAVE_GUDEV" = "xyes"; then
- AC_DEFINE(HAVE_GUDEV, 1, [define if GUdev is available])
- else
- if test x$enable_gudev = xyes; then
- AC_MSG_ERROR([GUdev enabled but not found])
- fi
- fi
-else
- HAVE_GUDEV=no
-fi
-AM_CONDITIONAL(HAVE_GUDEV, test x$HAVE_GUDEV = xyes)
-
-
dnl ==============================================
dnl smartcard section
dnl ==============================================
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]