libuuid: add --disable-libuuid and LIBUUID_VERSION

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/configure.ac b/configure.ac
index 6c8d1408751e1525aa5c64838378523a2122790a..70b89c4a8dd69b3f5cbeda73811df6cc7c324115 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,9 @@ dnl libblkid version
 LIBBLKID_VERSION="$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_RELEASE"
 LIBBLKID_DATE="10-Feb-2009"
 
+dnl libuuid version
+LIBUUID_VERSION="$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_RELEASE"
+
 # Check whether exec_prefix=/usr:
 case $exec_prefix:$prefix in
 NONE:NONE | NONE:/usr | /usr:*)
@@ -242,7 +245,7 @@ AC_ARG_ENABLE([mount],
   [], enable_mount=check
 )
 build_mount=yes
-if test "${enable_mount}" = "no"; then
+if test "x$enable_mount" = xno; then
   build_mount=no
 elif test "x$linux_os" = xyes; then
   if test "x$have_blkid" = xno && test "x$have_volume_id" = xno; then
@@ -255,6 +258,14 @@ fi
 AM_CONDITIONAL(BUILD_MOUNT, test "x$build_mount" = xyes)
 
 
+AC_ARG_ENABLE([libuuid],
+  AS_HELP_STRING([--disable-libuuid], [do not build libuuid and uuid utilities]),
+  [], enable_libuuid=yes
+)
+AC_SUBST(LIBUUID_VERSION)
+AM_CONDITIONAL(BUILD_LIBUUID, test "x$enable_libuuid" = xyes)
+
+
 AC_ARG_ENABLE([fsck],
   AS_HELP_STRING([--enable-fsck], [do build fsck]),
   [], enable_fsck=no

diff --git a/shlibs/Makefile.am b/shlibs/Makefile.am
index 8a848cb7b658399af1cefd12c42e9f7d2264061e..3e757885bb1a09e976685e08545b16103bf586c8 100644 (file)
--- a/shlibs/Makefile.am
+++ b/shlibs/Makefile.am
@@ -1,7 +1,9 @@
 SUBDIRS =
 
+if BUILD_LIBUUID
+SUBDIRS += uuid
+endif
+
 if BUILD_LIBBLKID
 SUBDIRS += blkid
 endif
-
-SUBDIRS += uuid

diff --git a/shlibs/uuid/uuid.pc.in b/shlibs/uuid/uuid.pc.in
index 8e4e6c5ff32ac9544c8d32eca3fb8d2c05e3a91e..52edee2f639c7cc5b968ae1e7251a444fe171b88 100644 (file)
--- a/shlibs/uuid/uuid.pc.in
+++ b/shlibs/uuid/uuid.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: uuid
 Description: Universally unique id library
-Version: @E2FSPROGS_VERSION@
+Version: @LIBUUID_VERSION@
 Requires:
 Cflags: -I${includedir}/uuid
 Libs: -L${libdir} -luuid