diff options
| author | Karel Zak | 2015-01-07 10:59:16 +0100 |
|---|---|---|
| committer | Karel Zak | 2015-01-07 10:59:16 +0100 |
| commit | 2fa60c5ec203040c132b27ee0f92f25b5ad75294 (patch) | |
| tree | 0aa7af1c64c1684e402bcf9be98fa1a109407017 | |
| parent | fsck.minix: fix segmentation fault (diff) | |
| download | kernel-qcow2-util-linux-2fa60c5ec203040c132b27ee0f92f25b5ad75294.tar.gz kernel-qcow2-util-linux-2fa60c5ec203040c132b27ee0f92f25b5ad75294.tar.xz kernel-qcow2-util-linux-2fa60c5ec203040c132b27ee0f92f25b5ad75294.zip | |
build-sys: support nsenter.static
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | sys-utils/Makemodule.am | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 8eaa0ecbc..871a5b7d3 100644 --- a/configure.ac +++ b/configure.ac @@ -438,7 +438,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([extern char *__progname;], AC_MSG_RESULT([no])) dnl Static compilation -m4_define([UL_STATIC_PROGRAMS], [losetup, mount, umount, fdisk, sfdisk, blkid]) +m4_define([UL_STATIC_PROGRAMS], [losetup, mount, umount, fdisk, sfdisk, blkid, nsenter]) AC_ARG_ENABLE([static-programs], [AS_HELP_STRING([--enable-static-programs=LIST], diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am index ef793c116..15d0a9507 100644 --- a/sys-utils/Makemodule.am +++ b/sys-utils/Makemodule.am @@ -357,6 +357,13 @@ usrbin_exec_PROGRAMS += nsenter dist_man_MANS += sys-utils/nsenter.1 nsenter_SOURCES = sys-utils/nsenter.c nsenter_LDADD = $(LDADD) libcommon.la + +if HAVE_STATIC_NSENTER +usrbin_exec_PROGRAMS += nsenter.static +nsenter_static_SOURCES = $(nsenter_SOURCES) +nsenter_static_LDFLAGS = -all-static +nsenter_static_LDADD = $(nsenter_LDADD) +endif endif if BUILD_HWCLOCK |