.

diff --git a/m4/Makefile.am b/m4/Makefile.am
index 1326e5ad35f0623108298aed423d66c0bbb8b372..ad000e0eb18e29a4e1ba01d42b62dcfb709c2af6 100644 (file)
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,14 +1,14 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 
 ##m4-files-begin
-EXTRA_DIST = README Makefile.am.in assert.m4 check-decl.m4 chown.m4 \
-const.m4 d-ino.m4 d-type.m4 decl.m4 error.m4 fstypename.m4 getgroups.m4 \
-getline.m4 getloadavg.m4 gettext.m4 inttypes_h.m4 isc-posix.m4 \
-jm-glibc-io.m4 jm-macros.m4 jm-mktime.m4 jm-winsz1.m4 jm-winsz2.m4 \
-lchown.m4 lcmessage.m4 lfs.m4 ls-mntd-fs.m4 lstat.m4 malloc.m4 memcmp.m4 \
-perl.m4 prereq.m4 progtest.m4 putenv.m4 readdir.m4 realloc.m4 regex.m4 \
-ssize_t.m4 st_dm_mode.m4 st_mtim.m4 stat.m4 strftime.m4 uintmax_t.m4 \
-uptime.m4 utimbuf.m4 utime.m4 utimes.m4
+EXTRA_DIST = README Makefile.am.in assert.m4 check-decl.m4 check-type.m4 \
+chown.m4 const.m4 d-ino.m4 d-type.m4 decl.m4 error.m4 fstypename.m4 \
+getgroups.m4 getline.m4 getloadavg.m4 gettext.m4 inttypes_h.m4 \
+isc-posix.m4 jm-glibc-io.m4 jm-macros.m4 jm-mktime.m4 jm-winsz1.m4 \
+jm-winsz2.m4 lchown.m4 lcmessage.m4 lfs.m4 ls-mntd-fs.m4 lstat.m4 \
+malloc.m4 memcmp.m4 perl.m4 prereq.m4 progtest.m4 putenv.m4 readdir.m4 \
+realloc.m4 regex.m4 st_dm_mode.m4 st_mtim.m4 stat.m4 strftime.m4 \
+uintmax_t.m4 uptime.m4 utimbuf.m4 utime.m4 utimes.m4
 
 ##m4-files-end
 

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 8ee86fe562ac99ab75f94de8d4694d30717acb3d..9531b1314c8e57e15a14c1a1446631cd6b08f08f 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -89,14 +89,14 @@ VERSION = @VERSION@
 YACC = @YACC@
 l = @l@
 
-EXTRA_DIST = README Makefile.am.in assert.m4 check-decl.m4 chown.m4 \
-const.m4 d-ino.m4 d-type.m4 decl.m4 error.m4 fstypename.m4 getgroups.m4 \
-getline.m4 getloadavg.m4 gettext.m4 inttypes_h.m4 isc-posix.m4 \
-jm-glibc-io.m4 jm-macros.m4 jm-mktime.m4 jm-winsz1.m4 jm-winsz2.m4 \
-lchown.m4 lcmessage.m4 lfs.m4 ls-mntd-fs.m4 lstat.m4 malloc.m4 memcmp.m4 \
-perl.m4 prereq.m4 progtest.m4 putenv.m4 readdir.m4 realloc.m4 regex.m4 \
-ssize_t.m4 st_dm_mode.m4 st_mtim.m4 stat.m4 strftime.m4 uintmax_t.m4 \
-uptime.m4 utimbuf.m4 utime.m4 utimes.m4
+EXTRA_DIST = README Makefile.am.in assert.m4 check-decl.m4 check-type.m4 \
+chown.m4 const.m4 d-ino.m4 d-type.m4 decl.m4 error.m4 fstypename.m4 \
+getgroups.m4 getline.m4 getloadavg.m4 gettext.m4 inttypes_h.m4 \
+isc-posix.m4 jm-glibc-io.m4 jm-macros.m4 jm-mktime.m4 jm-winsz1.m4 \
+jm-winsz2.m4 lchown.m4 lcmessage.m4 lfs.m4 ls-mntd-fs.m4 lstat.m4 \
+malloc.m4 memcmp.m4 perl.m4 prereq.m4 progtest.m4 putenv.m4 readdir.m4 \
+realloc.m4 regex.m4 st_dm_mode.m4 st_mtim.m4 stat.m4 strftime.m4 \
+uintmax_t.m4 uptime.m4 utimbuf.m4 utime.m4 utimes.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 

diff --git a/m4/check-type.m4 b/m4/check-type.m4
new file mode 100644 (file)
index 0000000..3eb9dbb
--- /dev/null
+++ b/m4/check-type.m4
@@ -0,0 +1,28 @@
+#serial 1
+
+dnl Just like AC_CHECK_TYPE from autoconf-2.12, but also checks in unistd.h
+dnl on systems that have it.  Fujitsu UXP/V needs this for ssize_t.
+
+undefine([AC_CHECK_TYPE])
+dnl AC_CHECK_TYPE(TYPE, DEFAULT)
+AC_DEFUN(AC_CHECK_TYPE,
+[AC_REQUIRE([AC_HEADER_STDC])dnl
+AC_CHECK_HEADERS(unistd.h)
+AC_MSG_CHECKING(for $1)
+AC_CACHE_VAL(ac_cv_type_$1,
+[AC_EGREP_CPP(dnl
+changequote(<<,>>)dnl
+<<$1[^a-zA-Z_0-9]>>dnl
+changequote([,]), [#include <sys/types.h>
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
+AC_MSG_RESULT($ac_cv_type_$1)
+if test $ac_cv_type_$1 = no; then
+  AC_DEFINE($1, $2)
+fi
+])

diff --git a/m4/ssize_t.m4 b/m4/ssize_t.m4
deleted file mode 100644 (file)
index 7f2e6d9..0000000
--- a/m4/ssize_t.m4
+++ /dev/null
@@ -1,19 +0,0 @@
-#serial 1
-
-dnl From Jim Meyering
-
-# If ssize_t is not defined in sys/types.h, define it to `int'.
-
-AC_DEFUN(jm_TYPE_SSIZE_T,
-  [AC_CACHE_CHECK(for ssize_t in sys/types.h, jm_ac_cv_type_ssize_t,
-    [
-      AC_EGREP_HEADER(ssize_t, sys/types.h,
-                     jm_ac_cv_type_ssize_t=yes,
-                     jm_ac_cv_type_ssize_t=no)
-      if test $jm_ac_cv_type_ssize_t = no; then
-       AC_DEFINE(ssize_t, int)
-      fi
-    ]
-   )
-  ]
-)