Tweaks and distribution dependencies.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index f7f3eeb57ab34bbf751fcdb9cc8978bc47d59710..1b160ef7ec042c64a81ff89634b99f01192ab4e7 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,11 @@
+2001-03-09  Bruno Haible  <haible@clisp.cons.org>
+
+       * Makefile.am (aclocal_DATA): Add codeset.m4 and iconv.m4, both needed
+       by gettext.m4.
+
+       * iconv.m4 (AM_ICONV): Cosmetic tweaks.
+       * setlocale.m4 (gt_SETLOCALE): Likewise.
+
 2001-03-06  Bruno Haible  <haible@clisp.cons.org>
 
        * signed.m4: New file.

diff --git a/m4/Makefile.am b/m4/Makefile.am
index 0fd32ba746e10aea6efed9481d70d66373a7e9dd..caeb647589cae8a5af3ed4cf5db775abc302dcb6 100644 (file)
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 
 aclocaldir = @aclocaldir@
-aclocal_DATA = gettext.m4 isc-posix.m4 lcmessage.m4 progtest.m4
+aclocal_DATA = codeset.m4 gettext.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4
 
 # Generate this list with
 # find . -type f -name '*.m4' -printf '%f\n'|sort |fmt |tr '\012' @ \

diff --git a/m4/iconv.m4 b/m4/iconv.m4
index c4a50c21a949caf1dbd12aa8553f90d04f34733f..f920575b3fc39e18fefa7af2ffb4e395613292d9 100644 (file)
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -40,12 +40,12 @@ extern
 "C"
 #endif
 #if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t* outbytesleft);
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
 #else
 size_t iconv();
 #endif
 ], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t* outbytesleft);"])
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
     am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
     AC_MSG_RESULT([$]{ac_t:-
          }[$]am_cv_proto_iconv)

diff --git a/m4/setlocale.m4 b/m4/setlocale.m4
index a05624dfce4b9be31245e127abf943bf3857543e..5dc76e13782f27fb982a2b107579881182d2f8d4 100644 (file)
--- a/m4/setlocale.m4
+++ b/m4/setlocale.m4
@@ -9,13 +9,17 @@ AC_CACHE_VAL(gt_cv_proto_setlocale, [
 AC_TRY_COMPILE([
 #include <stdlib.h>
 #include <locale.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
 #if defined(__STDC__) || defined(__cplusplus)
-char* setlocale (int category, char* locale);
+char *setlocale (int category, char *locale);
 #else
-char* setlocale();
+char *setlocale();
 #endif
 ], [], gt_cv_proto_setlocale_arg1="", gt_cv_proto_setlocale_arg1="const")
-gt_cv_proto_setlocale="extern char* setlocale (int, $gt_cv_proto_setlocale_arg1 char*);"])
+gt_cv_proto_setlocale="extern char *setlocale (int category, $gt_cv_proto_setlocale_arg1 char *locale);"])
 gt_cv_proto_setlocale=`echo "[$]gt_cv_proto_setlocale" | tr -s ' ' | sed -e 's/( /(/'`
 AC_MSG_RESULT([$]{ac_t:-
          }[$]gt_cv_proto_setlocale)