build-sys: don't use HAVE_LIBBLKID_INTERNAL macro

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

diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 5ddde900128f5073735096ef36a880b789d9aadb..599b9b047c06fd03d7a783d54039cebddac42158 100644 (file)
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -62,7 +62,7 @@
 # include <uuid.h>
 #endif
 
-#ifdef HAVE_LIBBLKID_INTERNAL
+#ifdef HAVE_LIBBLKID
 # include <blkid.h>
 #endif
 
@@ -387,7 +387,7 @@ zap_bootbits(int fd, const char *devname, int force, int is_blkdev)
                        whole = 1;
                        zap = 0;
                } else {
-#ifdef HAVE_LIBBLKID_INTERNAL
+#ifdef HAVE_LIBBLKID
                        blkid_probe pr = blkid_new_probe();
                        if (!pr)
                                errx(EXIT_FAILURE, _("unable to alloc new libblkid probe"));

diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
index f9aa05942e259f384d28d45f966522e7359e89da..fa9353efe47699f11b54e8e9264124d3be0fc794 100644 (file)
--- a/fdisk/cfdisk.c
+++ b/fdisk/cfdisk.c
@@ -89,7 +89,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 
-#ifdef HAVE_LIBBLKID_INTERNAL
+#ifdef HAVE_LIBBLKID
 #include <blkid.h>
 #endif
 
@@ -612,7 +612,7 @@ write_sector(unsigned char *buffer, long long sect_num) {
        fatal(_("Cannot write disk drive"), 2);
 }
 
-#ifdef HAVE_LIBBLKID_INTERNAL
+#ifdef HAVE_LIBBLKID
 static void
 get_fsinfo(int i)
 {
@@ -949,7 +949,7 @@ add_part(int num, int id, int flags, long long first, long long last,
     p_info[i].fstype[0] = 0;
     p_info[i].ostype[0] = 0;
 
-#ifdef HAVE_LIBBLKID_INTERNAL
+#ifdef HAVE_LIBBLKID
     if (want_label)
         get_fsinfo(i);
 #endif

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index b6b81e493f752bcd0aa5ba368db0193ff93c23ad..f0f806143e276790a88e748f60067913d7a28995 100644 (file)
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -44,7 +44,7 @@
 #ifdef HAVE_LINUX_BLKPG_H
 #include <linux/blkpg.h>
 #endif
-#ifdef HAVE_LIBBLKID_INTERNAL
+#ifdef HAVE_LIBBLKID
 #include <blkid.h>
 #endif
 
@@ -957,7 +957,7 @@ create_doslabel(void) {
 static void
 get_topology(int fd) {
        int arg;
-#ifdef HAVE_LIBBLKID_INTERNAL
+#ifdef HAVE_LIBBLKID
        blkid_probe pr;
 
        pr = blkid_new_probe();