Mercurial > hg > octave-nkf > gnulib-hg
changeset 8307:330dcd891960
Make it possible to compile setenv.c separately, unconditionally.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sat, 03 Mar 2007 19:42:31 +0000 |
parents | e3b1cbd15bc4 |
children | 964437da2190 |
files | ChangeLog lib/setenv.c m4/setenv.m4 |
diffstat | 3 files changed, 16 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-03-03 Bruno Haible <bruno@clisp.org> + * m4/setenv.m4 (gl_FUNC_SETENV_SEPARATE): New macro. + * lib/setenv.c: Compile the file only if _LIBC || !HAVE_SETENV. + * m4/readlink.m4 (gl_FUNC_READLINK_SEPARATE): New macro. (gl_FUNC_READLINK): Update.
--- a/lib/setenv.c +++ b/lib/setenv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992,1995-1999,2000-2003,2005,2006 Free Software Foundation, Inc. +/* Copyright (C) 1992,1995-1999,2000-2003,2005-2007 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify @@ -31,6 +31,8 @@ # include <unistd.h> #endif +#if _LIBC || !HAVE_SETENV + #if !_LIBC # include "allocsa.h" #endif @@ -326,3 +328,5 @@ weak_alias (__setenv, setenv) weak_alias (__clearenv, clearenv) #endif + +#endif /* _LIBC || !HAVE_SETENV */
--- a/m4/setenv.m4 +++ b/m4/setenv.m4 @@ -1,4 +1,4 @@ -# setenv.m4 serial 7 +# setenv.m4 serial 8 dnl Copyright (C) 2001-2004, 2006-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, @@ -13,6 +13,13 @@ fi ]) +# Like gl_FUNC_SETENV, except prepare for separate compilation (no AC_LIBOBJ). +AC_DEFUN([gl_FUNC_SETENV_SEPARATE], +[ + AC_CHECK_FUNCS_ONCE([setenv]) + gl_PREREQ_SETENV +]) + AC_DEFUN([gl_FUNC_UNSETENV], [ AC_CHECK_FUNCS([unsetenv])