colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

m4/ax_lib_readline.m4: Update after running aclocal

Browse Source 
See-also: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/796
See-also: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/807
This commit is contained in:
Javier Jardón
2021-03-31 09:53:14 +01:00
committed by Thomas Haller
parent 3affccf29b
commit af360238be
1 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
m4/ax_lib_readline.m4
View File

@@ -1,5 +1,5 @@
# =========================================================================== # ===========================================================================
# http://www.gnu.org/software/autoconf-archive/ax_lib_readline.html # https://www.gnu.org/software/autoconf-archive/ax_lib_readline.html
# =========================================================================== # ===========================================================================
# #
# SYNOPSIS # SYNOPSIS
@@ -58,7 +58,7 @@
# and this notice are preserved. This file is offered as-is, without any # and this notice are preserved. This file is offered as-is, without any
# warranty. # warranty.
#serial 6 #serial 8
AU_ALIAS([VL_LIB_READLINE], [AX_LIB_READLINE]) AU_ALIAS([VL_LIB_READLINE], [AX_LIB_READLINE])
AC_DEFUN([AX_LIB_READLINE], [ AC_DEFUN([AX_LIB_READLINE], [
@@ -66,15 +66,14 @@ AC_DEFUN([AX_LIB_READLINE], [
ax_cv_lib_readline, [ ax_cv_lib_readline, [
ORIG_LIBS="$LIBS" ORIG_LIBS="$LIBS"
for readline_lib in readline edit editline; do for readline_lib in readline edit editline; do
# prefer ncurses since we use it for nmtui too for termcap_lib in "" termcap curses ncurses; do
for termcap_lib in "" ncurses termcap curses; do
if test -z "$termcap_lib"; then if test -z "$termcap_lib"; then
TRY_LIB="-l$readline_lib" TRY_LIB="-l$readline_lib"
else else
TRY_LIB="-l$readline_lib -l$termcap_lib" TRY_LIB="-l$readline_lib -l$termcap_lib"
fi fi
LIBS="$ORIG_LIBS $TRY_LIB" LIBS="$ORIG_LIBS $TRY_LIB"
AC_TRY_LINK_FUNC(readline, ax_cv_lib_readline="$TRY_LIB") AC_LINK_IFELSE([AC_LANG_CALL([], [readline])], [ax_cv_lib_readline="$TRY_LIB"])
if test -n "$ax_cv_lib_readline"; then if test -n "$ax_cv_lib_readline"; then
break break
fi fi
@@ -83,39 +82,26 @@ AC_DEFUN([AX_LIB_READLINE], [
break break
fi fi
done done
if test -z "$ax_cv_lib_readline"; then
ax_cv_lib_readline="no"
fi
LIBS="$ORIG_LIBS" LIBS="$ORIG_LIBS"
]) ])
if test -z "$ax_cv_lib_readline"; then if test "$ax_cv_lib_readline" != "no"; then
AC_MSG_ERROR([readline library with terminfo support is required (one of readline, edit, or editline, AND one of ncurses, curses, or termcap)]) LIBS="$LIBS $ax_cv_lib_readline"
AC_DEFINE(HAVE_LIBREADLINE, 1,
[Define if you have a readline compatible library])
AC_CHECK_HEADERS(readline.h readline/readline.h)
AC_CACHE_CHECK([whether readline supports history],
ax_cv_lib_readline_history, [
ax_cv_lib_readline_history="no"
AC_LINK_IFELSE([AC_LANG_CALL([], [add_history])], [ax_cv_lib_readline_history="yes"])
])
if test "$ax_cv_lib_readline_history" = "yes"; then
AC_DEFINE(HAVE_READLINE_HISTORY, 1,
[Define if your readline library has \`add_history'])
AC_CHECK_HEADERS(history.h readline/history.h)
fi
fi fi
ORIG_LIBS="$LIBS"
LIBS="$LIBS $ax_cv_lib_readline"
AC_CHECK_HEADERS(readline.h readline/readline.h)
# Check history
AC_CACHE_CHECK([whether readline supports history],
ax_cv_lib_readline_history, [
ax_cv_lib_readline_history="no"
AC_TRY_LINK_FUNC(add_history, ax_cv_lib_readline_history="yes")
])
if test "$ax_cv_lib_readline_history" != "yes"; then
AC_MSG_ERROR(readline history support is required)
fi
AC_CHECK_HEADERS(history.h readline/history.h)
# check rl_echo_signal_char()
AC_CACHE_CHECK([whether readline supports rl_echo_signal_char()],
ax_cv_lib_readline_echo_signal_char, [
ax_cv_lib_readline_echo_signal_char="no"
AC_TRY_LINK_FUNC(rl_echo_signal_char, ax_cv_lib_readline_echo_signal_char="yes")
])
if test "$ax_cv_lib_readline_echo_signal_char" != "yes"; then
AC_MSG_ERROR(rl_echo_signal_char() is required (install readline6?))
fi
LIBS="$ORIG_LIBS"
READLINE_LIBS="$ax_cv_lib_readline"
AC_SUBST(READLINE_LIBS)
])dnl ])dnl