From: Eric Blake Date: Thu, 26 Aug 2010 22:18:38 +0000 (-0600) Subject: lseek: fix link test X-Git-Tag: v0.1~3905 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=a228f53;p=gnulib.git lseek: fix link test Another bug spotted by autoconf. * m4/lseek.m4 (gl_FUNC_LSEEK): Use correct format for AC_LINK_IFELSE. Signed-off-by: Eric Blake --- diff --git a/ChangeLog b/ChangeLog index 146e52247..af835b6fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-08-26 Eric Blake + lseek: fix link test + * m4/lseek.m4 (gl_FUNC_LSEEK): Use correct format for + AC_LINK_IFELSE. + include_next: silence autoconf 2.68 warning * m4/include_next.m4 (gl_INCLUDE_NEXT): Mark this use of AC_COMPILE_IFELSE as special. diff --git a/m4/lseek.m4 b/m4/lseek.m4 index 9bf4dc2d0..b0612c7e1 100644 --- a/m4/lseek.m4 +++ b/m4/lseek.m4 @@ -1,4 +1,4 @@ -# lseek.m4 serial 5 +# lseek.m4 serial 6 dnl Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,15 +10,13 @@ AC_DEFUN([gl_FUNC_LSEEK], AC_REQUIRE([AC_PROG_CC]) AC_CACHE_CHECK([whether lseek detects pipes], [gl_cv_func_lseek_pipe], [if test $cross_compiling = no; then - AC_LINK_IFELSE([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include /* for off_t */ #include /* for SEEK_CUR */ -#include -int main () -{ +#include ]], [[ /* Exit with success only if stdin is seekable. */ return lseek (0, (off_t)0, SEEK_CUR) < 0; -}], +]])], [if test -s conftest$ac_exeext \ && ./conftest$ac_exeext < conftest.$ac_ext \ && test 1 = "`echo hi \ @@ -29,11 +27,11 @@ int main () fi], [gl_cv_func_lseek_pipe=no]) else - AC_COMPILE_IFELSE([ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ #if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) || defined __BEOS__ /* mingw and BeOS mistakenly return 0 when trying to seek on pipes. */ Choke me. -#endif], +#endif]])], [gl_cv_func_lseek_pipe=yes], [gl_cv_func_lseek_pipe=no]) fi]) if test $gl_cv_func_lseek_pipe = no; then