From: Bruno Haible Date: Mon, 1 Oct 2007 22:38:39 +0000 (+0200) Subject: Rename sysexits_.h to sysexits.in.h. X-Git-Tag: v0.0~155 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=882eb279d46373c3de620fd74504c8502f9297a0;p=gnulib.git Rename sysexits_.h to sysexits.in.h. --- diff --git a/ChangeLog b/ChangeLog index 03f9716e4..b3d15bff2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,6 +75,9 @@ * lib/sys_time.in.h: Renamed from lib/sys_time_.h. * modules/sys_time (Files, Makefile.am): Use sys_time.in.h instead of sys_time_.h. + * lib/sysexits.in.h: Renamed from lib/sysexits_.h. + * modules/sysexits (Files, Makefile.am): Use sysexits.in.h instead of + sysexits_.h. 2007-09-30 Bruno Haible diff --git a/lib/sysexits.in.h b/lib/sysexits.in.h new file mode 100644 index 000000000..b65e0ccc3 --- /dev/null +++ b/lib/sysexits.in.h @@ -0,0 +1,68 @@ +/* exit() exit codes for some BSD system programs. + Copyright (C) 2003, 2006-2007 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* Written by Simon Josefsson based on sysexits(3) man page */ + +#ifndef _GL_SYSEXITS_H + +#if @HAVE_SYSEXITS_H@ + +/* IRIX 6.5 has an that defines a macro EX_OK with a nonzero + value. Override it. See + */ +# ifdef __sgi +# include +# undef EX_OK +# endif + +/* The include_next requires a split double-inclusion guard. */ +# @INCLUDE_NEXT@ @NEXT_SYSEXITS_H@ + +/* HP-UX 11 ends at EX_NOPERM. */ +# ifndef EX_CONFIG +# define EX_CONFIG 78 +# endif + +#endif + +#ifndef _GL_SYSEXITS_H +#define _GL_SYSEXITS_H + +#if !@HAVE_SYSEXITS_H@ + +# define EX_OK 0 /* same value as EXIT_SUCCESS */ + +# define EX_USAGE 64 +# define EX_DATAERR 65 +# define EX_NOINPUT 66 +# define EX_NOUSER 67 +# define EX_NOHOST 68 +# define EX_UNAVAILABLE 69 +# define EX_SOFTWARE 70 +# define EX_OSERR 71 +# define EX_OSFILE 72 +# define EX_CANTCREAT 73 +# define EX_IOERR 74 +# define EX_TEMPFAIL 75 +# define EX_PROTOCOL 76 +# define EX_NOPERM 77 +# define EX_CONFIG 78 + +#endif + +#endif /* _GL_SYSEXITS_H */ +#endif /* _GL_SYSEXITS_H */ diff --git a/lib/sysexits_.h b/lib/sysexits_.h deleted file mode 100644 index b65e0ccc3..000000000 --- a/lib/sysexits_.h +++ /dev/null @@ -1,68 +0,0 @@ -/* exit() exit codes for some BSD system programs. - Copyright (C) 2003, 2006-2007 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -/* Written by Simon Josefsson based on sysexits(3) man page */ - -#ifndef _GL_SYSEXITS_H - -#if @HAVE_SYSEXITS_H@ - -/* IRIX 6.5 has an that defines a macro EX_OK with a nonzero - value. Override it. See - */ -# ifdef __sgi -# include -# undef EX_OK -# endif - -/* The include_next requires a split double-inclusion guard. */ -# @INCLUDE_NEXT@ @NEXT_SYSEXITS_H@ - -/* HP-UX 11 ends at EX_NOPERM. */ -# ifndef EX_CONFIG -# define EX_CONFIG 78 -# endif - -#endif - -#ifndef _GL_SYSEXITS_H -#define _GL_SYSEXITS_H - -#if !@HAVE_SYSEXITS_H@ - -# define EX_OK 0 /* same value as EXIT_SUCCESS */ - -# define EX_USAGE 64 -# define EX_DATAERR 65 -# define EX_NOINPUT 66 -# define EX_NOUSER 67 -# define EX_NOHOST 68 -# define EX_UNAVAILABLE 69 -# define EX_SOFTWARE 70 -# define EX_OSERR 71 -# define EX_OSFILE 72 -# define EX_CANTCREAT 73 -# define EX_IOERR 74 -# define EX_TEMPFAIL 75 -# define EX_PROTOCOL 76 -# define EX_NOPERM 77 -# define EX_CONFIG 78 - -#endif - -#endif /* _GL_SYSEXITS_H */ -#endif /* _GL_SYSEXITS_H */ diff --git a/modules/sysexits b/modules/sysexits index 955f91504..bb1b7e3b1 100644 --- a/modules/sysexits +++ b/modules/sysexits @@ -2,7 +2,7 @@ Description: Exit status codes for some BSD system programs. Files: -lib/sysexits_.h +lib/sysexits.in.h m4/sysexits.m4 Depends-on: @@ -16,12 +16,12 @@ BUILT_SOURCES += $(SYSEXITS_H) # We need the following in order to create when the system # doesn't have one that works with the given compiler. -sysexits.h: sysexits_.h +sysexits.h: sysexits.in.h { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''HAVE_SYSEXITS_H''@|$(HAVE_SYSEXITS_H)|g' \ -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ -e 's|@''NEXT_SYSEXITS_H''@|$(NEXT_SYSEXITS_H)|g' \ - < $(srcdir)/sysexits_.h; \ + < $(srcdir)/sysexits.in.h; \ } > $@-t mv -f $@-t $@ MOSTLYCLEANFILES += sysexits.h sysexits.h-t