]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
gtx: link against libtinfo if termlib is seperated
authorMichael Laß <lass@mail.uni-paderborn.de>
Thu, 2 Nov 2017 20:16:49 +0000 (21:16 +0100)
committerBenjamin Kaduk <kaduk@mit.edu>
Thu, 23 Nov 2017 18:07:15 +0000 (13:07 -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

Reviewed-on: https://gerrit.openafs.org/12760
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
(cherry picked from commit 311f1d28a2f626350b33ad432e674055b62511bd)

Change-Id: I2f69fe51bbefeeb2a17145a88aa9c891644f2f61
Reviewed-on: https://gerrit.openafs.org/12763
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Michael Laß <lass@mail.uni-paderborn.de>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
src/cf/curses.m4

index dc01469f5efe53e3fab4bfa252af40f6ab16f9e1..261305ce187ddf5497835c2c71f474d8a6a32b06 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],