This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch main
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=8a60f64945e2d88149b1c112caeb0b60e62955d8

The following commit(s) were added to refs/heads/main by this push:
     new 8a60f6494 build: Only link against libtinfo if needed
8a60f6494 is described below

commit 8a60f64945e2d88149b1c112caeb0b60e62955d8 (HEAD -> main)
Author: Guillem Jover <[email protected]>
AuthorDate: Sat Nov 4 03:47:51 2023 +0100

    build: Only link against libtinfo if needed
    
    If the check determines the symbol we look for is already available,
    then we should not link against the libtinfo library unconditionally.
    Instead move the assignment outside the AC_SEARCH_LIBS, and check
    for whether the function is not available at all or is builtin, and
    only if these do not apply link against the library autoconf has
    determined to use.
    
    Fixes: commit c03aeaa372a1507ec6835c8613388f84c56228d1
    Changelog: silent
---
 m4/dpkg-libs.m4 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/m4/dpkg-libs.m4 b/m4/dpkg-libs.m4
index bb154d77d..21b9c0b1d 100644
--- a/m4/dpkg-libs.m4
+++ b/m4/dpkg-libs.m4
@@ -196,10 +196,12 @@ AC_DEFUN([DPKG_LIB_CURSES], [
   dnl symbols, otherwise explicitly link against it.
   dpkg_save_curses_LIBS=$LIBS
   LIBS="$CURSES_LIBS"
-  AC_SEARCH_LIBS([tigetstr], [tinfo], [
-    CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-ltinfo"
-  ])
+  AC_SEARCH_LIBS([tigetstr], [tinfo])
   LIBS=$dpkg_save_curses_LIBS
+  AS_IF([test "x$ac_cv_search_tigetstr" != "xnone required" && \
+         test "x$ac_cv_search_tigetstr" != "xno"], [
+    CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }$ac_cv_search_tigetstr"
+  ])
   AS_IF([test "x$have_curses_header" != "xyes"], [
     AC_MSG_FAILURE([curses header not found])
   ])

-- 
Dpkg.Org's dpkg

Reply via email to