From ed73a419e152c8722ee79e83a19cc09691eb2290 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 3 Mar 2007 19:10:05 +0000 Subject: [PATCH] Split gt_FUNC_SETENV into gl_FUNC_SETENV and gl_FUNC_UNSETENV. --- ChangeLog | 10 +++++++++- m4/setenv.m4 | 15 +++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0198f96f2..711c2f628 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2007-03-03 Bruno Haible + * m4/setenv.m4 (gl_FUNC_SETENV, gl_FUNC_UNSETENV): New macros, + extracted from gt_FUNC_SETENV. + (gt_FUNC_SETENV): Remove macro. + * modules/setenv (configure.ac): Add gl_FUNC_SETENV, gl_FUNC_UNSETENV, + remove gt_FUNC_SETENV. + +2007-03-03 Bruno Haible + * m4/relocatable-lib.m4 (gl_RELOCATABLE_LIBRARY): Define ENABLE_RELOCATABLE here. * m4/relocatable.m4 (gl_RELOCATABLE_BODY): Don't define it here. @@ -26135,4 +26143,4 @@ * m4/largefile.m4: Remove file (now that it's part of autoconf). -2000-06-04 Paul Eggert +2000-06-04 Paul Eggert \ No newline at end of file diff --git a/m4/setenv.m4 b/m4/setenv.m4 index 623fcf2b5..0d54a9613 100644 --- a/m4/setenv.m4 +++ b/m4/setenv.m4 @@ -1,16 +1,23 @@ -# setenv.m4 serial 6 -dnl Copyright (C) 2001-2004, 2006 Free Software Foundation, Inc. +# setenv.m4 serial 7 +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, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gt_FUNC_SETENV], +AC_DEFUN([gl_FUNC_SETENV], [ - AC_REPLACE_FUNCS(setenv unsetenv) + AC_CHECK_FUNCS_ONCE([setenv]) if test $ac_cv_func_setenv = no; then + AC_LIBOBJ([setenv]) gl_PREREQ_SETENV fi +]) + +AC_DEFUN([gl_FUNC_UNSETENV], +[ + AC_CHECK_FUNCS([unsetenv]) if test $ac_cv_func_unsetenv = no; then + AC_LIBOBJ([unsetenv]) gl_PREREQ_UNSETENV else AC_CACHE_CHECK([for unsetenv() return type], gt_cv_func_unsetenv_ret, -- 2.11.0