From 7c950efa3438b02097d915497d67248dde709e72 Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Mon, 11 May 2009 15:06:06 +0200
Subject: build-sys: fix blkid.h include for old e2fsprogs

   When building util-linux-ng-2.15, I get this:
   ../lib/fsprobe.c:10:19: error: blkid.h: No such file or directory

Unfortunately, the blkid.pc uses -I${includedir}/blkidi since
e2fsprogs v1.41.2. The old versions use -I${includedir} only.

Reported-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Karel Zak <kzak@redhat.com>
---
 lib/fsprobe.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib')

diff --git a/lib/fsprobe.c b/lib/fsprobe.c
index cd008cc35..c5fa8c63b 100644
--- a/lib/fsprobe.c
+++ b/lib/fsprobe.c
@@ -7,7 +7,11 @@
 #include <sys/types.h>
 #include <stdlib.h>
 
+#ifdef HAVE_BLKID_BLKID_H
+#include <blkid/blkid.h>
+#else
 #include <blkid.h>
+#endif
 
 #include "blkdev.h"
 #include "canonicalize.h"
-- 
cgit v1.2.3-55-g7522