summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorKarel Zak <kzak@redhat.com>2009-05-11 15:06:06 +0200
committerKarel Zak <kzak@redhat.com>2009-05-11 15:06:06 +0200
commit7c950efa3438b02097d915497d67248dde709e72 (patch)
treec87b36f6b3a31bc939621023913cae45f74b7399 /lib
parent2ef7d41e6bbb7c842c06e911ffc562335a467b5d (diff)
downloadutil-linux-old-7c950efa3438b02097d915497d67248dde709e72.tar.gz
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>
Diffstat (limited to 'lib')
-rw-r--r--lib/fsprobe.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/fsprobe.c b/lib/fsprobe.c
index cd008cc3..c5fa8c63 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"