build-sys: don't support external (e2fsprogs) libblkid

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

diff --git a/Makefile.am b/Makefile.am
index 906322557c8da9940a0766a1706f880853faaadf..38207b7d50e28a450b3184ade5c66bd6bc2ec880 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,10 +54,8 @@ SUBDIRS += mount
 endif
 
 if BUILD_FSCK
-if BUILD_LIBBLKID
 SUBDIRS += fsck
 endif
-endif
 
 ACLOCAL_AMFLAGS = -I m4
 

diff --git a/configure.ac b/configure.ac
index e12f1debbd31214feff25ebb658c5820a0f56e92..83cbc70846ef5b67bc67628a546e2c730d99b857 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -409,33 +409,8 @@ AC_SUBST([LIBBLKID_VERSION_INFO])
 AM_CONDITIONAL(BUILD_LIBBLKID, test "x$enable_libblkid" = xyes)
 AC_DEFINE_UNQUOTED(LIBBLKID_VERSION, "$LIBBLKID_VERSION", [libblkid version string])
 AC_DEFINE_UNQUOTED(LIBBLKID_DATE, "$LIBBLKID_DATE", [libblkid date string])
-have_blkid=yes
-
-if test "x$enable_libblkid" = xno; then
-  if test "x$build_mount" = xyes || test "x$enable_fsck" = xyes; then
-    # Check for external (e2fsprogs) libblkid
-    PKG_CHECK_MODULES(BLKID, blkid, [have_blkid=yes], [have_blkid=no])
-    if test "x$have_blkid" = xno; then
-      # system without pkg-config or so, try classic check
-      AC_CHECK_LIB(blkid, blkid_get_cache, [have_blkid=yes], [have_blkid=no])
-    fi
-    if test "x$have_blkid" = xyes; then
-      UTIL_SET_FLAGS($BLKID_CFLAGS, $BLKID_CFLAGS, $BLKID_LIBS)
-      AC_CHECK_HEADERS([blkid.h blkid/blkid.h], [break], [])
-      UTIL_RESTORE_FLAGS
-    fi
-    if test -n "$enable_static_programs"; then
-      # TODO check only when mount of fsck are requested
-      UTIL_PKG_STATIC([BLKID_LIBS_STATIC], [blkid])
-    fi
-  fi
-else
-  # internal library
-  AC_DEFINE(HAVE_BLKID_H, 1, [Define to 1 if you have the <blkid.h> header file.])
-  AC_DEFINE(HAVE_LIBBLKID_INTERNAL, 1, [Define to 1 if you have the in-tree libblkid.])
-fi
 
-if test "x$have_blkid" = xyes; then
+if test "x$enable_libblkid" = xyes; then
   AC_DEFINE(HAVE_LIBBLKID, 1, [Define to 1 if you have the -lblkid.])
 else
   if test "x$build_mount" = xyes; then
@@ -445,11 +420,6 @@ else
     AC_MSG_ERROR([libblkid is needed to build util-linux fsck])
   fi
 fi
-AM_CONDITIONAL(HAVE_BLKID, test "x$have_blkid" = xyes)
-# default
-: ${BLKID_LIBS='-lblkid -luuid'}
-
-AC_ARG_VAR([BLKID_LIBS_STATIC], [-l options for linking statically with blkid])
 
 
 AC_ARG_ENABLE([libmount],

diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index 16d182a540a45988b10eb66376226ae83a307878..5df806476b65a1eec6f50b1d9b7d88c87682f322 100644 (file)
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@ -42,6 +42,8 @@ sbin_PROGRAMS += swaplabel
 dist_man_MANS += swaplabel.8
 swaplabel_LDADD += $(ul_libblkid_la)
 swaplabel_CFLAGS += -I$(ul_libblkid_incdir)
+mkswap_LDADD += $(ul_libblkid_la)
+mkswap_CFLAGS += -I$(ul_libblkid_incdir)
 endif
 
 if BUILD_ELVTUNE
@@ -66,12 +68,6 @@ fsck_cramfs_LDADD = -lz
 mkfs_cramfs_LDADD = -lz
 endif
 
-if BUILD_LIBBLKID
-# only in-tree libblkid has partitions parsing support
-mkswap_LDADD += $(ul_libblkid_la)
-mkswap_CFLAGS += -I$(ul_libblkid_incdir)
-endif
-
 if HAVE_SELINUX
 mkswap_LDADD += -lselinux
 endif

diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am
index 51d0eb39064d16aa58cccbb235b1cd43f3fa48a7..7cad805d1a000a749195677967bcc25c6ed40e8c 100644 (file)
--- a/fdisk/Makefile.am
+++ b/fdisk/Makefile.am
@@ -24,7 +24,6 @@ cflags_blkid = $(AM_CFLAGS)
 ldadd_blkid =
 
 if BUILD_LIBBLKID
-# only in-tree libblkid has topology support
 ldadd_blkid += $(ul_libblkid_la)
 cflags_blkid += -I$(ul_libblkid_incdir)
 endif

diff --git a/fsck/Makefile.am b/fsck/Makefile.am
index 22566d19f602e255b5e471a66dc0e9ccfbd11399..ebb5b672cc01d149b8c8899dd7c0d4b00ac6365d 100644 (file)
--- a/fsck/Makefile.am
+++ b/fsck/Makefile.am
@@ -8,10 +8,5 @@ fsck_SOURCES = fsck.c fsck.h $(top_srcdir)/lib/ismounted.c \
 fsck_LDADD =
 fsck_CFLAGS = $(AM_CFLAGS)
 
-if BUILD_LIBBLKID
 fsck_LDADD += $(ul_libblkid_la)
 fsck_CFLAGS += -I$(ul_libblkid_incdir)
-else
-fsck_LDADD += $(BLKID_LIBS)
-fsck_CFLAGS += $(BLKID_CFLAGS)
-endif

diff --git a/mount/Makefile.am b/mount/Makefile.am
index 9613d283d6ec5a4ca124353ca265235cde9d6fa3..b82464fe37ce25b889494d0117461bbdb9956828 100644 (file)
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@ -77,10 +77,6 @@ if BUILD_LIBBLKID
 ldadd_common += $(ul_libblkid_la)
 ldadd_static += $(ul_libblkid_la)
 cflags_common += -I$(ul_libblkid_incdir)
-else
-ldadd_common += $(BLKID_LIBS)
-ldadd_static += $(BLKID_LIBS_STATIC)
-cflags_common += $(BLKID_CFLAGS)
 endif
 
 if HAVE_SELINUX