X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fprereq.m4;h=f478a14d9f444f3e7b654d6b3065b7ddc255736b;hb=381b2b4eafe655cb3fcbe16f1f1944aa555a5c83;hp=d6372a57b696e77e408b988ce9df231f1ca7af00;hpb=b27f4c8d4c354bb0a369b031145dc0b40f02310a;p=gnulib.git

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index d6372a57b..f478a14d9 100644
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,35 +1,58 @@
-#serial 3
+#serial 5
 
 dnl These are the prerequisite macros for files in the lib/
 dnl directories of the fileutils, sh-utils, and textutils packages.
 
 AC_DEFUN(jm_PREREQ,
 [
+  jm_PREREQ_ADDEXT
   jm_PREREQ_CANON_HOST
   jm_PREREQ_ERROR
   jm_PREREQ_QUOTEARG
+  jm_PREREQ_READUTMP
   jm_PREREQ_REGEX
 ])
 
+AC_DEFUN(jm_PREREQ_ADDEXT,
+[
+  dnl For addext.c.
+  AC_SYS_LONG_FILE_NAMES
+  AC_CHECK_FUNC(pathconf)
+  AC_CHECK_HEADERS(limits.h string.h unistd.h)
+])
+
 AC_DEFUN(jm_PREREQ_CANON_HOST,
 [
+  dnl Add any libraries as early as possible.
+  dnl In particular, inet_ntoa needs -lnsl at least on Solaris5.5.1,
+  dnl so we have to add -lnsl to LIBS before checking for that function.
+  AC_SEARCH_LIBS(gethostbyname, [inet nsl])
+
+  dnl These come from -lnsl on Solaris5.5.1.
+  AC_CHECK_FUNCS(gethostbyname gethostbyaddr inet_ntoa)
+
   AC_CHECK_FUNCS(gethostbyname gethostbyaddr inet_ntoa)
   AC_CHECK_HEADERS(unistd.h string.h netdb.h sys/socket.h \
                    netinet/in.h arpa/inet.h)
-
-  AC_HEADER_STDC
-  AC_FUNC_ALLOCA
 ])
 
 AC_DEFUN(jm_PREREQ_QUOTEARG,
 [
   AC_CHECK_FUNCS(isascii mbrtowc)
-  AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h)
+  AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
   AC_HEADER_STDC
   AC_C_BACKSLASH_A
   AM_C_PROTOTYPES
 ])
 
+AC_DEFUN(jm_PREREQ_READUTMP,
+[
+  AC_HEADER_STDC
+  AC_CHECK_HEADERS(string.h utmpx.h sys/param.h)
+  AC_CHECK_FUNCS(utmpname)
+  AM_C_PROTOTYPES
+])
+
 AC_DEFUN(jm_PREREQ_REGEX,
 [
   dnl FIXME: Maybe provide a btowc replacement someday: solaris-2.5.1 lacks it.