From: Karel Zak <kzak@redhat.com>
Date: Wed, 16 Mar 2011 16:03:48 +0000 (+0100)
Subject: build-sys: don't support external (e2fsprogs) libuuid
X-Git-Tag: v2.20-rc1~440
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=403e2d0c026d689baabcc4781d94ca09c2b87683;p=thirdparty%2Futil-linux.git

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

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

diff --git a/configure.ac b/configure.ac
index 20d60befa2..e12f1debbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -374,33 +374,12 @@ AC_ARG_ENABLE([libuuid],
 AC_SUBST([LIBUUID_VERSION])
 AC_SUBST([LIBUUID_VERSION_INFO])
 AM_CONDITIONAL(BUILD_LIBUUID, test "x$enable_libuuid" = xyes)
-have_uuid=yes
-
-if test "x$enable_libuuid" = xno; then
-  # Check for external (e2fsprogs) libuuid
-  PKG_CHECK_MODULES(UUID, uuid, [have_uuid=yes], [have_uuid=no])
-  if test "x$have_uuid" = xno; then
-    # system without pkg-config or so, try classic check
-    AC_CHECK_LIB(uuid, uuid_is_null, [have_uuid=yes], [have_uuid=no])
-  fi
-  if test "x$have_uuid" = xyes; then
-    UTIL_SET_FLAGS($UUID_CFLAGS, $UUID_CFLAGS, $UUID_LIBS)
-    AC_CHECK_HEADERS([uuid.h uuid/uuid.h], [break], [])
-    UTIL_RESTORE_FLAGS
-  fi
-else
-  # internal library
-  AC_DEFINE(HAVE_UUID_H, 1, [Define to 1 if you have the <uuid.h> header file.])
-fi
 
-if test "x$have_uuid" = xyes; then
+if test "x$enable_libuuid" = xyes; then
   AC_DEFINE(HAVE_LIBUUID, 1, [Define to 1 if you have the -luuid.])
 else
   AC_MSG_WARN([uuid library is not found; mkswap(8) will not generate UUIDs])
 fi
-AM_CONDITIONAL(HAVE_UUID, test "x$have_uuid" = xyes)
-# default
-: ${UUID_LIBS='-luuid'}
 
 
 AC_ARG_ENABLE([uuidd],
diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index e95eddb95c..16d182a540 100644
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@ -5,14 +5,9 @@ if LINUX
 utils_common += $(top_srcdir)/lib/linux_version.c
 endif
 
-if HAVE_UUID
 if BUILD_LIBUUID
 uuid_cflags = -I$(ul_libuuid_srcdir)
 uuid_ldadd = $(ul_libuuid_la)
-else
-uuid_cflags = $(UUID_CFLAGS)
-uuid_ldadd = $(UUID_LIBS)
-endif
 endif
 
 dist_man_MANS = isosize.8 mkfs.8 mkswap.8 \
diff --git a/shlibs/blkid/src/Makefile.am b/shlibs/blkid/src/Makefile.am
index 73f0030fc0..f385156aa9 100644
--- a/shlibs/blkid/src/Makefile.am
+++ b/shlibs/blkid/src/Makefile.am
@@ -5,14 +5,9 @@ SUBDIRS = superblocks topology partitions .
 common_ldadd =
 common_cflags =
 
-if HAVE_UUID
 if BUILD_LIBUUID
 common_ldadd += $(ul_libuuid_la)
 common_cflags += -I$(ul_libuuid_srcdir)
-else
-common_ldadd += $(UUID_LIBS)
-common_cflags += $(UUID_CFLAGS)
-endif
 endif
 
 AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir) $(common_cflags)
@@ -56,7 +51,7 @@ CLEANFILES = $(tests)
 
 tests: all $(tests)
 test_%: %.c
-	$(AM_V_CC)$(COMPILE) -DTEST_PROGRAM $< .libs/libblkid.a -o $@ $(UUID_LIBS)
+	$(AM_V_CC)$(COMPILE) -DTEST_PROGRAM $< .libs/libblkid.a -o $@ -luuid
 
 
 # move lib from $(usrlib_execdir) to $(libdir) if needed