From: Akim Demaille <akim@epita.fr> Date: Thu, 12 Sep 2002 16:11:55 +0000 (+0000) Subject: * m4/prereq.m4: Update, from Fileutils 4.1.5. X-Git-Tag: BISON-1_49c~13 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/d862b1be600710ea36579a5ff867e583491248bb?hp=f414d77d3876f559ac0af33285b9a9235f54a58f * m4/prereq.m4: Update, from Fileutils 4.1.5. * configure.ac (jm_PREREQ_TEMPNAME): Invoke it. Reported by Martin Mokrejs. --- diff --git a/ChangeLog b/ChangeLog index 586d8a45..41ffcad7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-09-12 Akim Demaille <akim@epita.fr> + + * m4/prereq.m4: Update, from Fileutils 4.1.5. + * configure.ac (jm_PREREQ_TEMPNAME): Invoke it. + Reported by Martin Mokrejs. + 2002-09-10 Akim Demaille <akim@epita.fr> * src/parse-gram.y: Associate a human readable string to each diff --git a/THANKS b/THANKS index 6084c7bc..ba76e761 100644 --- a/THANKS +++ b/THANKS @@ -28,6 +28,7 @@ Keith Browne kbrowne@legato.com Laurent Mascherpa laurent.mascherpa@epita.fr Magnus Fromreide magfr@lysator.liu.se Marc Autret autret_m@epita.fr +Martin Mokrejs mmokrejs@natur.cuni.cz Matt Kraai kraai@alumni.cmu.edu Michael Hayes m.hayes@elec.canterbury.ac.nz Mike Castle dalgoda@ix.netcom.com diff --git a/m4/prereq.m4 b/m4/prereq.m4 index f2956db1..1c5e54a0 100644 --- a/m4/prereq.m4 +++ b/m4/prereq.m4 @@ -1,15 +1,159 @@ -#serial 2 +#serial 22 dnl These are the prerequisite macros for files in the lib/ -dnl directories of Bison. +dnl directories of the fileutils, sh-utils, and textutils packages. + +AC_DEFUN([jm_PREREQ], +[ + 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_MBSWIDTH + jm_PREREQ_MEMCHR + jm_PREREQ_PHYSMEM + jm_PREREQ_QUOTEARG + jm_PREREQ_READUTMP + jm_PREREQ_REGEX + jm_PREREQ_TEMPNAME # called by mkstemp + jm_PREREQ_XGETCWD + jm_PREREQ_XREADLINK +]) + +AC_DEFUN([jm_PREREQ_ADDEXT], +[ + dnl For addext.c. + AC_SYS_LONG_FILE_NAMES + AC_CHECK_FUNCS(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_DIRNAME], +[ + AC_HEADER_STDC + AC_CHECK_HEADERS(string.h) +]) + +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) +]) + +# If you use human.c, you need the following files: +# inttypes.m4 ulonglong.m4 +AC_DEFUN([jm_PREREQ_HUMAN], +[ + AC_CHECK_HEADERS(limits.h stdlib.h string.h) + AC_CHECK_DECLS([getenv]) + AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) +]) + +AC_DEFUN([jm_PREREQ_MEMCHR], +[ + AC_CHECK_HEADERS(limits.h stdlib.h bp-sym.h) +]) + +AC_DEFUN([jm_PREREQ_PHYSMEM], +[ + AC_CHECK_HEADERS(sys/pstat.h unistd.h) + AC_CHECK_FUNCS(pstat_getstatic pstat_getdynamic) +]) AC_DEFUN([jm_PREREQ_QUOTEARG], [ - AC_CHECK_FUNCS(isascii iswprint mbsinit) + AC_CHECK_FUNCS(isascii iswprint) jm_FUNC_MBRTOWC AC_CHECK_HEADERS(limits.h stddef.h stdlib.h string.h wchar.h wctype.h) AC_HEADER_STDC AC_C_BACKSLASH_A - AC_TYPE_MBSTATE_T + AC_MBSTATE_T AM_C_PROTOTYPES ]) + +AC_DEFUN([jm_PREREQ_READUTMP], +[ + AC_HEADER_STDC + AC_CHECK_HEADERS(string.h utmp.h utmpx.h sys/param.h) + AC_CHECK_FUNCS(utmpname) + AC_CHECK_FUNCS(utmpxname) + AM_C_PROTOTYPES + + 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> +#endif +#ifdef HAVE_UTMP_H +# 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_type],,,[$utmp_includes]) + AC_CHECK_MEMBERS([struct utmp.ut_type],,,[$utmp_includes]) + AC_LIBOBJ(readutmp) + fi +]) + +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 to get them. + AC_CHECK_FUNCS(bzero bcopy isascii btowc) + AC_CHECK_HEADERS(alloca.h libintl.h wctype.h wchar.h) + AC_HEADER_STDC + AC_FUNC_ALLOCA +]) + +AC_DEFUN([jm_PREREQ_TEMPNAME], +[ + AC_HEADER_STDC + AC_HEADER_STAT + AC_CHECK_HEADERS(fcntl.h sys/time.h stdint.h unistd.h) + AC_CHECK_FUNCS(__secure_getenv gettimeofday) + AC_CHECK_DECLS([getenv]) +]) + +AC_DEFUN([jm_PREREQ_XGETCWD], +[ + AC_C_PROTOTYPES + AC_CHECK_HEADERS(limits.h stdlib.h sys/param.h unistd.h) + AC_CHECK_FUNCS(getcwd) + AC_FUNC_GETCWD_NULL +]) + +AC_DEFUN([jm_PREREQ_XREADLINK], +[ + AC_C_PROTOTYPES + AC_CHECK_HEADERS(limits.h stdlib.h sys/types.h unistd.h) +])