>From ee41ed22e292a47fa88ff66c36e5a0ce5b15bef8 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 26 Jun 2014 12:04:19 -0500 Subject: [PATCH] build: check harder for readline Not all distros build their readline linked with a termcap library, since apps are (apparently) supposed to choose one for themselves and explicitly link to it when using readline. So add some checks to figure out whether readline is already linked, and if not, prefer ncurses since we use that for nmtui already. ax_lib_readline based off: http://www.gnu.org/software/autoconf-archive/ax_lib_readline.html --- configure.ac | 7 +--- m4/ax_lib_readline.m4 | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 6 deletions(-) create mode 100644 m4/ax_lib_readline.m4 diff --git a/configure.ac b/configure.ac index 8634203..98ebe3c 100644 --- a/configure.ac +++ b/configure.ac @@ -386,21 +386,16 @@ AC_SUBST(LIBNL_CFLAGS) AC_SUBST(LIBNL_LIBS) # uuid library PKG_CHECK_MODULES(UUID, uuid) AC_SUBST(UUID_CFLAGS) AC_SUBST(UUID_LIBS) -dnl dnl Checks for readline library - used by nmcli -dnl -#PKG_CHECK_MODULES(READLINE, readline) -AC_CHECK_LIB(readline, readline, [READLINE_LIBS=-lreadline], [AC_MSG_ERROR(readline library is required)]) -AC_CHECK_HEADERS(readline/readline.h, [], [AC_MSG_ERROR(readline/readline.h - readline devel files required)]) -AC_SUBST(READLINE_LIBS) +AX_LIB_READLINE # Intel WiMAX SDK checks PKG_CHECK_MODULES(IWMX_SDK, [libiWmxSdk-0 >= 1.5.1], [have_wimax=yes],[have_wimax=no]) AC_ARG_ENABLE(wimax, AS_HELP_STRING([--enable-wimax], [enable WiMAX support]), [enable_wimax=${enableval}], [enable_wimax=${have_wimax}]) if (test "${enable_wimax}" = "yes"); then if test x"$have_wimax" = x"no"; then diff --git a/m4/ax_lib_readline.m4 b/m4/ax_lib_readline.m4 new file mode 100644 index 0000000..f64eb75 --- /dev/null +++ b/m4/ax_lib_readline.m4 @@ -0,0 +1,106 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_lib_readline.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_READLINE +# +# DESCRIPTION +# +# Searches for a readline compatible library. If found, defines +# `HAVE_LIBREADLINE'. If the found library has the `add_history' function, +# sets also `HAVE_READLINE_HISTORY'. Also checks for the locations of the +# necessary include files and sets `HAVE_READLINE_H' or +# `HAVE_READLINE_READLINE_H' and `HAVE_READLINE_HISTORY_H' or +# 'HAVE_HISTORY_H' if the corresponding include files exists. +# +# The libraries that may be readline compatible are `libedit', +# `libeditline' and `libreadline'. Sometimes we need to link a termcap +# library for readline to work, this macro tests these cases too by trying +# to link with `libtermcap', `libcurses' or `libncurses' before giving up. +# +# Here is an example of how to use the information provided by this macro +# to perform the necessary includes or declarations in a C file: +# +# #ifdef HAVE_LIBREADLINE +# # if defined(HAVE_READLINE_READLINE_H) +# # include +# # elif defined(HAVE_READLINE_H) +# # include +# # else /* !defined(HAVE_READLINE_H) */ +# extern char *readline (); +# # endif /* !defined(HAVE_READLINE_H) */ +# char *cmdline = NULL; +# #else /* !defined(HAVE_READLINE_READLINE_H) */ +# /* no readline */ +# #endif /* HAVE_LIBREADLINE */ +# +# #ifdef HAVE_READLINE_HISTORY +# # if defined(HAVE_READLINE_HISTORY_H) +# # include +# # elif defined(HAVE_HISTORY_H) +# # include +# # else /* !defined(HAVE_HISTORY_H) */ +# extern void add_history (); +# extern int write_history (); +# extern int read_history (); +# # endif /* defined(HAVE_READLINE_HISTORY_H) */ +# /* no history */ +# #endif /* HAVE_READLINE_HISTORY */ +# +# LICENSE +# +# Copyright (c) 2008 Ville Laurikari +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([VL_LIB_READLINE], [AX_LIB_READLINE]) +AC_DEFUN([AX_LIB_READLINE], [ + AC_CACHE_CHECK([for a readline compatible library], + ax_cv_lib_readline, [ + ORIG_LIBS="$LIBS" + for readline_lib in readline edit editline; do + # prefer ncurses since we use it for nmtui too + for termcap_lib in "" ncurses curses termcap; do + if test -z "$termcap_lib"; then + TRY_LIB="-l$readline_lib" + else + TRY_LIB="-l$readline_lib -l$termcap_lib" + fi + LIBS="$ORIG_LIBS $TRY_LIB" + AC_TRY_LINK_FUNC(readline, ax_cv_lib_readline="$TRY_LIB") + if test -n "$ax_cv_lib_readline"; then + break + fi + done + if test -n "$ax_cv_lib_readline"; then + break + fi + done + LIBS="$ORIG_LIBS" + ]) + + if test -z "$ax_cv_lib_readline"; then + AC_MSG_ERROR(readline library is required) + fi + + LIBS="$LIBS $ax_cv_lib_readline" + 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_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) + READLINE_LIBS="$ax_cv_lib_readline" + AC_SUBST(READLINE_LIBS) +])dnl -- 1.9.3