projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use `""', not `<>' to #include non-system header files.
[gnulib.git]
/
m4
/
prereq.m4
diff --git
a/m4/prereq.m4
b/m4/prereq.m4
index
cfa5aad
..
d1f8a1d
100644
(file)
--- a/
m4/prereq.m4
+++ b/
m4/prereq.m4
@@
-1,14
+1,15
@@
-#serial
19
+#serial
21
dnl These are the prerequisite macros for files in the lib/
dnl directories of the fileutils, sh-utils, and textutils packages.
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
,
+AC_DEFUN(
[jm_PREREQ]
,
[
jm_PREREQ_ADDEXT
jm_PREREQ_CANON_HOST
jm_PREREQ_DIRNAME
jm_PREREQ_ERROR
[
jm_PREREQ_ADDEXT
jm_PREREQ_CANON_HOST
jm_PREREQ_DIRNAME
jm_PREREQ_ERROR
+ jm_PREREQ_EXCLUDE
jm_PREREQ_GETPAGESIZE
jm_PREREQ_HASH
jm_PREREQ_HUMAN
jm_PREREQ_GETPAGESIZE
jm_PREREQ_HASH
jm_PREREQ_HUMAN
@@
-20,7
+21,7
@@
AC_DEFUN(jm_PREREQ,
jm_PREREQ_TEMPNAME # called by mkstemp
])
jm_PREREQ_TEMPNAME # called by mkstemp
])
-AC_DEFUN(
jm_PREREQ_ADDEXT
,
+AC_DEFUN(
[jm_PREREQ_ADDEXT]
,
[
dnl For addext.c.
AC_SYS_LONG_FILE_NAMES
[
dnl For addext.c.
AC_SYS_LONG_FILE_NAMES
@@
-28,7
+29,7
@@
AC_DEFUN(jm_PREREQ_ADDEXT,
AC_CHECK_HEADERS(limits.h string.h unistd.h)
])
AC_CHECK_HEADERS(limits.h string.h unistd.h)
])
-AC_DEFUN(
jm_PREREQ_CANON_HOST
,
+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 Add any libraries as early as possible.
dnl In particular, inet_ntoa needs -lnsl at least on Solaris5.5.1,
@@
-43,40
+44,45
@@
AC_DEFUN(jm_PREREQ_CANON_HOST,
netinet/in.h arpa/inet.h)
])
netinet/in.h arpa/inet.h)
])
-AC_DEFUN(
jm_PREREQ_DIRNAME
,
+AC_DEFUN(
[jm_PREREQ_DIRNAME]
,
[
AC_HEADER_STDC
AC_CHECK_HEADERS(string.h)
])
[
AC_HEADER_STDC
AC_CHECK_HEADERS(string.h)
])
-AC_DEFUN(jm_PREREQ_GETPAGESIZE,
+AC_DEFUN([jm_PREREQ_EXCLUDE],
+[
+ jm_FUNC_FNMATCH
+ AC_CHECK_HEADERS(stdbool.h)
+])
+
+AC_DEFUN([jm_PREREQ_GETPAGESIZE],
[
AC_CHECK_FUNCS(getpagesize)
AC_CHECK_HEADERS(OS.h unistd.h)
])
[
AC_CHECK_FUNCS(getpagesize)
AC_CHECK_HEADERS(OS.h unistd.h)
])
-AC_DEFUN(
jm_PREREQ_HASH
,
+AC_DEFUN(
[jm_PREREQ_HASH]
,
[
AC_CHECK_HEADERS(stdlib.h stdbool.h)
AC_REQUIRE([jm_CHECK_DECLS])
])
# If you use human.c, you need the following files:
[
AC_CHECK_HEADERS(stdlib.h stdbool.h)
AC_REQUIRE([jm_CHECK_DECLS])
])
# If you use human.c, you need the following files:
-#
uintmax_t.m4 inttypes_h
.m4 ulonglong.m4
-AC_DEFUN(
jm_PREREQ_HUMAN
,
+#
inttypes
.m4 ulonglong.m4
+AC_DEFUN(
[jm_PREREQ_HUMAN]
,
[
AC_CHECK_HEADERS(limits.h stdlib.h string.h)
AC_CHECK_DECLS([getenv])
[
AC_CHECK_HEADERS(limits.h stdlib.h string.h)
AC_CHECK_DECLS([getenv])
- AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
])
AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
])
-AC_DEFUN(
jm_PREREQ_MEMCHR
,
+AC_DEFUN(
[jm_PREREQ_MEMCHR]
,
[
AC_CHECK_HEADERS(limits.h stdlib.h bp-sym.h)
])
[
AC_CHECK_HEADERS(limits.h stdlib.h bp-sym.h)
])
-AC_DEFUN(
jm_PREREQ_QUOTEARG
,
+AC_DEFUN(
[jm_PREREQ_QUOTEARG]
,
[
AC_CHECK_FUNCS(isascii iswprint)
jm_FUNC_MBRTOWC
[
AC_CHECK_FUNCS(isascii iswprint)
jm_FUNC_MBRTOWC
@@
-87,7
+93,7
@@
AC_DEFUN(jm_PREREQ_QUOTEARG,
AM_C_PROTOTYPES
])
AM_C_PROTOTYPES
])
-AC_DEFUN(
jm_PREREQ_READUTMP
,
+AC_DEFUN(
[jm_PREREQ_READUTMP]
,
[
AC_HEADER_STDC
AC_CHECK_HEADERS(string.h utmp.h utmpx.h sys/param.h)
[
AC_HEADER_STDC
AC_CHECK_HEADERS(string.h utmp.h utmpx.h sys/param.h)
@@
-115,7
+121,7
@@
$ac_includes_default
fi
])
fi
])
-AC_DEFUN(
jm_PREREQ_REGEX
,
+AC_DEFUN(
[jm_PREREQ_REGEX]
,
[
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 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
@@
-126,7
+132,7
@@
AC_DEFUN(jm_PREREQ_REGEX,
AC_FUNC_ALLOCA
])
AC_FUNC_ALLOCA
])
-AC_DEFUN(
jm_PREREQ_TEMPNAME
,
+AC_DEFUN(
[jm_PREREQ_TEMPNAME]
,
[
AC_HEADER_STDC
AC_HEADER_STAT
[
AC_HEADER_STDC
AC_HEADER_STAT