gtx: link against libtinfo if termlib is seperated 60/12760/4
authorMichael Laß <lass@mail.uni-paderborn.de>
Thu, 2 Nov 2017 20:16:49 +0000 (21:16 +0100)
committerBenjamin Kaduk <kaduk@mit.edu>
Tue, 7 Nov 2017 01:17:41 +0000 (20:17 -0500)
If ncurses is built with "./configure --with-termlib=tinfo", gtx fails
to link because of an undefined reference to the LINES symbol which is
then provided by libtinfo.so and not libncurses.so.

If ncurses is present, additionally check whether LINES is provided by
ncurses or tinfo and set $LIB_curses accordingly.

This change is based on a patch provided by Bastian Beischer.

FIXES 134420

Change-Id: I3e29c61405d90d0b850bafe4c51125bef433452b
Reviewed-on: https://gerrit.openafs.org/12760
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>

src/cf/curses.m4

index dc01469..261305c 100644 (file)
@@ -16,7 +16,10 @@ AC_DEFUN([OPENAFS_CURSES_LIB],
 [AC_CACHE_VAL([openafs_cv_curses_lib],
    [save_LIBS="$LIBS"
     openafs_cv_curses_lib=
-    AC_CHECK_LIB([ncurses], [initscr], [openafs_cv_curses_lib=-lncurses])
+    AC_CHECK_LIB([ncurses], [initscr],
+                [AC_CHECK_LIB([ncurses], [LINES], [openafs_cv_curses_lib=-lncurses],
+                              [AC_CHECK_LIB([tinfo], [LINES],
+                                            [openafs_cv_curses_lib="-lncurses -ltinfo"])])])
     AS_IF([test "x$openafs_cv_curses_lib" = x],
          [AC_CHECK_LIB([Hcurses], [initscr], [openafs_cv_curses_lib=-lHcurses])])
     AS_IF([test "x$openafs_cv_curses_lib" = x],