-# readline.m4 serial 5
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# readline.m4 serial 8
+dnl Copyright (C) 2005-2006, 2009-2011 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 Add $INCREADLINE to CPPFLAGS before performing the following checks,
dnl because if the user has installed libreadline and not disabled its use
- dnl via --without-libreadline-prefix, he wants to use it. The AC_TRY_LINK
+ dnl via --without-libreadline-prefix, he wants to use it. The AC_LINK_IFELSE
dnl will then succeed.
am_save_CPPFLAGS="$CPPFLAGS"
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCREADLINE])
- AC_CACHE_CHECK(for readline, gl_cv_lib_readline, [
+ AC_CACHE_CHECK([for readline], [gl_cv_lib_readline], [
gl_cv_lib_readline=no
am_save_LIBS="$LIBS"
dnl On some systems, -lreadline doesn't link without an additional
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=" -l$extra_lib"])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
+#include <readline/readline.h>]],
+ [[readline((char*)0);]])],
+ [if test -n "$extra_lib"; then
+ gl_cv_lib_readline="yes, requires -l$extra_lib"
+ else
+ gl_cv_lib_readline="yes"
+ fi
+ ])
if test "$gl_cv_lib_readline" != no; then
- break
+ break
fi
done
LIBS="$am_save_LIBS"
])
if test "$gl_cv_lib_readline" != no; then
- AC_DEFINE(HAVE_READLINE, 1, [Define if you have the readline library.])
- if test "$gl_cv_lib_readline" != " -l"; then
- LIBREADLINE="$LIBREADLINE$gl_cv_lib_readline"
- LTLIBREADLINE="$LTLIBREADLINE$gl_cv_lib_readline"
+ AC_DEFINE([HAVE_READLINE], [1], [Define if you have the readline library.])
+ extra_lib=`echo "$gl_cv_lib_readline" | sed -n -e 's/yes, requires //p'`
+ if test -n "$extra_lib"; then
+ LIBREADLINE="$LIBREADLINE $extra_lib"
+ LTLIBREADLINE="$LTLIBREADLINE $extra_lib"
fi
AC_MSG_CHECKING([how to link with libreadline])
AC_MSG_RESULT([$LIBREADLINE])
LIBREADLINE=
LTLIBREADLINE=
fi
- AC_SUBST(LIBREADLINE)
- AC_SUBST(LTLIBREADLINE)
+ AC_SUBST([LIBREADLINE])
+ AC_SUBST([LTLIBREADLINE])
- AC_CHECK_HEADERS(readline/readline.h)
+ AC_CHECK_HEADERS([readline/readline.h])
- if test $gl_cv_lib_readline = no; then
- AC_LIBOBJ(readline)
+ if test "$gl_cv_lib_readline" = no; then
+ AC_LIBOBJ([readline])
gl_PREREQ_READLINE
fi
])