summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorKarel Zak2009-10-27 12:11:37 +0100
committerKarel Zak2009-10-27 12:11:37 +0100
commit1a70e0cba214868345d8fc3ee27cca2e1f972f14 (patch)
tree4faca3025e6ad47194f51be04b4e5679dbd31e5b /lib
parentlibblkid: add BLKID_{VERSION,DATE} to blkid.h (diff)
downloadkernel-qcow2-util-linux-1a70e0cba214868345d8fc3ee27cca2e1f972f14.tar.gz
kernel-qcow2-util-linux-1a70e0cba214868345d8fc3ee27cca2e1f972f14.tar.xz
kernel-qcow2-util-linux-1a70e0cba214868345d8fc3ee27cca2e1f972f14.zip
build-sys: add HAVE_LIBBLKID_INTERNAL
It's better to use one macro for all situations where we depends on in-tree (internal) libblkid. Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/fsprobe.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/fsprobe.c b/lib/fsprobe.c
index 0341dab75..77211806d 100644
--- a/lib/fsprobe.c
+++ b/lib/fsprobe.c
@@ -20,7 +20,7 @@
static blkid_cache blcache;
-#ifdef HAVE_BLKID_EVALUATE_TAG
+#ifdef HAVE_LIBBLKID_INTERNAL
/* ask kernel developers why we need such ugly open() method... */
static int
open_device(const char *devname)
@@ -97,7 +97,7 @@ fsprobe_known_fstype(const char *fstype)
return blkid_known_fstype(fstype);
}
-#ifdef HAVE_BLKID_EVALUATE_TAG
+#ifdef HAVE_LIBBLKID_INTERNAL
/*
* libblkid from util-linux-ng
* -- recommended
@@ -178,7 +178,7 @@ fsprobe_get_devname_by_label(const char *label)
return blkid_evaluate_tag("LABEL", label, &blcache);
}
-#else /* !HAVE_BLKID_EVALUATE_TAG */
+#else /* !HAVE_LIBBLKID_INTERNAL */
/*
* Classic libblkid (from e2fsprogs) without blkid_evaluate_tag()
@@ -249,4 +249,4 @@ fsprobe_get_uuid_by_devname(const char *devname)
return blkid_get_tag_value(blcache, "UUID", devname);
}
-#endif /* !HAVE_BLKID_EVALUATE_TAG */
+#endif /* !HAVE_LIBBLKID_INTERNAL */