blkid: blkid.static make target

For compatibility with e2fsprogs tree:

	commit eb630fd8708ae433e55e384079c08e0f0f040d22
	Author: Eric Sandeen <sandeen@redhat.com>
	Date:   Tue Feb 24 23:15:33 2009 -0600

	e2fsprogs: blkid.static make target

	Nice for testing w/o needing to swizzle around system
	libraries...

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

diff --git a/configure.ac b/configure.ac
index ac7d238cc7d0c4b12d5b6e5657abce4232ffae5b..3fdf1ea6b53150ecc11e3c5a3c15d13641cd8bff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -119,7 +119,7 @@ AC_CHECK_FUNCS(
 AC_FUNC_FSEEKO
 
 dnl Static compilation
-m4_define([UTIL_STATIC_PROGRAMS], [losetup, mount, umount, fdisk, sfdisk])
+m4_define([UTIL_STATIC_PROGRAMS], [losetup, mount, umount, fdisk, sfdisk, blkid])
 
 AC_ARG_ENABLE([static-programs],
   [AS_HELP_STRING([--enable-static-programs=LIST],

diff --git a/libs/blkid/bin/Makefile.am b/libs/blkid/bin/Makefile.am
index 97ba9912b2c3c61de733f6f16c832b173dbbd8fa..ff992ace6b0175a38aaa7b113a7a7da4fec044a8 100644 (file)
--- a/libs/blkid/bin/Makefile.am
+++ b/libs/blkid/bin/Makefile.am
@@ -5,3 +5,11 @@ AM_LDFLAGS += $(ul_libblkid_la)
 
 sbin_PROGRAMS = blkid findfs
 dist_man_MANS = blkid.8 findfs.8
+
+if HAVE_STATIC_BLKID
+sbin_PROGRAMS += blkid.static
+blkid_static_SOURCES = $(blkid_SOURCES)
+blkid_static_LDFLAGS = "-all-static"           # libtool option
+blkid_static_LDADD = $(ul_libblkid_la)
+blkid_static_CFLAGS = -I$(ul_libblkid_srcdir)
+endif