projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* m4/nanosleep.m4 (gl_FUNC_NANOSLEEP): Fix typo in comment.
[gnulib.git]
/
m4
/
readline.m4
diff --git
a/m4/readline.m4
b/m4/readline.m4
index
8c2d9d2
..
4c82a7f
100644
(file)
--- a/
m4/readline.m4
+++ b/
m4/readline.m4
@@
-1,5
+1,5
@@
-# readline.m4 serial
3
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# readline.m4 serial
5
+dnl Copyright (C) 2005
, 2006
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 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.
@@
-9,8
+9,6
@@
dnl Liljeblad.
AC_DEFUN([gl_FUNC_READLINE],
[
AC_DEFUN([gl_FUNC_READLINE],
[
- AC_LIBSOURCES([readline.c, readline.h])
-
dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
AC_REQUIRE([AC_LIB_RPATH])
dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
AC_REQUIRE([AC_LIB_RPATH])
@@
-42,23
+40,20
@@
AC_DEFUN([gl_FUNC_READLINE],
AC_TRY_LINK([#include <stdio.h>
#include <readline/readline.h>],
[readline((char*)0);],
AC_TRY_LINK([#include <stdio.h>
#include <readline/readline.h>],
[readline((char*)0);],
- gl_cv_lib_readline=yes)
- if test "$gl_cv_lib_readline" = yes; then
- if test -n "$extra_lib"; then
- LIBREADLINE="$LIBREADLINE -l$extra_lib"
- LTLIBREADLINE="$LTLIBREADLINE -l$extra_lib"
- fi
- break
+ [gl_cv_lib_readline=" -l$extra_lib"])
+ if test "$gl_cv_lib_readline" != no; then
+ break
fi
done
LIBS="$am_save_LIBS"
])
fi
done
LIBS="$am_save_LIBS"
])
- if test "$gl_cv_lib_readline"
= yes
; then
+ if test "$gl_cv_lib_readline"
!= no
; 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
+ if test "$gl_cv_lib_readline" != " -l"; then
+ LIBREADLINE="$LIBREADLINE$gl_cv_lib_readline"
+ LTLIBREADLINE="$LTLIBREADLINE$gl_cv_lib_readline"
+ fi
AC_MSG_CHECKING([how to link with libreadline])
AC_MSG_RESULT([$LIBREADLINE])
else
AC_MSG_CHECKING([how to link with libreadline])
AC_MSG_RESULT([$LIBREADLINE])
else