diff options
| author | Karel Zak | 2012-07-27 09:04:55 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-07-27 09:04:55 +0200 |
| commit | 7770e7df15e0a9ba26b8a1e59ed3234bf909cb26 (patch) | |
| tree | 099493f7ddb71fbe3cb8a9eef1747ae5927e2628 | |
| parent | build-sys: add minisg COPYING files (diff) | |
| download | kernel-qcow2-util-linux-7770e7df15e0a9ba26b8a1e59ed3234bf909cb26.tar.gz kernel-qcow2-util-linux-7770e7df15e0a9ba26b8a1e59ed3234bf909cb26.tar.xz kernel-qcow2-util-linux-7770e7df15e0a9ba26b8a1e59ed3234bf909cb26.zip | |
build-sys: fix build without libs
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libblkid/src/Makemodule.am | 21 |
2 files changed, 17 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 6318f5869..e32a1c17f 100644 --- 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 3d469fd9a..af1764c6f 100644 --- 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) |