X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Freadline.m4;h=a5ab06783aabe2b353dd9e7270f738e56a356b4e;hb=67d133ee7b512af59a392f533b17302d71e937db;hp=60b0aa8fb0a5116af2233cf7535474eeb4436b8c;hpb=42d1eda5dcce2d68deab7a642e7f29bcd7144a0d;p=gnulib.git

diff --git a/m4/readline.m4 b/m4/readline.m4
index 60b0aa8fb..a5ab06783 100644
--- a/m4/readline.m4
+++ b/m4/readline.m4
@@ -1,5 +1,5 @@
-# readline.m4 serial 6
-dnl Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+# readline.m4 serial 9
+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.
@@ -19,7 +19,7 @@ AC_DEFUN([gl_FUNC_READLINE],
 
   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])
@@ -37,12 +37,17 @@ AC_DEFUN([gl_FUNC_READLINE],
       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"
@@ -50,9 +55,10 @@ AC_DEFUN([gl_FUNC_READLINE],
 
   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"
+    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])
@@ -67,11 +73,6 @@ AC_DEFUN([gl_FUNC_READLINE],
   AC_SUBST([LTLIBREADLINE])
 
   AC_CHECK_HEADERS([readline/readline.h])
-
-  if test $gl_cv_lib_readline = no; then
-    AC_LIBOBJ([readline])
-    gl_PREREQ_READLINE
-  fi
 ])
 
 # Prerequisites of lib/readline.c.