Compile strtoul.c only on platforms that need it.

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index aeeec0a3f3f74d744c2ce15461785e4d80d87477..a663e5735c8c6e85698615f888be46a9cc6b4b24 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-13  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac: Invoke gl_FUNC_STRTOUL instead of
+       AC_CHECK_FUNCS(strtoul).
+
 2005-02-11  Bruno Haible  <bruno@clisp.org>
 
        * windows/intl.rc: Bump version number to 0.14.2.

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index 8a6582570126c33612e8619e4003c6421987a228..66a3063145fe4664f34f49a2c2401ca881910f2d 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -84,11 +84,12 @@ AC_TYPE_SIZE_T
 dnl Checks for library functions.
 gl_ALLOCSA
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([setlocale strerror strtoul])
+AC_CHECK_FUNCS([setlocale strerror])
 AC_REPLACE_FUNCS([atexit memmove])
 gl_GETOPT
 gt_FUNC_SETENV
 gl_FUNC_STRERROR
+gl_FUNC_STRTOUL
 gl_FUNC_GLIBC_UNLOCKED_IO
 gl_ERROR
 gl_PATHMAX

diff --git a/gettext-runtime/lib/ChangeLog b/gettext-runtime/lib/ChangeLog
index 2f009c2d0fae1e492ab00a74d91eec0645d623f9..2bf7a7cb9b8b070c7a3ad71432ceebe4acdd33e9 100644 (file)
--- a/gettext-runtime/lib/ChangeLog
+++ b/gettext-runtime/lib/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-13  Bruno Haible  <bruno@clisp.org>
+
+       * strtoul.c: New file, trvial link to ../../gettext-tools/lib.
+       * Makefile.am (libgrt_a_SOURCES): Remove strtoul.c.
+       (LIBADD_SOURCE): Add strtoul.c here.
+
 2005-02-13  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (libgrt_a_SOURCES): Add allocsa.h, allocsa.c. Needed

diff --git a/gettext-runtime/lib/Makefile.am b/gettext-runtime/lib/Makefile.am
index 3c49904f2e10450ee7f6776a2ae3d1ba8a442605..1c4741d3bef12a6ef667d79ef313cf37be133595 100644 (file)
--- a/gettext-runtime/lib/Makefile.am
+++ b/gettext-runtime/lib/Makefile.am
@@ -34,7 +34,6 @@ libgrt_a_SOURCES = \
   ../../gettext-tools/lib/fwriteerror.h ../../gettext-tools/lib/fwriteerror.c \
   ../../gettext-tools/lib/pathmax.h \
   ../../gettext-tools/lib/progname.h ../../gettext-tools/lib/progname.c ../../gettext-tools/lib/progreloc.c \
-  ../../gettext-tools/lib/strtoul.c \
   ../../gettext-tools/lib/unlocked-io.h \
   ../../gettext-tools/lib/xalloc.h ../../gettext-tools/lib/xmalloc.c ../../gettext-tools/lib/xstrdup.c \
   ../../gettext-tools/lib/xreadlink.h ../../gettext-tools/lib/xreadlink.c
@@ -50,7 +49,8 @@ LIBADD_SOURCE = \
   readlink.c \
   ../../gettext-tools/lib/relocatable.h relocatable.c \
   ../../gettext-tools/lib/setenv.h setenv.c unsetenv.c \
-  strerror.c
+  strerror.c \
+  strtoul.c
 
 # How to build libgrt.a.
 

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 98a060176145502ff88a30741f1bb430e98d5e16..d352d8c1429d6e1f8ea37fb06f987658ab808c28 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-13  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac: Invoke gl_FUNC_STRTOUL. Keep AC_CHECK_FUNCS(strtoul)
+       because plural-exp.c needs it.
+
 2005-02-12  Bruno Haible  <bruno@clisp.org>
 
        * windows/gettextsrc.def: Remove po_parse_comment_filepos. Add

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 702817cabe5f268c1ede6e2e634bb6820d0eb8b1..8756f3a9344e3b6c53d728c8e9b7f3724ca906db 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -133,6 +133,7 @@ gl_GETOPT
 gl_FUNC_EACCESS
 gl_FUNC_STPNCPY
 gl_STRCASE
+gl_FUNC_STRTOUL
 gl_MBSWIDTH
 gt_PREREQ_BACKUPFILE
 AC_FUNC_VFORK

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 179e89319a94b9821698767de39c4b6479ea91f8..daf2d19ebec9ad279bd362b4ed5d75554af5a03d 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-13  Bruno Haible  <bruno@clisp.org>
+
+       * strtoul.m4: New file, from gnulib.
+       * strtol.m4: New file, from gnulib.
+       * Makefile.am (EXTRA_DIST): Add strtol.m4, strtoul.m4.
+
 2005-01-28  Bruno Haible  <bruno@clisp.org>
 
        * stpncpy.m4 (gl_FUNC_STPNCPY): Undo the replacement here. Because of

diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am
index f98a6a4d8324966d6d7b0d76c69cb499f5a7e0d6..7e24768e06f36b72922cfd3f3144a718d95c7dbb 100644 (file)
--- a/gettext-tools/m4/Makefile.am
+++ b/gettext-tools/m4/Makefile.am
@@ -92,6 +92,8 @@ strcase.m4 \
 strdup.m4 \
 strerror.m4 \
 strerror_r.m4 \
+strtol.m4 \
+strtoul.m4 \
 tmpdir.m4 \
 unionwait.m4 \
 unlocked-io.m4 \