From 639231be45fec3f405b8c51f35072207a44df8fb Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Mon, 29 Jan 2001 01:40:10 +0000 Subject: [PATCH] we lost the check for uuid.h at some point, add back in cos its important --- configure.in | 16 ++++++++++++---- include/builddefs.in | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/configure.in b/configure.in index 1a13b105e..48391d1da 100644 --- a/configure.in +++ b/configure.in @@ -102,13 +102,21 @@ test -z "$ECHO" && AC_PATH_PROG(ECHO, echo, /bin/echo) echo=$ECHO AC_SUBST(echo) -dnl Checks for libraries. -AC_CHECK_LIB(uuid, uuid_generate,,[ +dnl Checks for UUID header and library. +AC_CHECK_HEADER(uuid/uuid.h,, [ echo - echo "FATAL ERROR: could not find a valid UUID library." - echo "Install either the e2fsprogs-devel (rpm) or the uuid-dev (deb) package." + echo 'FATAL ERROR: could not find a valid UUID header.' + echo 'Install either the e2fsprogs-devel (rpm) or the uuid-dev (deb) package.' exit 1 ]) +AC_CHECK_LIB(uuid, uuid_generate,, [ + echo + echo 'FATAL ERROR: could not find a valid UUID library.' + echo 'Install either the e2fsprogs-devel (rpm) or the uuid-dev (deb) package.' + exit 1 +]) +libuuid="/usr/lib/libuuid.a" +AC_SUBST(libuuid) dnl Checks for LVM library AC_MSG_CHECKING([for liblvm.a]) diff --git a/include/builddefs.in b/include/builddefs.in index c84c38301..cba3bbab0 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -39,7 +39,7 @@ DEBUG = @debug_build@ OPTIMIZER = @opt_build@ MALLOCLIB = @malloc_lib@ -LIBUUID = /usr/lib/libuuid.a +LIBUUID = @libuuid@ LIBXFS = -lxfs LIBHANDLE = -lhandle -- 2.47.2