Mercurial > hg > octave-lyh > gnulib-hg
changeset 6025:5c7eb3550ce5
* readline.m4: Look for termcap, curses or ncurses if required.
author | Simon Josefsson <simon@josefsson.org> |
---|---|
date | Fri, 12 Aug 2005 07:57:44 +0000 |
parents | 1bb00e100009 |
children | 96e68d9810b9 |
files | m4/ChangeLog m4/readline.m4 |
diffstat | 2 files changed, 27 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2005-08-12 Simon Josefsson <jas@extundo.com> + + * readline.m4: Look for termcap, curses or ncurses if required. + 2005-08-11 Simon Josefsson <jas@extundo.com> * readline.m4: New file.
--- a/m4/readline.m4 +++ b/m4/readline.m4 @@ -1,9 +1,12 @@ -# readline.m4 serial 1 +# readline.m4 serial 2 dnl Copyright (C) 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. +dnl Written by Simon Josefsson, with help from Bruno Haible and Oskar +dnl Liljeblad. + AC_DEFUN([gl_FUNC_READLINE], [ AC_LIBSOURCES([readline.c, readline.h]) @@ -26,22 +29,34 @@ AC_CACHE_CHECK(for readline, gl_cv_lib_readline, [ gl_cv_lib_readline=no am_save_LIBS="$LIBS" - LIBS="$LIBS $LIBREADLINE" - AC_TRY_LINK([#include <stdio.h> + for extra_lib in "" termcap curses ncurses; do + LIBS="$am_save_LIBS $LIBREADLINE" + if test -n "$extra_lib"; then + LIBS="$LIBS -l$extra_lib" + fi + AC_TRY_LINK([#include <stdio.h> #include <readline/readline.h>], - [readline((char*)0);], - gl_cv_lib_readline=yes) + [readline((char*)0);], + gl_cv_lib_readline=yes) + if test "$gl_cv_lib_readline" = yes; then + LIBREADLINE="$LIBREADLINE -l$extra_lib" + LTLIBREADLINE="$LTLIBREADLINE -l$extra_lib" + break + fi + done LIBS="$am_save_LIBS" ]) + if test "$gl_cv_lib_readline" = yes; then - AC_DEFINE(HAVE_READLINE, 1, [Define if you have the readline() library.]) + AC_DEFINE(HAVE_READLINE, 1, [Define if you have the readline library.]) fi + if test "$gl_cv_lib_readline" = yes; then AC_MSG_CHECKING([how to link with libreadline]) AC_MSG_RESULT([$LIBREADLINE]) else - dnl If $LIBREADLINE didn't lead to a usable library, we don't need $INCREADLINE - dnl either. + dnl If $LIBREADLINE didn't lead to a usable library, we don't + dnl need $INCREADLINE either. CPPFLAGS="$am_save_CPPFLAGS" LIBREADLINE= LTLIBREADLINE=