From: Karel Zak <kzak@redhat.com>
Date: Wed, 25 Mar 2015 16:55:22 +0000 (+0100)
Subject: build-sys: support static build with readline
X-Git-Tag: v2.27-rc1~313
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15eba21796cc68023901a534764ff44d4dc8f1ef;p=thirdparty%2Futil-linux.git

build-sys: support static build with readline

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

diff --git a/configure.ac b/configure.ac
index c0be3b159f..f4a015ebcc 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 fe428cdf9f..338cedc0ce 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