projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move getline and getdelim into stdio.h, per POSIX 200x.
[pspp]
/
m4
/
getline.m4
diff --git
a/m4/getline.m4
b/m4/getline.m4
index 5b55c3045bb16936d6efd0dd38694b9bb030a8e6..421710595d930cb9a283b4df7f626e060a6e2847 100644
(file)
--- a/
m4/getline.m4
+++ b/
m4/getline.m4
@@
-1,7
+1,7
@@
-# getline.m4 serial 1
5
+# getline.m4 serial 1
6
-dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006
Free Softwar
e
-dnl Foundation, Inc.
+dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006
, 2007 Fre
e
+dnl
Software
Foundation, Inc.
dnl
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@
-15,6
+15,8
@@
dnl have a function by that name in -linet that doesn't have anything
dnl to do with the function we need.
AC_DEFUN([gl_FUNC_GETLINE],
[
dnl to do with the function we need.
AC_DEFUN([gl_FUNC_GETLINE],
[
+ AC_REQUIRE([gl_STDIO_H_DEFAULTS])
+
dnl Persuade glibc <stdio.h> to declare getline().
AC_REQUIRE([AC_GNU_SOURCE])
dnl Persuade glibc <stdio.h> to declare getline().
AC_REQUIRE([AC_GNU_SOURCE])
@@
-60,12
+62,12
@@
AC_DEFUN([gl_FUNC_GETLINE],
)])
fi
)])
fi
+ if test $ac_cv_func_getline = no; then
+ HAVE_DECL_GETLINE=0
+ fi
+
if test $am_cv_func_working_getline = no; then
if test $am_cv_func_working_getline = no; then
- dnl We must choose a different name for our function, since on ELF systems
- dnl a broken getline() in libc.so would override our getline() in
- dnl libgettextlib.so.
- AC_DEFINE([getline], [gnu_getline],
- [Define to a replacement function name for getline().])
+ REPLACE_GETLINE=1
AC_LIBOBJ(getline)
gl_PREREQ_GETLINE
AC_LIBOBJ(getline)
gl_PREREQ_GETLINE