From e3d10158e612ed63be7850b75054638b93f69258 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 19 Sep 2014 00:26:26 -0400 Subject: [PATCH] configure: disable uuidd by default if libuuid is disabled Signed-off-by: Theodore Ts'o --- configure | 11 +++++++++-- configure.in | 10 ++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 5de6ea2..fb9c81f 100755 --- a/configure +++ b/configure @@ -5977,9 +5977,16 @@ fi else $as_echo "#define USE_UUIDD 1" >>confdefs.h -UUIDD_CMT="" -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Building uuidd by default" >&5 +if test -z "$UUID_CMT" +then + UUIDD_CMT="" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building uuidd by default" >&5 $as_echo "Building uuidd by default" >&6; } +else + UUIDD_CMT="#" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling uuidd by default" >&5 +$as_echo "Disabling uuidd by default" >&6; } +fi fi diff --git a/configure.in b/configure.in index 80f49df..c7709a0 100644 --- a/configure.in +++ b/configure.in @@ -785,8 +785,14 @@ else fi] , AC_DEFINE(USE_UUIDD, 1) -UUIDD_CMT="" -AC_MSG_RESULT([Building uuidd by default]) +if test -z "$UUID_CMT" +then + UUIDD_CMT="" + AC_MSG_RESULT([Building uuidd by default]) +else + UUIDD_CMT="#" + AC_MSG_RESULT([Disabling uuidd by default]) +fi ) AC_SUBST(UUIDD_CMT) dnl -- 1.8.3.1