From: Bruno Haible Date: Wed, 12 Jan 2005 12:48:16 +0000 (+0000) Subject: gnulib module 'exitfail'. X-Git-Tag: v0.14.2~175 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2cb66dc4c5be0256147b341814f92293253e637;p=thirdparty%2Fgettext.git gnulib module 'exitfail'. --- diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog index 1cb419861..1b84e1d3b 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,7 @@ +2005-01-06 Bruno Haible + + * configure.ac: Invoke gl_EXITFAIL. + 2005-01-06 Bruno Haible * configure.ac: Invoke gl_GETOPT. diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index 9cc99a8fd..d68e9a62d 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -127,6 +127,7 @@ AM_FUNC_GETLINE if test $am_cv_func_working_getline != yes; then AC_CHECK_FUNCS(getdelim) fi +gl_EXITFAIL gl_FUNC_FNMATCH_POSIX gl_GETOPT gl_FUNC_EACCESS diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog index 64284dfdc..76285dc82 100644 --- a/gettext-tools/lib/ChangeLog +++ b/gettext-tools/lib/ChangeLog @@ -1,3 +1,13 @@ +2005-01-06 Bruno Haible + + * exitfail.h: New file, from gnulib. + * exitfail.c: New file, from gnulib. + * Makefile.am (libgettextlib_la_SOURCES): Add exitfail.h, exitfail.c. + * Makefile.msvc (OBJECTS): Add exitfail.obj. + (exitfail.obj): New rule. + * Makefile.vms (OBJECTS): Add exitfail.obj. + (exitfail.obj): New rule. + 2005-01-06 Bruno Haible * Makefile.am (libgettextlib_la_SOURCES): Remove getopt files. diff --git a/gettext-tools/lib/Makefile.am b/gettext-tools/lib/Makefile.am index 284c03bd3..42340ecaf 100644 --- a/gettext-tools/lib/Makefile.am +++ b/gettext-tools/lib/Makefile.am @@ -47,6 +47,7 @@ libgettextlib_la_SOURCES = \ error-progname.h error-progname.c \ execute.h execute.c w32spawn.h \ exit.h \ + exitfail.h exitfail.c \ fatal-signal.h fatal-signal.c \ findprog.h findprog.c \ fstrcmp.h fstrcmp.c \ diff --git a/gettext-tools/lib/Makefile.msvc b/gettext-tools/lib/Makefile.msvc index 21b0397d6..ba4a3389f 100644 --- a/gettext-tools/lib/Makefile.msvc +++ b/gettext-tools/lib/Makefile.msvc @@ -93,6 +93,7 @@ OBJECTS = \ error.obj \ error-progname.obj \ execute.obj \ + exitfail.obj \ fatal-signal.obj \ findprog.obj \ fstrcmp.obj \ @@ -178,6 +179,9 @@ error-progname.obj : error-progname.c execute.obj : execute.c $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c execute.c +exitfail.obj : exitfail.c + $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c exitfail.c + fatal-signal.obj : fatal-signal.c $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c fatal-signal.c diff --git a/gettext-tools/lib/Makefile.vms b/gettext-tools/lib/Makefile.vms index 4017883e5..957d172c6 100644 --- a/gettext-tools/lib/Makefile.vms +++ b/gettext-tools/lib/Makefile.vms @@ -51,6 +51,7 @@ OBJECTS = \ error.obj, \ error-progname.obj, \ execute.obj, \ + exitfail.obj, \ fatal-signal.obj, \ findprog.obj, \ fstrcmp.obj, \ @@ -139,6 +140,9 @@ error-progname.obj : error-progname.c execute.obj : execute.c $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) execute.c +exitfail.obj : exitfail.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) exitfail.c + fatal-signal.obj : fatal-signal.c $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) fatal-signal.c diff --git a/gettext-tools/lib/exitfail.c b/gettext-tools/lib/exitfail.c new file mode 100644 index 000000000..2ae5f6955 --- /dev/null +++ b/gettext-tools/lib/exitfail.c @@ -0,0 +1,27 @@ +/* Failure exit status + + Copyright (C) 2002, 2003 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; see the file COPYING. + If not, write to the Free Software Foundation, + 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#if HAVE_CONFIG_H +# include +#endif + +#include "exitfail.h" +#include "exit.h" + +int volatile exit_failure = EXIT_FAILURE; diff --git a/gettext-tools/lib/exitfail.h b/gettext-tools/lib/exitfail.h new file mode 100644 index 000000000..cf5ab7195 --- /dev/null +++ b/gettext-tools/lib/exitfail.h @@ -0,0 +1,20 @@ +/* Failure exit status + + Copyright (C) 2002 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; see the file COPYING. + If not, write to the Free Software Foundation, + 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +extern int volatile exit_failure; diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog index 2e29b27ee..d2cd96c56 100644 --- a/gettext-tools/m4/ChangeLog +++ b/gettext-tools/m4/ChangeLog @@ -1,3 +1,8 @@ +2005-01-06 Bruno Haible + + * exitfail.m4: New file, from gnulib. + * Makefile.am (EXTRA_DIST): Add exitfail.m4. + 2005-01-06 Bruno Haible * Makefile.am (EXTRA_DIST): Add getopt.m4. diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am index 77b835f2c..41a9b35c7 100644 --- a/gettext-tools/m4/Makefile.am +++ b/gettext-tools/m4/Makefile.am @@ -55,6 +55,7 @@ csharpexec.m4 \ eaccess.m4 \ eealloc.m4 \ error.m4 \ +exitfail.m4 \ extensions.m4 \ fnmatch.m4 \ gcj.m4 \ diff --git a/gettext-tools/m4/exitfail.m4 b/gettext-tools/m4/exitfail.m4 new file mode 100644 index 000000000..fa5b14931 --- /dev/null +++ b/gettext-tools/m4/exitfail.m4 @@ -0,0 +1,13 @@ +# exitfail.m4 serial 3 +dnl Copyright (C) 2002, 2003 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 +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +AC_DEFUN([gl_EXITFAIL], +[ + dnl No prerequisites of lib/exitfail.c. + : +])