X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fprereq.m4;h=407ee18ba57c321fc9e23426f7f22f87820c19e7;hb=77531436705e50d9efe2bb7d948fd4ebe43e69ad;hp=f38c2cf03e10d151d7d1826ef4b0e33a6732ae2a;hpb=257b70ef889ff4899730b755c01246f92fb852f9;p=gnulib.git

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index f38c2cf03..407ee18ba 100644
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,4 +1,4 @@
-#serial 8
+#serial 10
 
 dnl These are the prerequisite macros for files in the lib/
 dnl directories of the fileutils, sh-utils, and textutils packages.
@@ -56,22 +56,24 @@ AC_DEFUN(jm_PREREQ_GETPAGESIZE,
 
 AC_DEFUN(jm_PREREQ_QUOTEARG,
 [
-  AC_CHECK_FUNCS(isascii mbrtowc)
+  AC_CHECK_FUNCS(isascii iswprint mbrtowc)
   AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
   AC_HEADER_STDC
   AC_C_BACKSLASH_A
+  AC_MBSTATE_T_OBJECT
   AM_C_PROTOTYPES
 ])
 
 AC_DEFUN(jm_PREREQ_READUTMP,
 [
   AC_HEADER_STDC
-  AC_CHECK_HEADERS(string.h utmpx.h sys/param.h)
+  AC_CHECK_HEADERS(string.h utmp.h utmpx.h sys/param.h)
   AC_CHECK_FUNCS(utmpname)
   AC_CHECK_FUNCS(utmpxname)
   AM_C_PROTOTYPES
 
-  utmp_includes="\
+  if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then
+    utmp_includes="\
 $ac_includes_default
 #ifdef HAVE_UTMPX_H
 # include <utmpx.h>
@@ -79,10 +81,12 @@ $ac_includes_default
 # include <utmp.h>
 #endif
 "
-  AC_CHECK_MEMBERS([struct utmpx.ut_user],,,[$utmp_includes])
-  AC_CHECK_MEMBERS([struct utmp.ut_user],,,[$utmp_includes])
-  AC_CHECK_MEMBERS([struct utmpx.ut_name],,,[$utmp_includes])
-  AC_CHECK_MEMBERS([struct utmp.ut_name],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmpx.ut_user],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_user],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmpx.ut_name],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_name],,,[$utmp_includes])
+    AC_LIBOBJ(readutmp)
+  fi
 ])
 
 AC_DEFUN(jm_PREREQ_REGEX,