Mercurial > hg > octave-lyh > gnulib-hg
changeset 6243:c7eeea00ac4b
srclist.update
author | Karl Berry <karl@freefriends.org> |
---|---|
date | Sun, 18 Sep 2005 12:30:04 +0000 |
parents | e64c2e62add0 |
children | 7e890d4eb457 |
files | lib/argz.c lib/mktime.c |
diffstat | 2 files changed, 17 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/argz.c +++ b/lib/argz.c @@ -5,36 +5,26 @@ NOTE: The canonical source of this file is maintained with the GNU Libtool package. Report bugs to bug-libtool@gnu.org. -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -As a special exception to the GNU Lesser General Public License, -if you distribute this file as part of a program or library that -is built using GNU libtool, you may include it under the same -distribution terms that you use for the rest of that program. + 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 library 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 -Lesser General Public License for more details. + 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 Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA - -*/ - -/* Provide our wierdo HAVE_CONFIG_H rvalue for other clients. */ -#if !defined(LTDL) && defined(HAVE_CONFIG_H) -# undef HAVE_CONFIG_H -# define HAVE_CONFIG_H <config.h> -#endif + 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #if defined(HAVE_CONFIG_H) -# include HAVE_CONFIG_H +# if defined(LTDL) && defined LT_CONFIG_H +# include LT_CONFIG_H +# else +# include <config.h> +# endif #endif #include <argz.h>
--- a/lib/mktime.c +++ b/lib/mktime.c @@ -1,6 +1,5 @@ /* Convert a `struct tm' to a time_t value. Copyright (C) 1993-1999, 2002-2004, 2005 Free Software Foundation, Inc. - Inc. This file is part of the GNU C Library. Contributed by Paul Eggert (eggert@twinsun.com). @@ -16,7 +15,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* Define this to have a standalone program to test this implementation of mktime. */