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

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index 3aecaed34..f478a14d9 100644
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,18 +1,63 @@
-#serial 2
+#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
 ])
 
-dnl FIXME: maybe put this in a separate file
+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_DEFUN(jm_PREREQ_QUOTEARG,
+[
+  AC_CHECK_FUNCS(isascii mbrtowc)
+  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
+  dnl FIXME: Maybe provide a btowc replacement someday: solaris-2.5.1 lacks it.
+  dnl FIXME: Check for wctype and iswctype, and and add -lw if necessary
+  dnl to get them.
   AC_CHECK_FUNCS(bzero bcopy isascii btowc)
   AC_CHECK_HEADERS(alloca.h libintl.h wctype.h wchar.h)
   AC_HEADER_STDC