diff options
| author | Karel Zak | 2015-03-25 17:55:22 +0100 |
|---|---|---|
| committer | Karel Zak | 2015-03-25 17:55:22 +0100 |
| commit | 15eba21796cc68023901a534764ff44d4dc8f1ef (patch) | |
| tree | 79f96add6a91c9732b89c04401a14a018eadfbdc | |
| parent | tests: more(1) depends on terminal, force to TERM=linux (diff) | |
| download | kernel-qcow2-util-linux-15eba21796cc68023901a534764ff44d4dc8f1ef.tar.gz kernel-qcow2-util-linux-15eba21796cc68023901a534764ff44d4dc8f1ef.tar.xz kernel-qcow2-util-linux-15eba21796cc68023901a534764ff44d4dc8f1ef.zip | |
build-sys: support static build with readline
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | disk-utils/Makemodule.am | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index c0be3b159..f4a015ebc 100644 --- a/configure.ac +++ b/configure.ac @@ -667,10 +667,12 @@ AS_IF([test "x$with_readline" = xno], [ [yes:no], [AC_MSG_ERROR([readline selected but libreadline not found ])], [*:yes], - [READLINE_LIBS=-lreadline] + [READLINE_LIBS="-lreadline" + READLINE_LIBS_STATIC="-lreadline -ltinfo"] ) ]) AC_SUBST([READLINE_LIBS]) +AC_SUBST([READLINE_LIBS_STATIC]) AC_ARG_WITH([audit], diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am index fe428cdf9..338cedc0c 100644 --- a/disk-utils/Makemodule.am +++ b/disk-utils/Makemodule.am @@ -145,7 +145,7 @@ endif if BUILD_LIBUUID fdisk_CFLAGS += -I$(ul_libuuid_incdir) -fdisk_LDADD += libuuid.la +fdisk_LDADD += libuuid.la $(READLINE_LIBS_STATIC) endif if HAVE_STATIC_FDISK @@ -185,7 +185,7 @@ sbin_PROGRAMS += sfdisk.static sfdisk_static_SOURCES = $(sfdisk_SOURCES) sfdisk_static_LDFLAGS = -all-static sfdisk_static_CFLAGS = $(sfdisk_CFLAGS) -sfdisk_static_LDADD = $(sfdisk_LDADD) +sfdisk_static_LDADD = $(sfdisk_LDADD) $(READLINE_LIBS_STATIC) endif endif # BUILD_SFDISK |