build-sys: add TINFO_LIBS_STATIC

and use this variable for $READLINE_LIBS_STATIC.

Note the patch also moves READLINE checks after TINFO check.

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

1 files changed, 31 insertions, 24 deletions

diff --git a/configure.ac b/configure.ac
index b278eacc9..9267480f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -654,27 +654,6 @@ AC_SUBST([SELINUX_LIBS])
 AC_SUBST([SELINUX_LIBS_STATIC])
 
 
-AC_ARG_WITH([readline],
-  AS_HELP_STRING([--with-readline], [compile with GNU Readline support]),
-  [], [with_readline=auto]
-)
-
-AS_IF([test "x$with_readline" = xno], [
-  AM_CONDITIONAL([HAVE_READLINE], [false])
-], [
-  UL_CHECK_LIB([readline], [readline])
-  AS_CASE([$with_readline:$have_readline],
-    [yes:no],
-      [AC_MSG_ERROR([readline selected but libreadline not found ])],
-    [*:yes],
-      [READLINE_LIBS="-lreadline"
-       READLINE_LIBS_STATIC="-lreadline -ltinfo"]
-  )
-])
-AC_SUBST([READLINE_LIBS])
-AC_SUBST([READLINE_LIBS_STATIC])
-
-
 AC_ARG_WITH([audit],
   AS_HELP_STRING([--with-audit], [compile with audit support]),
   [], [with_audit=no]
@@ -800,14 +779,21 @@ AS_IF([test "x$have_slang" = xyes -o "x$have_ncurses" = xyes], [
 
 
 dnl Try pkg-config for libtinfo
-PKG_CHECK_MODULES(TINFO, [tinfo], [have_tinfo=yes], [
-    dnl If that failed, fall back to classic searching.
-    AC_CHECK_LIB([tinfo], [tgetent], [
+PKG_CHECK_MODULES(TINFO, [tinfo], [
+  dnl pkg-config success
+  have_tinfo=yes
+  UL_PKG_STATIC([TINFO_LIBS_STATIC], [tinfo])], [
+
+  dnl If pkg-config failed, fall back to classic searching.
+  AC_CHECK_LIB([tinfo], [tgetent], [
        have_tinfo=yes
        TINFO_LIBS="-ltinfo"
+       TINFO_LIBS_STATIC="-tinfo"
        TINFO_CFLAGS=""])
+
 ])
 AC_SUBST([TINFO_LIBS])
+AC_SUBST([TINFO_LIBS_STATIC])
 AC_SUBST([TINFO_CFLAGS])
 AM_CONDITIONAL([HAVE_TINFO], [test "x$have_tinfo" = xyes])
 AS_IF([test "x$have_tinfo" = xyes], [
@@ -815,6 +801,27 @@ AS_IF([test "x$have_tinfo" = xyes], [
 ])
 
 
+AC_ARG_WITH([readline],
+  AS_HELP_STRING([--with-readline], [compile with GNU Readline support]),
+  [], [with_readline=auto]
+)
+
+AS_IF([test "x$with_readline" = xno], [
+  AM_CONDITIONAL([HAVE_READLINE], [false])
+], [
+  UL_CHECK_LIB([readline], [readline])
+  AS_CASE([$with_readline:$have_readline],
+    [yes:no],
+      [AC_MSG_ERROR([readline selected but libreadline not found ])],
+    [*:yes],
+      [READLINE_LIBS="-lreadline"
+       READLINE_LIBS_STATIC="-lreadline $TINFO_LIBS_STATIC"]
+  )
+])
+AC_SUBST([READLINE_LIBS])
+AC_SUBST([READLINE_LIBS_STATIC])
+
+
 AC_ARG_WITH([utempter],
   AS_HELP_STRING([--with-utempter], [compile script(1) with libutempter]),
   [], [with_utempter=no]