build-sys: fix build without libs

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

diff --git a/configure.ac b/configure.ac
index 6318f5869de5d7d891d7e3a3eed284f4fdb16901..e32a1c17f6ab51b2dee759f4155783a3323e844d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -894,6 +894,7 @@ AC_ARG_ENABLE([eject],
 )
 UL_BUILD_INIT([eject])
 UL_REQUIRES_LINUX([eject])
+UL_REQUIRES_BUILD([eject], [libmount])
 AM_CONDITIONAL(BUILD_EJECT, test "x$build_eject" = xyes)
 
 
@@ -924,6 +925,7 @@ AM_CONDITIONAL(BUILD_HWCLOCK, test "x$build_hwclock" = xyes)
 UL_BUILD_INIT([swapon], [check])
 UL_REQUIRES_LINUX([swapon])
 UL_REQUIRES_BUILD([swapon], [libblkid])
+UL_REQUIRES_BUILD([swapon], [libmount])
 AM_CONDITIONAL(BUILD_SWAPON, test "x$build_swapon" = xyes)
 
 

diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am
index 3d469fd9a1d7e0855f2c24087851fd85869cfec1..af1764c6fd522acb6689487d3be5cd7544bb9dd6 100644 (file)
--- a/libblkid/src/Makemodule.am
+++ b/libblkid/src/Makemodule.am
@@ -107,15 +107,17 @@ endif
 nodist_libblkid_la_SOURCES = libblkid/src/blkid.h
 libblkid_la_LIBADD = libcommon.la
 
-if BUILD_LIBUUID
-libblkid_la_LIBADD += libuuid.la
-endif
 
 libblkid_la_CFLAGS = \
        -I$(ul_libblkid_incdir) \
-       -I$(ul_libuuid_incdir) \
        -I$(top_srcdir)/libblkid/src
 
+if BUILD_LIBUUID
+libblkid_la_LIBADD += libuuid.la
+libblkid_la_CFLAGS += -I$(ul_libuuid_incdir)
+endif
+
+
 libblkid_la_DEPENDENCIES = \
        $(libblkid_la_LIBADD) \
        libblkid/src/blkid.sym \
@@ -143,8 +145,15 @@ noinst_PROGRAMS += \
        test_blkid_verify
 
 blkid_tests_cflags  = -DTEST_PROGRAM $(libblkid_la_CFLAGS)
-blkid_tests_ldflags = libuuid.la -static
-blkid_tests_ldadd   = libblkid.la $(UUID_LIBS)
+blkid_tests_ldflags =
+blkid_tests_ldadd   = libblkid.la
+
+if BUILD_LIBUUID
+blkid_tests_ldflags += libuuid.la
+blkid_tests_ldadd   += $(UUID_LIBS)
+endif
+
+blkid_tests_ldflags += -static
 
 test_blkid_cache_SOURCES = libblkid/src/cache.c
 test_blkid_cache_CFLAGS = $(blkid_tests_cflags)