diff options
| author | Karel Zak | 2009-05-18 16:01:27 +0200 |
|---|---|---|
| committer | Karel Zak | 2009-05-22 10:06:15 +0200 |
| commit | 17afb0320c77e47a44dc838d3724f89aff06c703 (patch) | |
| tree | 5b40e2198db80a0cb6d9f8a34e1f49b4a42e5fb7 /disk-utils | |
| parent | build-sys: fix headers in mkswap and libblkid (diff) | |
| download | kernel-qcow2-util-linux-17afb0320c77e47a44dc838d3724f89aff06c703.tar.gz kernel-qcow2-util-linux-17afb0320c77e47a44dc838d3724f89aff06c703.tar.xz kernel-qcow2-util-linux-17afb0320c77e47a44dc838d3724f89aff06c703.zip | |
build-sys: cleanup libuuid stuff
Supported scenarios:
* internal libuuid (--enable-libuuid, default)
* external libuuid (--disable-libuuid)
- systems without pkg-config
- systems with pkg-config
* systems without libuuid at all (the library is optional for u-l-ng)
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'disk-utils')
| -rw-r--r-- | disk-utils/Makefile.am | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am index 4854d5f61..60481ab7b 100644 --- a/disk-utils/Makefile.am +++ b/disk-utils/Makefile.am @@ -12,7 +12,10 @@ sbin_PROGRAMS = mkfs mkswap fsck.minix mkfs.minix mkfs.bfs fsck_minix_SOURCES = fsck.minix.c minix.h mkfs_minix_SOURCES = mkfs.minix.c minix.h $(utils_common) mkfs_bfs_SOURCES = mkfs.bfs.c $(utils_common) + mkswap_SOURCES = mkswap.c $(utils_common) ../lib/wholedisk.c ../lib/pttype.c +mkswap_LDADD = +mkswap_CFLAGS = usrbinexec_PROGRAMS = isosize usrsbinexec_PROGRAMS = @@ -46,10 +49,14 @@ fsck_cramfs_LDADD = -lz mkfs_cramfs_LDADD = -lz endif -mkswap_LDADD = - if HAVE_UUID -mkswap_LDADD += -luuid +if BUILD_LIBUUID +mkswap_LDADD += $(ul_libuuid_la) +mkswap_CFLAGS += -I$(ul_libuuid_srcdir) +else +mkswap_LDADD += $(UUID_LIBS) +mkswap_CFLAGS += $(UUID_CFLAGS) +endif endif if HAVE_SELINUX |