From: Ruediger Meier Date: Wed, 6 Apr 2016 13:43:07 +0000 (+0200) Subject: build-sys: add --enable-libuuid-force-uuidd X-Git-Tag: v2.28.1~57 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=efeb2a9bfa53fa7fd2181724c9fb99f255fc8420;p=thirdparty%2Futil-linux.git build-sys: add --enable-libuuid-force-uuidd To build libuuid with uuidd support even though the daemon is disabled (--disable-uuidd). Signed-off-by: Ruediger Meier --- diff --git a/configure.ac b/configure.ac index 31a1911f65..48e994b10a 100644 --- a/configure.ac +++ b/configure.ac @@ -910,6 +910,11 @@ AC_SUBST([LIBUUID_VERSION]) AC_SUBST([LIBUUID_VERSION_INFO]) AM_CONDITIONAL(BUILD_LIBUUID, test "x$build_libuuid" = xyes) +AC_ARG_ENABLE([libuuid-force-uuidd], + AS_HELP_STRING([--enable-libuuid-force-uuidd], [support uuidd even though the daemon is not built]), + [], [enable_libuuid_force_uuidd=no] +) + AS_IF([test "x$build_libuuid" = xyes], [ AC_DEFINE(HAVE_LIBUUID, 1, [Define to 1 if you have the -luuid.]) ]) @@ -1084,7 +1089,7 @@ 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], [ +AS_IF([test "x$build_uuidd" = xyes || test "x$enable_libuuid_force_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])