merge with 0.10.25

8 files changed, 44 insertions, 21 deletions

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 1d76ceb..5007eac 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,17 @@
+Fri Nov 22 04:01:58 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* finddomain.c [!HAVE_STRING_H && !_LIBC]: Define memcpy using
+ 	bcopy if not already defined.  Reported by Thomas Esken.
+	* bindtextdom.c: Likewise.
+	* l10nflist.c: Likewise.
+	* localealias.c: Likewise.
+	* textdomain.c: Likewise.
+
+Tue Oct 29 11:10:27 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Makefile.in (libdir): Change to use exec_prefix instead of
+ 	prefix.  Reported by Knut-HåvardAksnes <etokna@eto.ericsson.se>.
+
 Sat Aug 31 03:07:09 1996  Ulrich Drepper  <drepper@cygnus.com>
 
 	* l10nflist.c (_nl_normalize_codeset): We convert to lower case,
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 18c5f53..474f72d 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -27,7 +27,7 @@ VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 transform = @program_transform_name@
-libdir = $(prefix)/lib
+libdir = $(exec_prefix)/lib
 includedir = $(prefix)/include
 datadir = $(prefix)/@DATADIRNAME@
 localedir = $(datadir)/locale
diff --git a/intl/VERSION b/intl/VERSION
index ae9ea49..1da3429 100644
--- a/intl/VERSION
+++ b/intl/VERSION
@@ -1 +1 @@
-GNU gettext library from gettext-0.10.24
+GNU gettext library from gettext-0.10.25
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index bd9f422..6a3b3e1 100644
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -1,5 +1,5 @@
 /* bindtextdom.c -- implementation of the bindtextdomain(3) function
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996 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
@@ -33,6 +33,9 @@ void free ();
 # include <string.h>
 #else
 # include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
 #endif
 
 #ifdef _LIBC
diff --git a/intl/finddomain.c b/intl/finddomain.c
index a1b2a2e..ba5c33e 100644
--- a/intl/finddomain.c
+++ b/intl/finddomain.c
@@ -39,11 +39,12 @@ void free ();
 # include <string.h>
 #else
 # include <strings.h>
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
 # endif
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
 #endif
 
 #if defined HAVE_UNISTD_H || defined _LIBC
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index fd097d7..7db63db 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -28,11 +28,12 @@ Boston, MA 02111-1307, USA.  */
 # include <string.h>
 #else
 # include <strings.h>
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
 # endif
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
 #endif
 
 #if defined _LIBC || defined HAVE_ARGZ_H
diff --git a/intl/localealias.c b/intl/localealias.c
index 7aee6a8..e3eb5b8 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -58,11 +58,12 @@ void free ();
 # include <string.h>
 #else
 # include <strings.h>
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
 # endif
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
 #endif
 
 #include "gettext.h"
diff --git a/intl/textdomain.c b/intl/textdomain.c
index c06642b..ae3f069 100644
--- a/intl/textdomain.c
+++ b/intl/textdomain.c
@@ -1,19 +1,19 @@
 /* textdomain.c -- implementation of the textdomain(3) function
-   Copyright (C) 1995 Software Foundation, Inc.
+   Copyright (C) 1995, 1996 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 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.
+   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.  */
+   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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -33,6 +33,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include <libintl.h>
 #else
 # include "libgettext.h"
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
 #endif
 
 /* @@ end of prolog @@ */