diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ChangeLog | 4 | ||||
| -rw-r--r-- | m4/canonicalize.m4 | 21 | ||||
| -rw-r--r-- | m4/getcwd-path-max.m4 | 16 | ||||
| -rw-r--r-- | m4/strdup.m4 | 13 |
4 files changed, 45 insertions, 9 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index 47ba2e09c..3c1425262 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2004-08-07 Paul Eggert <eggert@cs.ucla.edu> + + * canonicalize.m4, getcwd-path-max.m4, strdup.m4: Merge from gnulib. + 2004-08-05 Paul Eggert <eggert@cs.ucla.edu> Merge from gnulib. diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4 index 58453896b..0731f4dc5 100644 --- a/m4/canonicalize.m4 +++ b/m4/canonicalize.m4 @@ -1,4 +1,23 @@ -#serial 2 +#serial 3 + +# Copyright (C) 2003, 2004 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# Written by Jim Meyering. + AC_DEFUN([AC_FUNC_CANONICALIZE_FILE_NAME], [ AC_REQUIRE([AC_HEADER_STDC]) diff --git a/m4/getcwd-path-max.m4 b/m4/getcwd-path-max.m4 index 6c0493970..a1e123976 100644 --- a/m4/getcwd-path-max.m4 +++ b/m4/getcwd-path-max.m4 @@ -7,6 +7,22 @@ # I've heard that this is due to a Linux kernel bug, and that it has # been fixed between 2.4.21-pre3 and 2.4.21-pre4. */ +# Copyright (C) 2003, 2004 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + # From Jim Meyering AC_DEFUN([GL_FUNC_GETCWD_PATH_MAX], diff --git a/m4/strdup.m4 b/m4/strdup.m4 index 6e64bc80f..9964d15b1 100644 --- a/m4/strdup.m4 +++ b/m4/strdup.m4 @@ -1,4 +1,4 @@ -# strdup.m4 serial 3 +# strdup.m4 serial 4 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -9,12 +9,9 @@ dnl the same distribution terms as the rest of that program. AC_DEFUN([gl_FUNC_STRDUP], [ AC_REPLACE_FUNCS(strdup) - if test $ac_cv_func_strdup = no; then - gl_PREREQ_STRDUP - fi + AC_CHECK_DECLS_ONCE(strdup) + gl_PREREQ_STRDUP ]) -# Prerequisites of lib/strdup.h and lib/strdup.c. -AC_DEFUN([gl_PREREQ_STRDUP], [ - AC_CHECK_DECLS(strdup) -]) +# Prerequisites of lib/strdup.c. +AC_DEFUN([gl_PREREQ_STRDUP], [:]) |