projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix test failure on Cygwin.
[gnulib.git]
/
m4
/
getline.m4
diff --git
a/m4/getline.m4
b/m4/getline.m4
index
ff255a3
..
57625da
100644
(file)
--- a/
m4/getline.m4
+++ b/
m4/getline.m4
@@
-1,13
+1,13
@@
-# getline.m4 serial 1
3
+# getline.m4 serial 1
8
-dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
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 with or without modifications, as long as this notice is preserved.
dnl
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.
-AC_PREREQ(
2.52
)
+AC_PREREQ(
[2.59]
)
dnl See if there's a working, system-supplied version of the getline function.
dnl We can't just do AC_REPLACE_FUNCS(getline) because some systems
dnl See if there's a working, system-supplied version of the getline function.
dnl We can't just do AC_REPLACE_FUNCS(getline) because some systems
@@
-15,12
+15,12
@@
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_
LIBSOURCES([getline.c, getline.h
])
+ AC_
REQUIRE([gl_STDIO_H_DEFAULTS
])
dnl Persuade glibc <stdio.h> to declare getline().
dnl Persuade glibc <stdio.h> to declare getline().
- AC_REQUIRE([AC_
GNU_SOURCE
])
+ AC_REQUIRE([AC_
USE_SYSTEM_EXTENSIONS
])
- AC_CHECK_DECLS([getline])
+ AC_CHECK_DECLS
_ONCE
([getline])
gl_getline_needs_run_time_check=no
AC_CHECK_FUNC(getline,
gl_getline_needs_run_time_check=no
AC_CHECK_FUNC(getline,
@@
-47,17
+47,28
@@
AC_DEFUN([gl_FUNC_GETLINE],
}
], am_cv_func_working_getline=yes dnl The library version works.
, am_cv_func_working_getline=no dnl The library version does NOT work.
}
], am_cv_func_working_getline=yes dnl The library version works.
, am_cv_func_working_getline=no dnl The library version does NOT work.
- , am_cv_func_working_getline=no dnl We're cross compiling.
+ , dnl We're cross compiling. Assume it works on glibc2 systems.
+ [AC_EGREP_CPP([Lucky GNU user],
+ [
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ >= 2)
+ Lucky GNU user
+ #endif
+#endif
+ ],
+ [am_cv_func_working_getline=yes],
+ [am_cv_func_working_getline=no])]
)])
fi
)])
fi
+ if test $ac_cv_have_decl_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().])
- AC_LIBOBJ(getline)
+ REPLACE_GETLINE=1
+ AC_LIBOBJ([getline])
gl_PREREQ_GETLINE
fi
gl_PREREQ_GETLINE
fi