diff options
author | Karel Zak | 2011-03-16 17:31:50 +0100 |
---|---|---|
committer | Karel Zak | 2011-03-16 17:31:50 +0100 |
commit | b1ef3ad66b7f52c37d5be2a4471e8f37b2a2b30b (patch) | |
tree | 8f1ff89afbf00f81ec64fc227daaa59f7a1cadb3 | |
parent | build-sys: include <uuid.h> rather than <uuid/uuid.h> (diff) | |
download | kernel-qcow2-util-linux-b1ef3ad66b7f52c37d5be2a4471e8f37b2a2b30b.tar.gz kernel-qcow2-util-linux-b1ef3ad66b7f52c37d5be2a4471e8f37b2a2b30b.tar.xz kernel-qcow2-util-linux-b1ef3ad66b7f52c37d5be2a4471e8f37b2a2b30b.zip |
build-sys: don't support external (e2fsprogs) libblkid
Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 32 | ||||
-rw-r--r-- | disk-utils/Makefile.am | 8 | ||||
-rw-r--r-- | fdisk/Makefile.am | 1 | ||||
-rw-r--r-- | fsck/Makefile.am | 5 | ||||
-rw-r--r-- | mount/Makefile.am | 4 |
6 files changed, 3 insertions, 49 deletions
diff --git a/Makefile.am b/Makefile.am index 906322557..38207b7d5 100644 --- 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 e12f1debb..83cbc7084 100644 --- 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 16d182a54..5df806476 100644 --- 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 51d0eb390..7cad805d1 100644 --- 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 22566d19f..ebb5b672c 100644 --- 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 9613d283d..b82464fe3 100644 --- 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 |