From: Ruediger Meier <ruediger.meier@xxxxxxxxxxx>
configure --disable-uuidd disabled both the build of uuidd and also
disabled uuidd support of libuuid.
Now we build libuuid always with uuidd support. We could add another
configure switch --without-uuidd to have the old behavior but IMO
there is no need for that.
Signed-off-by: Ruediger Meier <ruediger.meier@xxxxxxxxxxx>
---
configure.ac | 3 ---
libuuid/src/gen_uuid.c | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7efe5e5..82eb8db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1083,9 +1083,6 @@ UL_BUILD_INIT([uuidd])
UL_REQUIRES_BUILD([uuidd], [libuuid])
UL_REQUIRES_HAVE([uuidd], [timer], [timer_create function])
UL_REQUIRES_HAVE([uuidd], [sys_signalfd_h], [sys/signalfd.h header])
-AS_IF([test "x$build_uuidd" = xyes], [
- AC_DEFINE([HAVE_UUIDD], [1], [Define to 1 if you want to use uuid daemon.])
-])
AM_CONDITIONAL([BUILD_UUIDD], [test "x$build_uuidd" = xyes])
diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c
index f9a937c..4fb9430 100644
--- a/libuuid/src/gen_uuid.c
+++ b/libuuid/src/gen_uuid.c
@@ -329,7 +329,7 @@ try_again:
return ret;
}
-#if defined(HAVE_UUIDD) && defined(HAVE_SYS_UN_H)
+#ifdef HAVE_SYS_UN_H
/*
* Try using the uuidd daemon to generate the UUID
@@ -392,7 +392,7 @@ fail:
return -1;
}
-#else /* !defined(HAVE_UUIDD) && defined(HAVE_SYS_UN_H) */
+#else /* HAVE_SYS_UN_H */
static int get_uuid_via_daemon(int op, uuid_t out, int *num)
{
return -1;
--
1.8.4.5
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
