Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=227a11136a3... Commit: 227a11136a36ec3c758275a247e9cc1fb401ce44 Parent: 1cebece3e922bfffa52f58ac6594700764868771 Author: Andrew Price anprice@redhat.com AuthorDate: Wed Mar 6 16:38:18 2013 +0000 Committer: Andrew Price anprice@redhat.com CommitterDate: Tue May 14 14:05:12 2013 +0100
mkfs.gfs2: Link to libblkid
Add the build system bits to check for, and link mkfs.gfs2 to libblkid.
Signed-off-by: Andrew Price anprice@redhat.com --- configure.ac | 1 + gfs2/mkfs/Makefile.am | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-)
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)")')
cluster-commits@lists.fedorahosted.org