From: Ben Pfaff <blp@gnu.org>
Date: Tue, 30 Dec 2003 04:40:05 +0000 (+0000)
Subject: Sat Dec 27 16:37:07 2003  Ben Pfaff  <blp@gnu.org>
X-Git-Tag: v0.4.0~403
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9dcb1c23a48b9db5444b9f10aac0748b83898ad;p=pspp-builds.git

Sat Dec 27 16:37:07 2003  Ben Pfaff  <blp@gnu.org>

	* Makefile.am: (EXTRA_DIST) Add getopt.c, getopt1.c, memcpy.c,
	strstr.c, which weren't being distributed for whatever reason.

	* gettext.h: Removed.  We use the copy in intl/.
---

diff --git a/lib/misc/ChangeLog b/lib/misc/ChangeLog
index 3845fa6e..d0a92698 100644
--- a/lib/misc/ChangeLog
+++ b/lib/misc/ChangeLog
@@ -1,3 +1,10 @@
+Sat Dec 27 16:37:07 2003  Ben Pfaff  <blp@gnu.org>
+
+	* Makefile.am: (EXTRA_DIST) Add getopt.c, getopt1.c, memcpy.c,
+	strstr.c, which weren't being distributed for whatever reason.
+
+	* gettext.h: Removed.  We use the copy in intl/.
+	
 Fri Dec 12 22:59:37 2003  Ben Pfaff  <blp@gnu.org>
 
 	* qsort.c: Removed because it was unused.
diff --git a/lib/misc/Makefile.am b/lib/misc/Makefile.am
index 15a2a9a0..1a149fa4 100644
--- a/lib/misc/Makefile.am
+++ b/lib/misc/Makefile.am
@@ -8,4 +8,6 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir)/src -I$(top_srcdir) \
 libmisc_a_SOURCES =
 libmisc_a_LIBADD = $(ALLOCA) $(LIBOBJS)
 
+EXTRA_DIST = getopt.c getopt1.c memcpy.c strstr.c
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/lib/misc/gettext.h b/lib/misc/gettext.h
deleted file mode 100644
index 8b262f4c..00000000
--- a/lib/misc/gettext.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifndef _LIBGETTEXT_H
-#define _LIBGETTEXT_H 1
-
-/* NLS can be disabled through the configure --disable-nls option.  */
-#if ENABLE_NLS
-
-/* Get declarations of GNU message catalog functions.  */
-# include <libintl.h>
-
-#else
-
-/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
-   chokes if dcgettext is defined as a macro.  So include it now, to make
-   later inclusions of <locale.h> a NOP.  We don't include <libintl.h>
-   as well because people using "gettext.h" will not include <libintl.h>,
-   and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
-   is OK.  */
-#if defined(__sun)
-# include <locale.h>
-#endif
-
-/* Disabled NLS.
-   The casts to 'const char *' serve the purpose of producing warnings
-   for invalid uses of the value returned from these functions.
-   On pre-ANSI systems without 'const', the config.h file is supposed to
-   contain "#define const".  */
-# define gettext(Msgid) ((const char *) (Msgid))
-# define dgettext(Domainname, Msgid) ((const char *) (Msgid))
-# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
-# define ngettext(Msgid1, Msgid2, N) \
-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-# define dngettext(Domainname, Msgid1, Msgid2, N) \
-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-# define textdomain(Domainname) ((const char *) (Domainname))
-# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
-# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
-
-#endif
-
-/* A pseudo function call that serves as a marker for the automated
-   extraction of messages, but does not call gettext().  The run-time
-   translation is done at a different place in the code.
-   The argument, String, should be a literal string.  Concatenated strings
-   and other string expressions won't work.
-   The macro's expansion is not parenthesized, so that it is suitable as
-   initializer for static 'char[]' or 'const char[]' variables.  */
-#define gettext_noop(String) String
-
-#endif /* _LIBGETTEXT_H */