From 6ba3fe14edf3176891edbb6fd988bf7fdcc11aa3 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 13 Mar 2021 08:29:03 +0200 Subject: [PATCH 23/23] readline.m4: Improve quotation See osdn #41759 Signed-off-by: Marko Lindqvist --- m4/readline.m4 | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/m4/readline.m4 b/m4/readline.m4 index f23104b649..9cace1d6ed 100644 --- a/m4/readline.m4 +++ b/m4/readline.m4 @@ -8,7 +8,7 @@ dnl to included -lreadline and parameter EXTRA-LIBS. dnl Should already have checked that header and library exist. dnl AC_DEFUN([FC_CHECK_READLINE_RUNTIME], -[AC_MSG_CHECKING(whether readline works at runtime) +[AC_MSG_CHECKING([whether readline works at runtime]) templibs="$LIBS" LIBS="-lreadline $1 $LIBS" AC_RUN_IFELSE([AC_LANG_SOURCE([[ @@ -61,16 +61,16 @@ AC_DEFUN([FC_HAS_READLINE], if test "$WITH_READLINE" = "yes" || test "$WITH_READLINE" = "maybe"; then HAVE_TERMCAP=""; dnl Readline header - AC_CHECK_HEADER(readline/readline.h, - have_readline_header=1, - have_readline_header=0) + AC_CHECK_HEADER([readline/readline.h], + [have_readline_header=1], + [have_readline_header=0]) if test "$have_readline_header" = "0"; then if test "$WITH_READLINE" = "yes"; then - AC_MSG_ERROR([Did not find readline header file. + AC_MSG_ERROR([Did not find readline header file. You may need to install a readline "development" package.]) else - AC_MSG_WARN(Did not find readline header file. -Configuring server without readline support.) + AC_MSG_WARN([Did not find readline header file. +Configuring server without readline support.]) feature_readline=missing fi else @@ -85,11 +85,11 @@ Configuring server without readline support.) dnl Some older Unices may need both -lcurses and -ltermlib, dnl but we don't support that just yet. This check will take dnl the first lib that it finds and just link to that. - AC_CHECK_LIB(tinfo, tgetent, HAVE_TERMCAP="-ltinfo", - AC_CHECK_LIB(ncurses, tgetent, HAVE_TERMCAP="-lncurses", - AC_CHECK_LIB(curses, tgetent, HAVE_TERMCAP="-lcurses", - AC_CHECK_LIB(termcap, tgetent, HAVE_TERMCAP="-ltermcap", - AC_CHECK_LIB(termlib, tgetent, HAVE_TERMCAP="-ltermlib") + AC_CHECK_LIB([tinfo], [tgetent], [HAVE_TERMCAP="-ltinfo"], + AC_CHECK_LIB([ncurses], [tgetent], [HAVE_TERMCAP="-lncurses"], + AC_CHECK_LIB([curses], [tgetent], [HAVE_TERMCAP="-lcurses"], + AC_CHECK_LIB([termcap], [tgetent], [HAVE_TERMCAP="-ltermcap"], + AC_CHECK_LIB([termlib], [tgetent], [HAVE_TERMCAP="-ltermlib"]) ) ) ) @@ -110,28 +110,28 @@ make readline library pass the test.]) fi if test "$have_readline_lib" = "1"; then - FC_CHECK_READLINE_RUNTIME($HAVE_TERMCAP, - have_readline_lib=1, have_readline_lib=0) + FC_CHECK_READLINE_RUNTIME([$HAVE_TERMCAP], + [have_readline_lib=1], [have_readline_lib=0]) if test "$have_readline_lib" = "1"; then SRV_LIB_LIBS="-lreadline $SRV_LIB_LIBS $HAVE_TERMCAP" AC_DEFINE_UNQUOTED([FREECIV_HAVE_LIBREADLINE], [1], [Readline support]) else if test "$WITH_READLINE" = "yes"; then - AC_MSG_ERROR(Specified --with-readline but the -runtime test of readline failed.) + AC_MSG_ERROR([Specified --with-readline but the +runtime test of readline failed.]) else - AC_MSG_WARN(Runtime test of readline failed. -Configuring server without readline support.) + AC_MSG_WARN([Runtime test of readline failed. +Configuring server without readline support.]) feature_readline=missing fi fi else if test "$WITH_READLINE" = "yes"; then - AC_MSG_ERROR(Specified --with-readline but the -test to link against the library failed.) + AC_MSG_ERROR([Specified --with-readline but the +test to link against the library failed.]) else - AC_MSG_WARN(Test to link against readline library failed. -Configuring server without readline support.) + AC_MSG_WARN([Test to link against readline library failed. +Configuring server without readline support.]) feature_readline=missing fi fi -- 2.30.1