Mercurial > hg > octave-lojdl > gnulib-hg
changeset 8309:e5ee9891c553
Make it possible to compile strerror.c separately, unconditionally.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 03 Mar 2007 19:53:01 +0000 |
| parents | 964437da2190 |
| children | b61c5defad7c |
| files | ChangeLog lib/strerror.c m4/strerror.m4 |
| diffstat | 3 files changed, 20 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-03-03 Bruno Haible <bruno@clisp.org> + * m4/strerror.m4 (gl_FUNC_STRERROR_SEPARATE): New macro. + (gl_FUNC_STRERROR): Nop. + * lib/strerror.c: Compile the file only if !HAVE_STRERROR. + * m4/setenv.m4 (gl_FUNC_SETENV_SEPARATE): New macro. * lib/setenv.c: Compile the file only if _LIBC || !HAVE_SETENV.
--- a/lib/strerror.c +++ b/lib/strerror.c @@ -1,6 +1,6 @@ /* strerror.c --- ANSI C compatible system error routine - Copyright (C) 1986, 1988, 1989, 1991, 2002, 2003, 2006 Free + Copyright (C) 1986, 1988, 1989, 1991, 2002, 2003, 2006, 2007 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -21,6 +21,8 @@ #include <limits.h> +#if !HAVE_STRERROR + /* Don't include <stdio.h>, since it may or may not declare sys_errlist and its declarations may collide with ours. Just declare the stuff that we need directly. Standard hosted C89 @@ -45,3 +47,5 @@ else return sys_errlist[n]; } + +#endif /* !HAVE_STRERROR */
--- a/m4/strerror.m4 +++ b/m4/strerror.m4 @@ -1,17 +1,25 @@ -# strerror.m4 serial 2 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# strerror.m4 serial 3 +dnl Copyright (C) 2002, 2007 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. AC_DEFUN([gl_FUNC_STRERROR], [ - AC_REPLACE_FUNCS(strerror) + AC_CHECK_FUNCS_ONCE([strerror]) if test $ac_cv_func_strerror = no; then + AC_LIBOBJ([strerror]) gl_PREREQ_STRERROR fi ]) +# Like gl_FUNC_STRERROR, except prepare for separate compilation (no AC_LIBOBJ). +AC_DEFUN([gl_FUNC_STRERROR_SEPARATE], +[ + AC_CHECK_FUNCS_ONCE([strerror]) + gl_PREREQ_STRERROR +]) + # Prerequisites of lib/strerror.c. AC_DEFUN([gl_PREREQ_STRERROR], [ :