Skip to content

Commit b64159a

Browse files
committed
When using libedit also search for curses
1 parent 1ab7185 commit b64159a

3 files changed

Lines changed: 58 additions & 1 deletion

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Install these packages (or *ports*):
7878

7979
Then build:
8080

81-
$ CPPFLAGS="-I/usr/local/include" LDFLAGS="-L/usr/local/lib" LIBS="-lcurses" ./configure
81+
$ CPPFLAGS="-I/usr/local/include" LDFLAGS="-L/usr/local/lib" ./configure
8282
$ make
8383

8484
#### Other UNIX

‎configure‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3467,6 +3467,62 @@ $as_echo "#define READLINE_GNU 1" >>confdefs.h
34673467

34683468
else
34693469

3470+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetnum" >&5
3471+
$as_echo_n "checking for library containing tgetnum... " >&6; }
3472+
if ${ac_cv_search_tgetnum+:} false; then :
3473+
$as_echo_n "(cached) " >&6
3474+
else
3475+
ac_func_search_save_LIBS=$LIBS
3476+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3477+
/* end confdefs.h. */
3478+
3479+
/* Override any GCC internal prototype to avoid an error.
3480+
Use char because int might match the return type of a GCC
3481+
builtin and then its argument prototype would still apply. */
3482+
#ifdef __cplusplus
3483+
extern "C"
3484+
#endif
3485+
char tgetnum ();
3486+
int
3487+
main ()
3488+
{
3489+
return tgetnum ();
3490+
;
3491+
return 0;
3492+
}
3493+
_ACEOF
3494+
for ac_lib in '' ncursesw ncurses curses; do
3495+
if test -z "$ac_lib"; then
3496+
ac_res="none required"
3497+
else
3498+
ac_res=-l$ac_lib
3499+
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
3500+
fi
3501+
if ac_fn_c_try_link "$LINENO"; then :
3502+
ac_cv_search_tgetnum=$ac_res
3503+
fi
3504+
rm -f core conftest.err conftest.$ac_objext \
3505+
conftest$ac_exeext
3506+
if ${ac_cv_search_tgetnum+:} false; then :
3507+
break
3508+
fi
3509+
done
3510+
if ${ac_cv_search_tgetnum+:} false; then :
3511+
3512+
else
3513+
ac_cv_search_tgetnum=no
3514+
fi
3515+
rm conftest.$ac_ext
3516+
LIBS=$ac_func_search_save_LIBS
3517+
fi
3518+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tgetnum" >&5
3519+
$as_echo "$ac_cv_search_tgetnum" >&6; }
3520+
ac_res=$ac_cv_search_tgetnum
3521+
if test "$ac_res" != no; then :
3522+
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3523+
3524+
fi
3525+
34703526
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_set_prompt in -ledit" >&5
34713527
$as_echo_n "checking for rl_set_prompt in -ledit... " >&6; }
34723528
if ${ac_cv_lib_edit_rl_set_prompt+:} false; then :

‎configure.ac‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ AC_CHECK_LIB([readline], [rl_save_prompt],
2222
[ EXTRA_LIBS="${EXTRA_LIBS} -lreadline" ; ]
2323
],
2424
[
25+
AC_SEARCH_LIBS([tgetnum], [ncursesw ncurses curses])
2526
AC_CHECK_LIB([edit], [rl_set_prompt])
2627
AC_DEFINE([READLINE_EDIT], [1], [Use libedit])
2728
[ EXTRA_LIBS="${EXTRA_LIBS} -ledit" ; ]

0 commit comments

Comments
 (0)