[Cluster-devel] [PATCH 3/6] mkfs.gfs2: Link to libblkid
Andrew Price
anprice at redhat.com
Tue May 14 10:45:34 UTC 2013
Add the build system bits to check for, and link mkfs.gfs2 to libblkid.
Signed-off-by: Andrew Price <anprice at redhat.com>
---
configure.ac | 1 +
gfs2/mkfs/Makefile.am | 3 +++
2 files changed, 4 insertions(+)
diff --git a/configure.ac b/configure.ac
index 45b38eb..6940d79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,6 +126,7 @@ PKG_CHECK_MODULES([check], [check >= 0.9.8],
AM_CONDITIONAL([BUILD_TESTS], [test "x$have_check" = "xyes"])
PKG_CHECK_MODULES([zlib],[zlib])
+PKG_CHECK_MODULES([blkid],[blkid])
# old versions of ncurses don't ship pkg-config files
PKG_CHECK_MODULES([ncurses],[ncurses],,
diff --git a/gfs2/mkfs/Makefile.am b/gfs2/mkfs/Makefile.am
index 3e72026..6ed89fa 100644
--- a/gfs2/mkfs/Makefile.am
+++ b/gfs2/mkfs/Makefile.am
@@ -20,6 +20,9 @@ mkfs_gfs2_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-I$(top_srcdir)/gfs2/include \
-I$(top_srcdir)/gfs2/libgfs2
+mkfs_gfs2_CFLAGS = $(blkid_CFLAGS)
+mkfs_gfs2_LDFLAGS = $(blkid_LIBS)
+
mkfs_gfs2_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
relative_sbin = $(shell perl -MFile::Spec -le 'print File::Spec->abs2rel("/sbin", "$(sbindir)")')
--
1.8.1.4
More information about the Cluster-devel
mailing list