ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2011-03-16 17:03:48 +01:00
parent b9eb3c1131
commit 403e2d0c02
3 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure.ac
View File

@ -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],

5
disk-utils/Makefile.am
View File

@ -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 \

7
shlibs/blkid/src/Makefile.am
View File

@ -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