X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fargz.m4;h=40e836b82ce9890d0da57828f1581d6d717bab48;hb=ff9cea26062a93e9b435e5de74908fec1c167bae;hp=66f3bc1e714bceba714b9607c844fca3263a316f;hpb=06a946707465c071bb0a15fcc7498532967679e1;p=gnulib.git diff --git a/m4/argz.m4 b/m4/argz.m4 index 66f3bc1e7..40e836b82 100644 --- a/m4/argz.m4 +++ b/m4/argz.m4 @@ -1,24 +1,13 @@ # Portability macros for glibc argz. -*- Autoconf -*- # Written by Gary V. Vaughan -# Copyright (C) 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. - -# serial 1 +# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. + +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 4 argz.m4 AC_DEFUN([gl_FUNC_ARGZ], [gl_PREREQ_ARGZ @@ -28,7 +17,9 @@ AC_CHECK_HEADERS([argz.h], [], [], [AC_INCLUDES_DEFAULT]) AC_CHECK_TYPES([error_t], [], [AC_DEFINE([error_t], [int], - [Define to a type to use for `error_t' if it is not otherwise available.])], + [Define to a type to use for `error_t' if it is not otherwise available.]) + AC_DEFINE([__error_t_defined], [1], [Define so that glibc/gnulib argp.h + does not typedef error_t.])], [#if defined(HAVE_ARGZ_H) # include #endif])