From b0c4a45dcffe995194d8cdf19ac65f513b4e40cf Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Thu, 30 Jan 2003 06:52:26 +0000 Subject: [PATCH] * acinclude.m4 (MC_WITH_NCURSES): Check -lcurses if -lncurses doesn't work. Useful on OpenBSD 3.2. --- ChangeLog | 5 +++++ acinclude.m4 | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index de2149ed3..85e52dcbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-01-30 Pavel Tsekov + + * acinclude.m4 (MC_WITH_NCURSES): Check -lcurses if -lncurses + doesn't work. Useful on OpenBSD 3.2. + 2003-01-29 Pavel Roskin * lib/mc.ext.in: Fix missing semicolon that affected viewing RPM diff --git a/acinclude.m4 b/acinclude.m4 index 573e804d5..3c6a19f4c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -799,8 +799,10 @@ dnl or you'll have to press Esc three times to dismiss a dialog box. dnl AC_DEFUN([MC_WITH_NCURSES], [ dnl has_colors() is specific to ncurses, it's not in the old curses - AC_CHECK_LIB([ncurses], [has_colors], [MCLIBS="$MCLIBS -lncurses"], - [AC_MSG_ERROR([Cannot find ncurses library])]) + save_LIBS="$LIBS" + LIBS= + AC_SEARCH_LIBS([has_colors], [ncurses curses], [MCLIBS="$MCLIBS $LIBS"], + [AC_MSG_ERROR([Cannot find ncurses library])]) dnl Check the header ncurses_h_found= @@ -816,8 +818,6 @@ AC_DEFUN([MC_WITH_NCURSES], [ AC_DEFINE(USE_NCURSES, 1, [Define to use ncurses for screen management]) - save_LIBS="$LIBS" - LIBS="$LIBS -lncurses" AC_CACHE_CHECK([for ESCDELAY variable], [mc_cv_ncurses_escdelay], [AC_TRY_COMPILE([], [