build-sys: cleanup lib{mount,blkid} building

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

diff --git a/configure.ac b/configure.ac
index 71330dae71de0abd2cd5d8c547d63250d3dfce48..768645696b4770c929c5511756f076db2d8a09d7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -405,6 +405,12 @@ AC_ARG_ENABLE([libmount],
   AS_HELP_STRING([--disable-libmount], [do not build libmount]),
   [], enable_libmount=yes
 )
+
+case "$enable_libblkid:$enable_libmount" in
+no:yes)
+  AC_MSG_ERROR([cannot enable libmount when libblkid is disabled]) ;;
+esac
+
 AC_SUBST([LIBMOUNT_VERSION])
 AC_SUBST([LIBMOUNT_VERSION_INFO])
 AC_DEFINE_UNQUOTED(LIBMOUNT_VERSION, "$LIBMOUNT_VERSION", [libmount version string])

diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am
index d6e036dd05d55a92a26367cedd07c8e7ed153157..6a16f9994ef3dbccb22d42245c7e8e4eb6bd574e 100644 (file)
--- a/misc-utils/Makefile.am
+++ b/misc-utils/Makefile.am
@@ -35,8 +35,7 @@ endif
 
 if BUILD_LIBBLKID
 sbin_PROGRAMS += blkid findfs wipefs
-bin_PROGRAMS += findmnt
-dist_man_MANS += blkid.8 findfs.8 wipefs.8 findmnt.8
+dist_man_MANS += blkid.8 findfs.8 wipefs.8
 blkid_SOURCES = blkid.c $(top_srcdir)/lib/ismounted.c \
                $(top_srcdir)/lib/strtosize.c
 blkid_LDADD = $(ul_libblkid_la)
@@ -46,9 +45,6 @@ findfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
 wipefs_SOURCES = wipefs.c $(top_srcdir)/lib/strtosize.c
 wipefs_LDADD = $(ul_libblkid_la)
 wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
-findmnt_LDADD = $(ul_libmount_la)
-findmnt_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
-findmnt_SOURCES = findmnt.c $(top_srcdir)/lib/tt.c
 if HAVE_STATIC_BLKID
 sbin_PROGRAMS += blkid.static
 blkid_static_SOURCES = $(blkid_SOURCES)
@@ -58,6 +54,14 @@ blkid_static_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
 endif
 endif
 
+if BUILD_LIBMOUNT
+bin_PROGRAMS += findmnt
+dist_man_MANS += findmnt.8
+findmnt_LDADD = $(ul_libmount_la)
+findmnt_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
+findmnt_SOURCES = findmnt.c $(top_srcdir)/lib/tt.c
+endif
+
 cal_SOURCES = cal.c $(top_srcdir)/lib/mbsalign.c
 if HAVE_TINFO
 cal_LDADD = -ltinfo @NCURSES_LIBS@

diff --git a/shlibs/blkid/libblkid.3 b/shlibs/blkid/libblkid.3
index 46eb868bc1c6760a12990e245ad004021230e007..ab4c5736e15629045f7b88d3aea10e7524446834 100644 (file)
--- a/shlibs/blkid/libblkid.3
+++ b/shlibs/blkid/libblkid.3
@@ -9,7 +9,7 @@
 .SH NAME
 libblkid \- block device identification library
 .SH SYNOPSIS
-.B #include <blkid/blkid.h>
+.B #include <blkid.h>
 .sp
 .B cc
 .I file.c

diff --git a/shlibs/mount/src/fs.c b/shlibs/mount/src/fs.c
index 851c5f9b5d57c8689ea1fca17cacf954373b7af2..63da2f206fb156da819677201a7fdaf9afc774ff 100644 (file)
--- a/shlibs/mount/src/fs.c
+++ b/shlibs/mount/src/fs.c
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
-#include <blkid/blkid.h>
+#include <blkid.h>
 
 #include "nls.h"
 #include "mountP.h"

diff --git a/shlibs/mount/src/tab.c b/shlibs/mount/src/tab.c
index 12de850189af120e3642540445b1f60e1f0fdd4e..3c23748b952cecfb50d5bf088eb4294dd756994e 100644 (file)
--- a/shlibs/mount/src/tab.c
+++ b/shlibs/mount/src/tab.c
@@ -51,7 +51,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <blkid/blkid.h>
+#include <blkid.h>
 
 #include "nls.h"
 #include "mountP.h"