From e555c2fb78498394ed6fa93306d40093c5588bdb Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Tue, 14 Nov 2000 10:31:39 +0000 Subject: [PATCH] Create acheaders.m4. * acgeneral.m4 (AC_CHECK_HEADER, AC_CHECK_HEADERS) (AH_CHECK_HEADERS): Move to... * acheaders.m4: here, a new file. * acspecific.m4 (_AC_CHECK_HEADER_DIRENT, AH_CHECK_HEADERS_DIRENT) (AC_HEADER_DIRENT, AC_HEADER_MAJOR, AC_HEADER_STAT, AC_HEADER_STDC) (AC_HEADER_SYS_WAIT, AC_HEADER_TIME) (_AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H) (_AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL, AC_HEADER_TIOCGWINSZ): Move to... * acheaders.m4: here. --- ChangeLog | 15 ++ Makefile.am | 2 +- Makefile.in | 2 +- acgeneral.m4 | 39 ---- acheaders.m4 | 442 +++++++++++++++++++++++++++++++++++++++ acspecific.m4 | 345 ------------------------------ autoconf.m4 | 1 + lib/autoconf/autoconf.m4 | 1 + lib/autoconf/general.m4 | 39 ---- lib/autoconf/headers.m4 | 442 +++++++++++++++++++++++++++++++++++++++ lib/autoconf/specific.m4 | 345 ------------------------------ tests/Makefile.am | 2 +- tests/Makefile.in | 2 +- 13 files changed, 905 insertions(+), 772 deletions(-) create mode 100644 acheaders.m4 create mode 100644 lib/autoconf/headers.m4 diff --git a/ChangeLog b/ChangeLog index 08ed65f6..58a32b07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2000-11-14 Akim Demaille + + Create acheaders.m4. + + * acgeneral.m4 (AC_CHECK_HEADER, AC_CHECK_HEADERS) + (AH_CHECK_HEADERS): Move to... + * acheaders.m4: here, a new file. + * acspecific.m4 (_AC_CHECK_HEADER_DIRENT, AH_CHECK_HEADERS_DIRENT) + (AC_HEADER_DIRENT, AC_HEADER_MAJOR, AC_HEADER_STAT, AC_HEADER_STDC) + (AC_HEADER_SYS_WAIT, AC_HEADER_TIME) + (_AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H) + (_AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL, AC_HEADER_TIOCGWINSZ): Move + to... + * acheaders.m4: here. + 2000-11-14 Akim Demaille Move AC_MSG_* into M4sh. diff --git a/Makefile.am b/Makefile.am index ab897187..f4b4db43 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,7 +38,7 @@ EXTRA_SCRIPTS = autoscan m4sources = m4sugar.m4 m4sh.m4 \ autoconf.m4 \ acgeneral.m4 acoldnames.m4 acspecific.m4 aclang.m4 acversion.m4 \ - acfunctions.m4 + acfunctions.m4 acheaders.m4 distpkgdataDATA = acfunctions acheaders acidentifiers acmakevars acprograms \ $(m4sources) diff --git a/Makefile.in b/Makefile.in index 0720087a..453eb714 100644 --- a/Makefile.in +++ b/Makefile.in @@ -80,7 +80,7 @@ EXTRA_SCRIPTS = autoscan # s/nodistpackageDATA/nodist_pkgdata_DATA/ # and adapt dependencies once we use a more recent Automake -m4sources = m4sugar.m4 m4sh.m4 autoconf.m4 acgeneral.m4 acoldnames.m4 acspecific.m4 aclang.m4 acversion.m4 acfunctions.m4 +m4sources = m4sugar.m4 m4sh.m4 autoconf.m4 acgeneral.m4 acoldnames.m4 acspecific.m4 aclang.m4 acversion.m4 acfunctions.m4 acheaders.m4 distpkgdataDATA = acfunctions acheaders acidentifiers acmakevars acprograms $(m4sources) diff --git a/acgeneral.m4 b/acgeneral.m4 index 3a87c4b7..86482aac 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -2993,45 +2993,6 @@ fi -## --------------------------- ## -## Checking for header files. ## -## --------------------------- ## - - -# AC_CHECK_HEADER(HEADER-FILE, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ---------------------------------------------------------------------- -AC_DEFUN([AC_CHECK_HEADER], -[AC_VAR_PUSHDEF([ac_Header], [ac_cv_header_$1])dnl -AC_ARG_VAR([CPPFLAGS], [C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory ]) -AC_CACHE_CHECK([for $1], ac_Header, -[AC_TRY_CPP([#include <$1> -], -AC_VAR_SET(ac_Header, yes), AC_VAR_SET(ac_Header, no))]) -AS_IFELSE([test AC_VAR_GET(ac_Header) = yes], - [$2], [$3])dnl -AC_VAR_POPDEF([ac_Header])dnl -])# AC_CHECK_HEADER - - -m4_define([AH_CHECK_HEADERS], -[AC_FOREACH([AC_Header], [$1], - [AH_TEMPLATE(AC_TR_CPP(HAVE_[]AC_Header), - [Define if you have the <]AC_Header[> header file.])])]) - -# AC_CHECK_HEADERS(HEADER-FILE... -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ---------------------------------------------------------- -AC_DEFUN([AC_CHECK_HEADERS], -[AH_CHECK_HEADERS([$1])dnl -for ac_header in $1 -do -AC_CHECK_HEADER($ac_header, - [AC_DEFINE_UNQUOTED(AC_TR_CPP(HAVE_$ac_header)) $2], - [$3])dnl -done -]) - - ## ------------------------------------- ## ## Checking for the existence of files. ## ## ------------------------------------- ## diff --git a/acheaders.m4 b/acheaders.m4 new file mode 100644 index 00000000..bb93fab7 --- /dev/null +++ b/acheaders.m4 @@ -0,0 +1,442 @@ +# This file is part of Autoconf. -*- Autoconf -*- +# Checking for headers. +# Copyright 2000 +# Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. +# +# As a special exception, the Free Software Foundation gives unlimited +# permission to copy, distribute and modify the configure scripts that +# are the output of Autoconf. You need not follow the terms of the GNU +# General Public License when using or distributing such scripts, even +# though portions of the text of Autoconf appear in them. The GNU +# General Public License (GPL) does govern all other use of the material +# that constitutes the Autoconf program. +# +# Certain portions of the Autoconf source text are designed to be copied +# (in certain cases, depending on the input) into the output of +# Autoconf. We call these the "data" portions. The rest of the Autoconf +# source text consists of comments plus executable code that decides which +# of the data portions to output in any given case. We call these +# comments and executable code the "non-data" portions. Autoconf never +# copies any of the non-data portions into its output. +# +# This special exception to the GPL applies to versions of Autoconf +# released by the Free Software Foundation. When you make and +# distribute a modified version of Autoconf, you may extend this special +# exception to the GPL to apply to your modified version as well, *unless* +# your modified version has the potential to copy into its output some +# of the text that was the non-data portion of the version that you started +# with. (In other words, unless your change moves or copies text from +# the non-data portions to the data portions.) If your modification has +# such potential, you must delete any notice of this special exception +# to the GPL from your modified version. +# +# Written by David MacKenzie, with help from +# Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor, +# Roland McGrath, Noah Friedman, david d zuhn, and many others. + + +# Table of contents +# +# 1. Generic tests for headers +# 2. Tests for specific headers + + +## ------------------------------ ## +## 1. Generic tests for headers. ## +## ------------------------------ ## + +# AC_CHECK_HEADER(HEADER-FILE, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ---------------------------------------------------------------------- +AC_DEFUN([AC_CHECK_HEADER], +[AC_VAR_PUSHDEF([ac_Header], [ac_cv_header_$1])dnl +AC_ARG_VAR([CPPFLAGS], [C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory ]) +AC_CACHE_CHECK([for $1], ac_Header, +[AC_TRY_CPP([#include <$1> +], +AC_VAR_SET(ac_Header, yes), AC_VAR_SET(ac_Header, no))]) +AS_IFELSE([test AC_VAR_GET(ac_Header) = yes], + [$2], [$3])dnl +AC_VAR_POPDEF([ac_Header])dnl +])# AC_CHECK_HEADER + + +# AH_CHECK_HEADERS(HEADER-FILE...) +# -------------------------------- +m4_define([AH_CHECK_HEADERS], +[AC_FOREACH([AC_Header], [$1], + [AH_TEMPLATE(AC_TR_CPP(HAVE_[]AC_Header), + [Define if you have the <]AC_Header[> header file.])])]) + + +# AC_CHECK_HEADERS(HEADER-FILE... +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ---------------------------------------------------------- +AC_DEFUN([AC_CHECK_HEADERS], +[AH_CHECK_HEADERS([$1])dnl +for ac_header in $1 +do +AC_CHECK_HEADER($ac_header, + [AC_DEFINE_UNQUOTED(AC_TR_CPP(HAVE_$ac_header)) $2], + [$3])dnl +done +]) + + + + + +## ------------------------------- ## +## 2. Tests for specific headers. ## +## ------------------------------- ## + + +# _AC_CHECK_HEADER_DIRENT(HEADER-FILE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT_FOUND]) +# ----------------------------------------------------------------- +# Like AC_CHECK_HEADER, except also make sure that HEADER-FILE +# defines the type `DIR'. dirent.h on NextStep 3.2 doesn't. +m4_define([_AC_CHECK_HEADER_DIRENT], +[AC_VAR_PUSHDEF([ac_Header], [ac_cv_header_dirent_$1])dnl +AC_CACHE_CHECK([for $1 that defines DIR], ac_Header, +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include +#include <$1> +], + [DIR *dirp = 0;])], + [AC_VAR_SET(ac_Header, yes)], + [AC_VAR_SET(ac_Header, no)])]) +AS_IFELSE([test AC_VAR_GET(ac_Header) = yes], + [$2], [$3])dnl +AC_VAR_POPDEF([ac_Header])dnl +])# _AC_CHECK_HEADER_DIRENT + + +# AH_CHECK_HEADERS_DIRENT(HEADERS...) +# ----------------------------------- +m4_define([AH_CHECK_HEADERS_DIRENT], +[AC_FOREACH([AC_Header], [$1], + [AH_TEMPLATE(AC_TR_CPP(HAVE_[]AC_Header), + [Define if you have the <]AC_Header[> header file, and + it defines `DIR'.])])]) + + +# AC_HEADER_DIRENT +# ---------------- +AC_DEFUN([AC_HEADER_DIRENT], +[AH_CHECK_HEADERS_DIRENT(dirent.h sys/ndir.h sys/dir.h ndir.h) +ac_header_dirent=no +for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + _AC_CHECK_HEADER_DIRENT($ac_hdr, + [AC_DEFINE_UNQUOTED(AC_TR_CPP(HAVE_$ac_hdr), 1) +ac_header_dirent=$ac_hdr; break]) +done +# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. +if test $ac_header_dirent = dirent.h; then + AC_CHECK_LIB(dir, opendir, LIBS="$LIBS -ldir") +else + AC_CHECK_LIB(x, opendir, LIBS="$LIBS -lx") +fi +])# AC_HEADER_DIRENT + + +# AC_HEADER_MAJOR +# --------------- +AC_DEFUN([AC_HEADER_MAJOR], +[AC_CACHE_CHECK(whether sys/types.h defines makedev, + ac_cv_header_sys_types_h_makedev, +[AC_TRY_LINK([#include +], [return makedev(0, 0);], + ac_cv_header_sys_types_h_makedev=yes, ac_cv_header_sys_types_h_makedev=no) +]) + +if test $ac_cv_header_sys_types_h_makedev = no; then +AC_CHECK_HEADER(sys/mkdev.h, + [AC_DEFINE(MAJOR_IN_MKDEV, 1, + [Define if `major', `minor', and `makedev' are + declared in .])]) + + if test $ac_cv_header_sys_mkdev_h = no; then + AC_CHECK_HEADER(sys/sysmacros.h, + [AC_DEFINE(MAJOR_IN_SYSMACROS, 1, + [Define if `major', `minor', and `makedev' are + declared in .])]) + fi +fi +])# AC_HEADER_MAJOR + + +# AC_HEADER_STAT +# -------------- +# FIXME: Shouldn't this be named AC_HEADER_SYS_STAT? +AC_DEFUN([AC_HEADER_STAT], +[AC_CACHE_CHECK(whether stat file-mode macros are broken, + ac_cv_header_stat_broken, +[AC_EGREP_CPP([You lose], [#include +#include + +#if defined(S_ISBLK) && defined(S_IFDIR) +# if S_ISBLK (S_IFDIR) +You lose. +# endif +#endif + +#if defined(S_ISBLK) && defined(S_IFCHR) +# if S_ISBLK (S_IFCHR) +You lose. +# endif +#endif + +#if defined(S_ISLNK) && defined(S_IFREG) +# if S_ISLNK (S_IFREG) +You lose. +# endif +#endif + +#if defined(S_ISSOCK) && defined(S_IFREG) +# if S_ISSOCK (S_IFREG) +You lose. +# endif +#endif +], ac_cv_header_stat_broken=yes, ac_cv_header_stat_broken=no)]) +if test $ac_cv_header_stat_broken = yes; then + AC_DEFINE(STAT_MACROS_BROKEN, 1, + [Define if the `S_IS*' macros in do not + work properly.]) +fi +])# AC_HEADER_STAT + + +# AC_HEADER_STDC +# -------------- +AC_DEFUN([AC_HEADER_STDC], +[AC_REQUIRE_CPP()dnl +AC_CACHE_CHECK(for ANSI C header files, ac_cv_header_stdc, +[AC_TRY_CPP([#include +#include +#include +#include +], ac_cv_header_stdc=yes, ac_cv_header_stdc=no) + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + AC_EGREP_HEADER(memchr, string.h, , ac_cv_header_stdc=no) +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + AC_EGREP_HEADER(free, stdlib.h, , ac_cv_header_stdc=no) +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + AC_TRY_RUN( +[#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + exit(2); + exit (0); +}], , ac_cv_header_stdc=no, :) +fi]) +if test $ac_cv_header_stdc = yes; then + AC_DEFINE(STDC_HEADERS, 1, [Define if you have the ANSI C header files.]) +fi +])# AC_HEADER_STDC + + +# AC_HEADER_SYS_WAIT +# ------------------ +AC_DEFUN([AC_HEADER_SYS_WAIT], +[AC_CACHE_CHECK([for sys/wait.h that is POSIX.1 compatible], + ac_cv_header_sys_wait_h, +[AC_COMPILE_IFELSE( +[AC_LANG_PROGRAM([#include +#include +#ifndef WEXITSTATUS +# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) +#endif +#ifndef WIFEXITED +# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) +#endif +], +[ int s; + wait (&s); + s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;])], + [ac_cv_header_sys_wait_h=yes], + [ac_cv_header_sys_wait_h=no])]) +if test $ac_cv_header_sys_wait_h = yes; then + AC_DEFINE(HAVE_SYS_WAIT_H, 1, + [Define if you have that is POSIX.1 compatible.]) +fi +])# AC_HEADER_SYS_WAIT + + +# AC_HEADER_TIME +# -------------- +AC_DEFUN([AC_HEADER_TIME], +[AC_CACHE_CHECK([whether time.h and sys/time.h may both be included], + ac_cv_header_time, +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include +#include +#include +], +[struct tm *tp;])], + [ac_cv_header_time=yes], + [ac_cv_header_time=no])]) +if test $ac_cv_header_time = yes; then + AC_DEFINE(TIME_WITH_SYS_TIME, 1, + [Define if you can safely include both and .]) +fi +])# AC_HEADER_TIME + + +# _AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H +# ---------------------------------- +m4_define([_AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H], +[AC_CACHE_CHECK([whether termios.h defines TIOCGWINSZ], + ac_cv_sys_tiocgwinsz_in_termios_h, +[AC_EGREP_CPP([yes], + [#include +#include +#ifdef TIOCGWINSZ + yes +#endif +], + ac_cv_sys_tiocgwinsz_in_termios_h=yes, + ac_cv_sys_tiocgwinsz_in_termios_h=no)]) +])# _AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H + + +# _AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL +# ---------------------------------- +m4_define([_AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL], +[AC_CACHE_CHECK([whether sys/ioctl.h defines TIOCGWINSZ], + ac_cv_sys_tiocgwinsz_in_sys_ioctl_h, +[AC_EGREP_CPP([yes], + [#include +#include +#ifdef TIOCGWINSZ + yes +#endif +], + ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=yes, + ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=no)]) +])# _AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL + + +# AC_HEADER_TIOCGWINSZ +# -------------------- +# Look for a header that defines TIOCGWINSZ. +# FIXME: Is this the proper name? Is this the proper implementation? +# I need more help. +AC_DEFUN([AC_HEADER_TIOCGWINSZ], +[AC_REQUIRE([AC_SYS_POSIX_TERMIOS])dnl +if test $ac_cv_sys_posix_termios = yes; then + _AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H +fi +if test $ac_cv_sys_tiocgwinsz_in_termios_h != yes; then + _AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL + if test $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h = yes; then + AC_DEFINE(GWINSZ_IN_SYS_IOCTL,1, + [Define if `TIOCGWINSZ' requires ]) + fi +fi +])# AC_HEADER_TIOCGWINSZ + + +# AU::AC_UNISTD_H +# --------------- +AU_DEFUN([AC_UNISTD_H], +[AC_CHECK_HEADERS(unistd.h)]) + + +# AU::AC_USG +# ---------- +# Define `USG' if string functions are in strings.h. +AU_DEFUN([AC_USG], +[AC_DIAGNOSE([obsolete], +[$0: Remove `AC_MSG_CHECKING', `AC_TRY_LINK' and this `AC_WARNING' +when you ajust your code to use HAVE_STRING_H.])dnl +AC_MSG_CHECKING([for BSD string and memory functions]) +AC_TRY_LINK([@%:@include ], [rindex(0, 0); bzero(0, 0);], + [AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no) + AC_DEFINE(USG, 1, + [Define if you do not have , index, bzero, etc... + This symbol is obsolete, you should not depend upon it.])]) +AC_CHECK_HEADERS(string.h)]) + + +# AU::AC_MEMORY_H +# --------------- +# To be precise this macro used to be: +# +# | AC_MSG_CHECKING(whether string.h declares mem functions) +# | AC_EGREP_HEADER(memchr, string.h, ac_found=yes, ac_found=no) +# | AC_MSG_RESULT($ac_found) +# | if test $ac_found = no; then +# | AC_CHECK_HEADER(memory.h, [AC_DEFINE(NEED_MEMORY_H)]) +# | fi +# +# But it is better to check for both headers, and alias NEED_MEMORY_H to +# HAVE_MEMORY_H. +AU_DEFUN([AC_MEMORY_H], +[AC_DIAGNOSE([obsolete], [$0: Remove this warning and +`AC_CHECK_HEADER(memory.h, AC_DEFINE(...))' when you ajust your code to +use and HAVE_STRING_H and HAVE_MEMORY_H, not NEED_MEMORY_H.])dnl +AC_CHECK_HEADER(memory.h, + [AC_DEFINE([NEED_MEMORY_H], 1, + [Same as `HAVE_MEMORY_H', don't depend on me.])]) +AC_CHECK_HEADERS(string.h memory.h) +]) + + +# AU::AC_DIR_HEADER +# ----------------- +# Like calling `AC_HEADER_DIRENT' and `AC_FUNC_CLOSEDIR_VOID', but +# defines a different set of C preprocessor macros to indicate which +# header file is found. +AU_DEFUN([AC_DIR_HEADER], +[AC_HEADER_DIRENT +AC_FUNC_CLOSEDIR_VOID +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the four `AC_DEFINE' when you +ajust your code to use `AC_HEADER_DIRENT'.]) +test ac_cv_header_dirent_dirent_h && + AC_DEFINE([DIRENT], 1, [Same as `HAVE_DIRENT_H', don't depend on me.]) +test ac_cv_header_dirent_sys_ndir_h && + AC_DEFINE([SYSNDIR], 1, [Same as `HAVE_SYS_NDIR_H', don't depend on me.]) +test ac_cv_header_dirent_sys_dir_h && + AC_DEFINE([SYSDIR], 1, [Same as `HAVE_SYS_DIR_H', don't depend on me.]) +test ac_cv_header_dirent_ndir_h && + AC_DEFINE([NDIR], 1, [Same as `HAVE_NDIR_H', don't depend on me.]) +]) diff --git a/acspecific.m4 b/acspecific.m4 index 77ad592a..1d29bf13 100644 --- a/acspecific.m4 +++ b/acspecific.m4 @@ -327,351 +327,6 @@ fi -## ------------------------- ## -## Checks for header files. ## -## ------------------------- ## - - -# _AC_CHECK_HEADER_DIRENT(HEADER-FILE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT_FOUND]) -# ----------------------------------------------------------------- -# Like AC_CHECK_HEADER, except also make sure that HEADER-FILE -# defines the type `DIR'. dirent.h on NextStep 3.2 doesn't. -m4_define([_AC_CHECK_HEADER_DIRENT], -[AC_VAR_PUSHDEF([ac_Header], [ac_cv_header_dirent_$1])dnl -AC_CACHE_CHECK([for $1 that defines DIR], ac_Header, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include -#include <$1> -], - [DIR *dirp = 0;])], - [AC_VAR_SET(ac_Header, yes)], - [AC_VAR_SET(ac_Header, no)])]) -AS_IFELSE([test AC_VAR_GET(ac_Header) = yes], - [$2], [$3])dnl -AC_VAR_POPDEF([ac_Header])dnl -])# _AC_CHECK_HEADER_DIRENT - - -# AH_CHECK_HEADERS_DIRENT(HEADERS...) -# ----------------------------------- -m4_define([AH_CHECK_HEADERS_DIRENT], -[AC_FOREACH([AC_Header], [$1], - [AH_TEMPLATE(AC_TR_CPP(HAVE_[]AC_Header), - [Define if you have the <]AC_Header[> header file, and - it defines `DIR'.])])]) - - -# AC_HEADER_DIRENT -# ---------------- -AC_DEFUN([AC_HEADER_DIRENT], -[AH_CHECK_HEADERS_DIRENT(dirent.h sys/ndir.h sys/dir.h ndir.h) -ac_header_dirent=no -for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - _AC_CHECK_HEADER_DIRENT($ac_hdr, - [AC_DEFINE_UNQUOTED(AC_TR_CPP(HAVE_$ac_hdr), 1) -ac_header_dirent=$ac_hdr; break]) -done -# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. -if test $ac_header_dirent = dirent.h; then - AC_CHECK_LIB(dir, opendir, LIBS="$LIBS -ldir") -else - AC_CHECK_LIB(x, opendir, LIBS="$LIBS -lx") -fi -])# AC_HEADER_DIRENT - - -# AC_HEADER_MAJOR -# --------------- -AC_DEFUN([AC_HEADER_MAJOR], -[AC_CACHE_CHECK(whether sys/types.h defines makedev, - ac_cv_header_sys_types_h_makedev, -[AC_TRY_LINK([#include -], [return makedev(0, 0);], - ac_cv_header_sys_types_h_makedev=yes, ac_cv_header_sys_types_h_makedev=no) -]) - -if test $ac_cv_header_sys_types_h_makedev = no; then -AC_CHECK_HEADER(sys/mkdev.h, - [AC_DEFINE(MAJOR_IN_MKDEV, 1, - [Define if `major', `minor', and `makedev' are - declared in .])]) - - if test $ac_cv_header_sys_mkdev_h = no; then - AC_CHECK_HEADER(sys/sysmacros.h, - [AC_DEFINE(MAJOR_IN_SYSMACROS, 1, - [Define if `major', `minor', and `makedev' are - declared in .])]) - fi -fi -])# AC_HEADER_MAJOR - - -# AC_HEADER_STAT -# -------------- -# FIXME: Shouldn't this be named AC_HEADER_SYS_STAT? -AC_DEFUN([AC_HEADER_STAT], -[AC_CACHE_CHECK(whether stat file-mode macros are broken, - ac_cv_header_stat_broken, -[AC_EGREP_CPP([You lose], [#include -#include - -#if defined(S_ISBLK) && defined(S_IFDIR) -# if S_ISBLK (S_IFDIR) -You lose. -# endif -#endif - -#if defined(S_ISBLK) && defined(S_IFCHR) -# if S_ISBLK (S_IFCHR) -You lose. -# endif -#endif - -#if defined(S_ISLNK) && defined(S_IFREG) -# if S_ISLNK (S_IFREG) -You lose. -# endif -#endif - -#if defined(S_ISSOCK) && defined(S_IFREG) -# if S_ISSOCK (S_IFREG) -You lose. -# endif -#endif -], ac_cv_header_stat_broken=yes, ac_cv_header_stat_broken=no)]) -if test $ac_cv_header_stat_broken = yes; then - AC_DEFINE(STAT_MACROS_BROKEN, 1, - [Define if the `S_IS*' macros in do not - work properly.]) -fi -])# AC_HEADER_STAT - - -# AC_HEADER_STDC -# -------------- -AC_DEFUN([AC_HEADER_STDC], -[AC_REQUIRE_CPP()dnl -AC_CACHE_CHECK(for ANSI C header files, ac_cv_header_stdc, -[AC_TRY_CPP([#include -#include -#include -#include -], ac_cv_header_stdc=yes, ac_cv_header_stdc=no) - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - AC_EGREP_HEADER(memchr, string.h, , ac_cv_header_stdc=no) -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - AC_EGREP_HEADER(free, stdlib.h, , ac_cv_header_stdc=no) -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - AC_TRY_RUN( -[#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); -}], , ac_cv_header_stdc=no, :) -fi]) -if test $ac_cv_header_stdc = yes; then - AC_DEFINE(STDC_HEADERS, 1, [Define if you have the ANSI C header files.]) -fi -])# AC_HEADER_STDC - - -# AC_HEADER_SYS_WAIT -# ------------------ -AC_DEFUN([AC_HEADER_SYS_WAIT], -[AC_CACHE_CHECK([for sys/wait.h that is POSIX.1 compatible], - ac_cv_header_sys_wait_h, -[AC_COMPILE_IFELSE( -[AC_LANG_PROGRAM([#include -#include -#ifndef WEXITSTATUS -# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) -#endif -#ifndef WIFEXITED -# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -#endif -], -[ int s; - wait (&s); - s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;])], - [ac_cv_header_sys_wait_h=yes], - [ac_cv_header_sys_wait_h=no])]) -if test $ac_cv_header_sys_wait_h = yes; then - AC_DEFINE(HAVE_SYS_WAIT_H, 1, - [Define if you have that is POSIX.1 compatible.]) -fi -])# AC_HEADER_SYS_WAIT - - -# AC_HEADER_TIME -# -------------- -AC_DEFUN([AC_HEADER_TIME], -[AC_CACHE_CHECK([whether time.h and sys/time.h may both be included], - ac_cv_header_time, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include -#include -#include -], -[struct tm *tp;])], - [ac_cv_header_time=yes], - [ac_cv_header_time=no])]) -if test $ac_cv_header_time = yes; then - AC_DEFINE(TIME_WITH_SYS_TIME, 1, - [Define if you can safely include both and .]) -fi -])# AC_HEADER_TIME - - -# _AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H -# ---------------------------------- -m4_define([_AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H], -[AC_CACHE_CHECK([whether termios.h defines TIOCGWINSZ], - ac_cv_sys_tiocgwinsz_in_termios_h, -[AC_EGREP_CPP([yes], - [#include -#include -#ifdef TIOCGWINSZ - yes -#endif -], - ac_cv_sys_tiocgwinsz_in_termios_h=yes, - ac_cv_sys_tiocgwinsz_in_termios_h=no)]) -])# _AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H - - -# _AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL -# ---------------------------------- -m4_define([_AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL], -[AC_CACHE_CHECK([whether sys/ioctl.h defines TIOCGWINSZ], - ac_cv_sys_tiocgwinsz_in_sys_ioctl_h, -[AC_EGREP_CPP([yes], - [#include -#include -#ifdef TIOCGWINSZ - yes -#endif -], - ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=yes, - ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=no)]) -])# _AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL - - -# AC_HEADER_TIOCGWINSZ -# -------------------- -# Look for a header that defines TIOCGWINSZ. -# FIXME: Is this the proper name? Is this the proper implementation? -# I need more help. -AC_DEFUN([AC_HEADER_TIOCGWINSZ], -[AC_REQUIRE([AC_SYS_POSIX_TERMIOS])dnl -if test $ac_cv_sys_posix_termios = yes; then - _AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H -fi -if test $ac_cv_sys_tiocgwinsz_in_termios_h != yes; then - _AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL - if test $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h = yes; then - AC_DEFINE(GWINSZ_IN_SYS_IOCTL,1, - [Define if `TIOCGWINSZ' requires ]) - fi -fi -])# AC_HEADER_TIOCGWINSZ - - -# AU::AC_UNISTD_H -# --------------- -AU_DEFUN([AC_UNISTD_H], -[AC_CHECK_HEADERS(unistd.h)]) - - -# AU::AC_USG -# ---------- -# Define `USG' if string functions are in strings.h. -AU_DEFUN([AC_USG], -[AC_DIAGNOSE([obsolete], [$0: Remove `AC_MSG_CHECKING', `AC_TRY_LINK' and this `AC_WARNING' -when you ajust your code to use HAVE_STRING_H.])dnl -AC_MSG_CHECKING([for BSD string and memory functions]) -AC_TRY_LINK([@%:@include ], [rindex(0, 0); bzero(0, 0);], - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]) - AC_DEFINE(USG, 1, - [Define if you do not have , index, bzero, etc... - This symbol is obsolete, you should not depend upon it.])]) -AC_CHECK_HEADERS(string.h)]) - - -# AU::AC_MEMORY_H -# --------------- -# To be precise this macro used to be: -# -# | AC_MSG_CHECKING(whether string.h declares mem functions) -# | AC_EGREP_HEADER(memchr, string.h, ac_found=yes, ac_found=no) -# | AC_MSG_RESULT($ac_found) -# | if test $ac_found = no; then -# | AC_CHECK_HEADER(memory.h, [AC_DEFINE(NEED_MEMORY_H)]) -# | fi -# -# But it is better to check for both headers, and alias NEED_MEMORY_H to -# HAVE_MEMORY_H. -AU_DEFUN([AC_MEMORY_H], -[AC_DIAGNOSE([obsolete], [$0: Remove this warning and -`AC_CHECK_HEADER(memory.h, AC_DEFINE(...))' when you ajust your code to -use and HAVE_STRING_H and HAVE_MEMORY_H, not NEED_MEMORY_H.])dnl -AC_CHECK_HEADER(memory.h, - [AC_DEFINE([NEED_MEMORY_H], 1, - [Same as `HAVE_MEMORY_H', don't depend on me.])]) -AC_CHECK_HEADERS(string.h memory.h) -]) - - -# AU::AC_DIR_HEADER -# ----------------- -# Like calling `AC_HEADER_DIRENT' and `AC_FUNC_CLOSEDIR_VOID', but -# defines a different set of C preprocessor macros to indicate which -# header file is found. -AU_DEFUN([AC_DIR_HEADER], -[AC_HEADER_DIRENT -AC_FUNC_CLOSEDIR_VOID -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the four `AC_DEFINE' when you -ajust your code to use `AC_HEADER_DIRENT'.]) -test ac_cv_header_dirent_dirent_h && - AC_DEFINE([DIRENT], 1, [Same as `HAVE_DIRENT_H', don't depend on me.]) -test ac_cv_header_dirent_sys_ndir_h && - AC_DEFINE([SYSNDIR], 1, [Same as `HAVE_SYS_NDIR_H', don't depend on me.]) -test ac_cv_header_dirent_sys_dir_h && - AC_DEFINE([SYSDIR], 1, [Same as `HAVE_SYS_DIR_H', don't depend on me.]) -test ac_cv_header_dirent_ndir_h && - AC_DEFINE([NDIR], 1, [Same as `HAVE_NDIR_H', don't depend on me.]) -]) - - - - - - ## --------------------- ## ## Checks for typedefs. ## ## --------------------- ## diff --git a/autoconf.m4 b/autoconf.m4 index 54a73ae9..71898585 100644 --- a/autoconf.m4 +++ b/autoconf.m4 @@ -30,6 +30,7 @@ m4_include([acversion.m4]) m4_include([acgeneral.m4]) m4_include([aclang.m4]) m4_include([acfunctions.m4]) +m4_include([acheaders.m4]) m4_include([acspecific.m4]) m4_include([acoldnames.m4]) diff --git a/lib/autoconf/autoconf.m4 b/lib/autoconf/autoconf.m4 index 54a73ae9..71898585 100644 --- a/lib/autoconf/autoconf.m4 +++ b/lib/autoconf/autoconf.m4 @@ -30,6 +30,7 @@ m4_include([acversion.m4]) m4_include([acgeneral.m4]) m4_include([aclang.m4]) m4_include([acfunctions.m4]) +m4_include([acheaders.m4]) m4_include([acspecific.m4]) m4_include([acoldnames.m4]) diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 3a87c4b7..86482aac 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -2993,45 +2993,6 @@ fi -## --------------------------- ## -## Checking for header files. ## -## --------------------------- ## - - -# AC_CHECK_HEADER(HEADER-FILE, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ---------------------------------------------------------------------- -AC_DEFUN([AC_CHECK_HEADER], -[AC_VAR_PUSHDEF([ac_Header], [ac_cv_header_$1])dnl -AC_ARG_VAR([CPPFLAGS], [C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory ]) -AC_CACHE_CHECK([for $1], ac_Header, -[AC_TRY_CPP([#include <$1> -], -AC_VAR_SET(ac_Header, yes), AC_VAR_SET(ac_Header, no))]) -AS_IFELSE([test AC_VAR_GET(ac_Header) = yes], - [$2], [$3])dnl -AC_VAR_POPDEF([ac_Header])dnl -])# AC_CHECK_HEADER - - -m4_define([AH_CHECK_HEADERS], -[AC_FOREACH([AC_Header], [$1], - [AH_TEMPLATE(AC_TR_CPP(HAVE_[]AC_Header), - [Define if you have the <]AC_Header[> header file.])])]) - -# AC_CHECK_HEADERS(HEADER-FILE... -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ---------------------------------------------------------- -AC_DEFUN([AC_CHECK_HEADERS], -[AH_CHECK_HEADERS([$1])dnl -for ac_header in $1 -do -AC_CHECK_HEADER($ac_header, - [AC_DEFINE_UNQUOTED(AC_TR_CPP(HAVE_$ac_header)) $2], - [$3])dnl -done -]) - - ## ------------------------------------- ## ## Checking for the existence of files. ## ## ------------------------------------- ## diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4 new file mode 100644 index 00000000..bb93fab7 --- /dev/null +++ b/lib/autoconf/headers.m4 @@ -0,0 +1,442 @@ +# This file is part of Autoconf. -*- Autoconf -*- +# Checking for headers. +# Copyright 2000 +# Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. +# +# As a special exception, the Free Software Foundation gives unlimited +# permission to copy, distribute and modify the configure scripts that +# are the output of Autoconf. You need not follow the terms of the GNU +# General Public License when using or distributing such scripts, even +# though portions of the text of Autoconf appear in them. The GNU +# General Public License (GPL) does govern all other use of the material +# that constitutes the Autoconf program. +# +# Certain portions of the Autoconf source text are designed to be copied +# (in certain cases, depending on the input) into the output of +# Autoconf. We call these the "data" portions. The rest of the Autoconf +# source text consists of comments plus executable code that decides which +# of the data portions to output in any given case. We call these +# comments and executable code the "non-data" portions. Autoconf never +# copies any of the non-data portions into its output. +# +# This special exception to the GPL applies to versions of Autoconf +# released by the Free Software Foundation. When you make and +# distribute a modified version of Autoconf, you may extend this special +# exception to the GPL to apply to your modified version as well, *unless* +# your modified version has the potential to copy into its output some +# of the text that was the non-data portion of the version that you started +# with. (In other words, unless your change moves or copies text from +# the non-data portions to the data portions.) If your modification has +# such potential, you must delete any notice of this special exception +# to the GPL from your modified version. +# +# Written by David MacKenzie, with help from +# Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor, +# Roland McGrath, Noah Friedman, david d zuhn, and many others. + + +# Table of contents +# +# 1. Generic tests for headers +# 2. Tests for specific headers + + +## ------------------------------ ## +## 1. Generic tests for headers. ## +## ------------------------------ ## + +# AC_CHECK_HEADER(HEADER-FILE, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ---------------------------------------------------------------------- +AC_DEFUN([AC_CHECK_HEADER], +[AC_VAR_PUSHDEF([ac_Header], [ac_cv_header_$1])dnl +AC_ARG_VAR([CPPFLAGS], [C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory ]) +AC_CACHE_CHECK([for $1], ac_Header, +[AC_TRY_CPP([#include <$1> +], +AC_VAR_SET(ac_Header, yes), AC_VAR_SET(ac_Header, no))]) +AS_IFELSE([test AC_VAR_GET(ac_Header) = yes], + [$2], [$3])dnl +AC_VAR_POPDEF([ac_Header])dnl +])# AC_CHECK_HEADER + + +# AH_CHECK_HEADERS(HEADER-FILE...) +# -------------------------------- +m4_define([AH_CHECK_HEADERS], +[AC_FOREACH([AC_Header], [$1], + [AH_TEMPLATE(AC_TR_CPP(HAVE_[]AC_Header), + [Define if you have the <]AC_Header[> header file.])])]) + + +# AC_CHECK_HEADERS(HEADER-FILE... +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ---------------------------------------------------------- +AC_DEFUN([AC_CHECK_HEADERS], +[AH_CHECK_HEADERS([$1])dnl +for ac_header in $1 +do +AC_CHECK_HEADER($ac_header, + [AC_DEFINE_UNQUOTED(AC_TR_CPP(HAVE_$ac_header)) $2], + [$3])dnl +done +]) + + + + + +## ------------------------------- ## +## 2. Tests for specific headers. ## +## ------------------------------- ## + + +# _AC_CHECK_HEADER_DIRENT(HEADER-FILE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT_FOUND]) +# ----------------------------------------------------------------- +# Like AC_CHECK_HEADER, except also make sure that HEADER-FILE +# defines the type `DIR'. dirent.h on NextStep 3.2 doesn't. +m4_define([_AC_CHECK_HEADER_DIRENT], +[AC_VAR_PUSHDEF([ac_Header], [ac_cv_header_dirent_$1])dnl +AC_CACHE_CHECK([for $1 that defines DIR], ac_Header, +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include +#include <$1> +], + [DIR *dirp = 0;])], + [AC_VAR_SET(ac_Header, yes)], + [AC_VAR_SET(ac_Header, no)])]) +AS_IFELSE([test AC_VAR_GET(ac_Header) = yes], + [$2], [$3])dnl +AC_VAR_POPDEF([ac_Header])dnl +])# _AC_CHECK_HEADER_DIRENT + + +# AH_CHECK_HEADERS_DIRENT(HEADERS...) +# ----------------------------------- +m4_define([AH_CHECK_HEADERS_DIRENT], +[AC_FOREACH([AC_Header], [$1], + [AH_TEMPLATE(AC_TR_CPP(HAVE_[]AC_Header), + [Define if you have the <]AC_Header[> header file, and + it defines `DIR'.])])]) + + +# AC_HEADER_DIRENT +# ---------------- +AC_DEFUN([AC_HEADER_DIRENT], +[AH_CHECK_HEADERS_DIRENT(dirent.h sys/ndir.h sys/dir.h ndir.h) +ac_header_dirent=no +for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + _AC_CHECK_HEADER_DIRENT($ac_hdr, + [AC_DEFINE_UNQUOTED(AC_TR_CPP(HAVE_$ac_hdr), 1) +ac_header_dirent=$ac_hdr; break]) +done +# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. +if test $ac_header_dirent = dirent.h; then + AC_CHECK_LIB(dir, opendir, LIBS="$LIBS -ldir") +else + AC_CHECK_LIB(x, opendir, LIBS="$LIBS -lx") +fi +])# AC_HEADER_DIRENT + + +# AC_HEADER_MAJOR +# --------------- +AC_DEFUN([AC_HEADER_MAJOR], +[AC_CACHE_CHECK(whether sys/types.h defines makedev, + ac_cv_header_sys_types_h_makedev, +[AC_TRY_LINK([#include +], [return makedev(0, 0);], + ac_cv_header_sys_types_h_makedev=yes, ac_cv_header_sys_types_h_makedev=no) +]) + +if test $ac_cv_header_sys_types_h_makedev = no; then +AC_CHECK_HEADER(sys/mkdev.h, + [AC_DEFINE(MAJOR_IN_MKDEV, 1, + [Define if `major', `minor', and `makedev' are + declared in .])]) + + if test $ac_cv_header_sys_mkdev_h = no; then + AC_CHECK_HEADER(sys/sysmacros.h, + [AC_DEFINE(MAJOR_IN_SYSMACROS, 1, + [Define if `major', `minor', and `makedev' are + declared in .])]) + fi +fi +])# AC_HEADER_MAJOR + + +# AC_HEADER_STAT +# -------------- +# FIXME: Shouldn't this be named AC_HEADER_SYS_STAT? +AC_DEFUN([AC_HEADER_STAT], +[AC_CACHE_CHECK(whether stat file-mode macros are broken, + ac_cv_header_stat_broken, +[AC_EGREP_CPP([You lose], [#include +#include + +#if defined(S_ISBLK) && defined(S_IFDIR) +# if S_ISBLK (S_IFDIR) +You lose. +# endif +#endif + +#if defined(S_ISBLK) && defined(S_IFCHR) +# if S_ISBLK (S_IFCHR) +You lose. +# endif +#endif + +#if defined(S_ISLNK) && defined(S_IFREG) +# if S_ISLNK (S_IFREG) +You lose. +# endif +#endif + +#if defined(S_ISSOCK) && defined(S_IFREG) +# if S_ISSOCK (S_IFREG) +You lose. +# endif +#endif +], ac_cv_header_stat_broken=yes, ac_cv_header_stat_broken=no)]) +if test $ac_cv_header_stat_broken = yes; then + AC_DEFINE(STAT_MACROS_BROKEN, 1, + [Define if the `S_IS*' macros in do not + work properly.]) +fi +])# AC_HEADER_STAT + + +# AC_HEADER_STDC +# -------------- +AC_DEFUN([AC_HEADER_STDC], +[AC_REQUIRE_CPP()dnl +AC_CACHE_CHECK(for ANSI C header files, ac_cv_header_stdc, +[AC_TRY_CPP([#include +#include +#include +#include +], ac_cv_header_stdc=yes, ac_cv_header_stdc=no) + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + AC_EGREP_HEADER(memchr, string.h, , ac_cv_header_stdc=no) +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + AC_EGREP_HEADER(free, stdlib.h, , ac_cv_header_stdc=no) +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + AC_TRY_RUN( +[#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + exit(2); + exit (0); +}], , ac_cv_header_stdc=no, :) +fi]) +if test $ac_cv_header_stdc = yes; then + AC_DEFINE(STDC_HEADERS, 1, [Define if you have the ANSI C header files.]) +fi +])# AC_HEADER_STDC + + +# AC_HEADER_SYS_WAIT +# ------------------ +AC_DEFUN([AC_HEADER_SYS_WAIT], +[AC_CACHE_CHECK([for sys/wait.h that is POSIX.1 compatible], + ac_cv_header_sys_wait_h, +[AC_COMPILE_IFELSE( +[AC_LANG_PROGRAM([#include +#include +#ifndef WEXITSTATUS +# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) +#endif +#ifndef WIFEXITED +# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) +#endif +], +[ int s; + wait (&s); + s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;])], + [ac_cv_header_sys_wait_h=yes], + [ac_cv_header_sys_wait_h=no])]) +if test $ac_cv_header_sys_wait_h = yes; then + AC_DEFINE(HAVE_SYS_WAIT_H, 1, + [Define if you have that is POSIX.1 compatible.]) +fi +])# AC_HEADER_SYS_WAIT + + +# AC_HEADER_TIME +# -------------- +AC_DEFUN([AC_HEADER_TIME], +[AC_CACHE_CHECK([whether time.h and sys/time.h may both be included], + ac_cv_header_time, +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include +#include +#include +], +[struct tm *tp;])], + [ac_cv_header_time=yes], + [ac_cv_header_time=no])]) +if test $ac_cv_header_time = yes; then + AC_DEFINE(TIME_WITH_SYS_TIME, 1, + [Define if you can safely include both and .]) +fi +])# AC_HEADER_TIME + + +# _AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H +# ---------------------------------- +m4_define([_AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H], +[AC_CACHE_CHECK([whether termios.h defines TIOCGWINSZ], + ac_cv_sys_tiocgwinsz_in_termios_h, +[AC_EGREP_CPP([yes], + [#include +#include +#ifdef TIOCGWINSZ + yes +#endif +], + ac_cv_sys_tiocgwinsz_in_termios_h=yes, + ac_cv_sys_tiocgwinsz_in_termios_h=no)]) +])# _AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H + + +# _AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL +# ---------------------------------- +m4_define([_AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL], +[AC_CACHE_CHECK([whether sys/ioctl.h defines TIOCGWINSZ], + ac_cv_sys_tiocgwinsz_in_sys_ioctl_h, +[AC_EGREP_CPP([yes], + [#include +#include +#ifdef TIOCGWINSZ + yes +#endif +], + ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=yes, + ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=no)]) +])# _AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL + + +# AC_HEADER_TIOCGWINSZ +# -------------------- +# Look for a header that defines TIOCGWINSZ. +# FIXME: Is this the proper name? Is this the proper implementation? +# I need more help. +AC_DEFUN([AC_HEADER_TIOCGWINSZ], +[AC_REQUIRE([AC_SYS_POSIX_TERMIOS])dnl +if test $ac_cv_sys_posix_termios = yes; then + _AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H +fi +if test $ac_cv_sys_tiocgwinsz_in_termios_h != yes; then + _AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL + if test $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h = yes; then + AC_DEFINE(GWINSZ_IN_SYS_IOCTL,1, + [Define if `TIOCGWINSZ' requires ]) + fi +fi +])# AC_HEADER_TIOCGWINSZ + + +# AU::AC_UNISTD_H +# --------------- +AU_DEFUN([AC_UNISTD_H], +[AC_CHECK_HEADERS(unistd.h)]) + + +# AU::AC_USG +# ---------- +# Define `USG' if string functions are in strings.h. +AU_DEFUN([AC_USG], +[AC_DIAGNOSE([obsolete], +[$0: Remove `AC_MSG_CHECKING', `AC_TRY_LINK' and this `AC_WARNING' +when you ajust your code to use HAVE_STRING_H.])dnl +AC_MSG_CHECKING([for BSD string and memory functions]) +AC_TRY_LINK([@%:@include ], [rindex(0, 0); bzero(0, 0);], + [AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no) + AC_DEFINE(USG, 1, + [Define if you do not have , index, bzero, etc... + This symbol is obsolete, you should not depend upon it.])]) +AC_CHECK_HEADERS(string.h)]) + + +# AU::AC_MEMORY_H +# --------------- +# To be precise this macro used to be: +# +# | AC_MSG_CHECKING(whether string.h declares mem functions) +# | AC_EGREP_HEADER(memchr, string.h, ac_found=yes, ac_found=no) +# | AC_MSG_RESULT($ac_found) +# | if test $ac_found = no; then +# | AC_CHECK_HEADER(memory.h, [AC_DEFINE(NEED_MEMORY_H)]) +# | fi +# +# But it is better to check for both headers, and alias NEED_MEMORY_H to +# HAVE_MEMORY_H. +AU_DEFUN([AC_MEMORY_H], +[AC_DIAGNOSE([obsolete], [$0: Remove this warning and +`AC_CHECK_HEADER(memory.h, AC_DEFINE(...))' when you ajust your code to +use and HAVE_STRING_H and HAVE_MEMORY_H, not NEED_MEMORY_H.])dnl +AC_CHECK_HEADER(memory.h, + [AC_DEFINE([NEED_MEMORY_H], 1, + [Same as `HAVE_MEMORY_H', don't depend on me.])]) +AC_CHECK_HEADERS(string.h memory.h) +]) + + +# AU::AC_DIR_HEADER +# ----------------- +# Like calling `AC_HEADER_DIRENT' and `AC_FUNC_CLOSEDIR_VOID', but +# defines a different set of C preprocessor macros to indicate which +# header file is found. +AU_DEFUN([AC_DIR_HEADER], +[AC_HEADER_DIRENT +AC_FUNC_CLOSEDIR_VOID +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the four `AC_DEFINE' when you +ajust your code to use `AC_HEADER_DIRENT'.]) +test ac_cv_header_dirent_dirent_h && + AC_DEFINE([DIRENT], 1, [Same as `HAVE_DIRENT_H', don't depend on me.]) +test ac_cv_header_dirent_sys_ndir_h && + AC_DEFINE([SYSNDIR], 1, [Same as `HAVE_SYS_NDIR_H', don't depend on me.]) +test ac_cv_header_dirent_sys_dir_h && + AC_DEFINE([SYSDIR], 1, [Same as `HAVE_SYS_DIR_H', don't depend on me.]) +test ac_cv_header_dirent_ndir_h && + AC_DEFINE([NDIR], 1, [Same as `HAVE_NDIR_H', don't depend on me.]) +]) diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 index 77ad592a..1d29bf13 100644 --- a/lib/autoconf/specific.m4 +++ b/lib/autoconf/specific.m4 @@ -327,351 +327,6 @@ fi -## ------------------------- ## -## Checks for header files. ## -## ------------------------- ## - - -# _AC_CHECK_HEADER_DIRENT(HEADER-FILE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT_FOUND]) -# ----------------------------------------------------------------- -# Like AC_CHECK_HEADER, except also make sure that HEADER-FILE -# defines the type `DIR'. dirent.h on NextStep 3.2 doesn't. -m4_define([_AC_CHECK_HEADER_DIRENT], -[AC_VAR_PUSHDEF([ac_Header], [ac_cv_header_dirent_$1])dnl -AC_CACHE_CHECK([for $1 that defines DIR], ac_Header, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include -#include <$1> -], - [DIR *dirp = 0;])], - [AC_VAR_SET(ac_Header, yes)], - [AC_VAR_SET(ac_Header, no)])]) -AS_IFELSE([test AC_VAR_GET(ac_Header) = yes], - [$2], [$3])dnl -AC_VAR_POPDEF([ac_Header])dnl -])# _AC_CHECK_HEADER_DIRENT - - -# AH_CHECK_HEADERS_DIRENT(HEADERS...) -# ----------------------------------- -m4_define([AH_CHECK_HEADERS_DIRENT], -[AC_FOREACH([AC_Header], [$1], - [AH_TEMPLATE(AC_TR_CPP(HAVE_[]AC_Header), - [Define if you have the <]AC_Header[> header file, and - it defines `DIR'.])])]) - - -# AC_HEADER_DIRENT -# ---------------- -AC_DEFUN([AC_HEADER_DIRENT], -[AH_CHECK_HEADERS_DIRENT(dirent.h sys/ndir.h sys/dir.h ndir.h) -ac_header_dirent=no -for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - _AC_CHECK_HEADER_DIRENT($ac_hdr, - [AC_DEFINE_UNQUOTED(AC_TR_CPP(HAVE_$ac_hdr), 1) -ac_header_dirent=$ac_hdr; break]) -done -# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. -if test $ac_header_dirent = dirent.h; then - AC_CHECK_LIB(dir, opendir, LIBS="$LIBS -ldir") -else - AC_CHECK_LIB(x, opendir, LIBS="$LIBS -lx") -fi -])# AC_HEADER_DIRENT - - -# AC_HEADER_MAJOR -# --------------- -AC_DEFUN([AC_HEADER_MAJOR], -[AC_CACHE_CHECK(whether sys/types.h defines makedev, - ac_cv_header_sys_types_h_makedev, -[AC_TRY_LINK([#include -], [return makedev(0, 0);], - ac_cv_header_sys_types_h_makedev=yes, ac_cv_header_sys_types_h_makedev=no) -]) - -if test $ac_cv_header_sys_types_h_makedev = no; then -AC_CHECK_HEADER(sys/mkdev.h, - [AC_DEFINE(MAJOR_IN_MKDEV, 1, - [Define if `major', `minor', and `makedev' are - declared in .])]) - - if test $ac_cv_header_sys_mkdev_h = no; then - AC_CHECK_HEADER(sys/sysmacros.h, - [AC_DEFINE(MAJOR_IN_SYSMACROS, 1, - [Define if `major', `minor', and `makedev' are - declared in .])]) - fi -fi -])# AC_HEADER_MAJOR - - -# AC_HEADER_STAT -# -------------- -# FIXME: Shouldn't this be named AC_HEADER_SYS_STAT? -AC_DEFUN([AC_HEADER_STAT], -[AC_CACHE_CHECK(whether stat file-mode macros are broken, - ac_cv_header_stat_broken, -[AC_EGREP_CPP([You lose], [#include -#include - -#if defined(S_ISBLK) && defined(S_IFDIR) -# if S_ISBLK (S_IFDIR) -You lose. -# endif -#endif - -#if defined(S_ISBLK) && defined(S_IFCHR) -# if S_ISBLK (S_IFCHR) -You lose. -# endif -#endif - -#if defined(S_ISLNK) && defined(S_IFREG) -# if S_ISLNK (S_IFREG) -You lose. -# endif -#endif - -#if defined(S_ISSOCK) && defined(S_IFREG) -# if S_ISSOCK (S_IFREG) -You lose. -# endif -#endif -], ac_cv_header_stat_broken=yes, ac_cv_header_stat_broken=no)]) -if test $ac_cv_header_stat_broken = yes; then - AC_DEFINE(STAT_MACROS_BROKEN, 1, - [Define if the `S_IS*' macros in do not - work properly.]) -fi -])# AC_HEADER_STAT - - -# AC_HEADER_STDC -# -------------- -AC_DEFUN([AC_HEADER_STDC], -[AC_REQUIRE_CPP()dnl -AC_CACHE_CHECK(for ANSI C header files, ac_cv_header_stdc, -[AC_TRY_CPP([#include -#include -#include -#include -], ac_cv_header_stdc=yes, ac_cv_header_stdc=no) - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - AC_EGREP_HEADER(memchr, string.h, , ac_cv_header_stdc=no) -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - AC_EGREP_HEADER(free, stdlib.h, , ac_cv_header_stdc=no) -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - AC_TRY_RUN( -[#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); -}], , ac_cv_header_stdc=no, :) -fi]) -if test $ac_cv_header_stdc = yes; then - AC_DEFINE(STDC_HEADERS, 1, [Define if you have the ANSI C header files.]) -fi -])# AC_HEADER_STDC - - -# AC_HEADER_SYS_WAIT -# ------------------ -AC_DEFUN([AC_HEADER_SYS_WAIT], -[AC_CACHE_CHECK([for sys/wait.h that is POSIX.1 compatible], - ac_cv_header_sys_wait_h, -[AC_COMPILE_IFELSE( -[AC_LANG_PROGRAM([#include -#include -#ifndef WEXITSTATUS -# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) -#endif -#ifndef WIFEXITED -# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -#endif -], -[ int s; - wait (&s); - s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;])], - [ac_cv_header_sys_wait_h=yes], - [ac_cv_header_sys_wait_h=no])]) -if test $ac_cv_header_sys_wait_h = yes; then - AC_DEFINE(HAVE_SYS_WAIT_H, 1, - [Define if you have that is POSIX.1 compatible.]) -fi -])# AC_HEADER_SYS_WAIT - - -# AC_HEADER_TIME -# -------------- -AC_DEFUN([AC_HEADER_TIME], -[AC_CACHE_CHECK([whether time.h and sys/time.h may both be included], - ac_cv_header_time, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include -#include -#include -], -[struct tm *tp;])], - [ac_cv_header_time=yes], - [ac_cv_header_time=no])]) -if test $ac_cv_header_time = yes; then - AC_DEFINE(TIME_WITH_SYS_TIME, 1, - [Define if you can safely include both and .]) -fi -])# AC_HEADER_TIME - - -# _AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H -# ---------------------------------- -m4_define([_AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H], -[AC_CACHE_CHECK([whether termios.h defines TIOCGWINSZ], - ac_cv_sys_tiocgwinsz_in_termios_h, -[AC_EGREP_CPP([yes], - [#include -#include -#ifdef TIOCGWINSZ - yes -#endif -], - ac_cv_sys_tiocgwinsz_in_termios_h=yes, - ac_cv_sys_tiocgwinsz_in_termios_h=no)]) -])# _AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H - - -# _AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL -# ---------------------------------- -m4_define([_AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL], -[AC_CACHE_CHECK([whether sys/ioctl.h defines TIOCGWINSZ], - ac_cv_sys_tiocgwinsz_in_sys_ioctl_h, -[AC_EGREP_CPP([yes], - [#include -#include -#ifdef TIOCGWINSZ - yes -#endif -], - ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=yes, - ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=no)]) -])# _AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL - - -# AC_HEADER_TIOCGWINSZ -# -------------------- -# Look for a header that defines TIOCGWINSZ. -# FIXME: Is this the proper name? Is this the proper implementation? -# I need more help. -AC_DEFUN([AC_HEADER_TIOCGWINSZ], -[AC_REQUIRE([AC_SYS_POSIX_TERMIOS])dnl -if test $ac_cv_sys_posix_termios = yes; then - _AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H -fi -if test $ac_cv_sys_tiocgwinsz_in_termios_h != yes; then - _AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL - if test $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h = yes; then - AC_DEFINE(GWINSZ_IN_SYS_IOCTL,1, - [Define if `TIOCGWINSZ' requires ]) - fi -fi -])# AC_HEADER_TIOCGWINSZ - - -# AU::AC_UNISTD_H -# --------------- -AU_DEFUN([AC_UNISTD_H], -[AC_CHECK_HEADERS(unistd.h)]) - - -# AU::AC_USG -# ---------- -# Define `USG' if string functions are in strings.h. -AU_DEFUN([AC_USG], -[AC_DIAGNOSE([obsolete], [$0: Remove `AC_MSG_CHECKING', `AC_TRY_LINK' and this `AC_WARNING' -when you ajust your code to use HAVE_STRING_H.])dnl -AC_MSG_CHECKING([for BSD string and memory functions]) -AC_TRY_LINK([@%:@include ], [rindex(0, 0); bzero(0, 0);], - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]) - AC_DEFINE(USG, 1, - [Define if you do not have , index, bzero, etc... - This symbol is obsolete, you should not depend upon it.])]) -AC_CHECK_HEADERS(string.h)]) - - -# AU::AC_MEMORY_H -# --------------- -# To be precise this macro used to be: -# -# | AC_MSG_CHECKING(whether string.h declares mem functions) -# | AC_EGREP_HEADER(memchr, string.h, ac_found=yes, ac_found=no) -# | AC_MSG_RESULT($ac_found) -# | if test $ac_found = no; then -# | AC_CHECK_HEADER(memory.h, [AC_DEFINE(NEED_MEMORY_H)]) -# | fi -# -# But it is better to check for both headers, and alias NEED_MEMORY_H to -# HAVE_MEMORY_H. -AU_DEFUN([AC_MEMORY_H], -[AC_DIAGNOSE([obsolete], [$0: Remove this warning and -`AC_CHECK_HEADER(memory.h, AC_DEFINE(...))' when you ajust your code to -use and HAVE_STRING_H and HAVE_MEMORY_H, not NEED_MEMORY_H.])dnl -AC_CHECK_HEADER(memory.h, - [AC_DEFINE([NEED_MEMORY_H], 1, - [Same as `HAVE_MEMORY_H', don't depend on me.])]) -AC_CHECK_HEADERS(string.h memory.h) -]) - - -# AU::AC_DIR_HEADER -# ----------------- -# Like calling `AC_HEADER_DIRENT' and `AC_FUNC_CLOSEDIR_VOID', but -# defines a different set of C preprocessor macros to indicate which -# header file is found. -AU_DEFUN([AC_DIR_HEADER], -[AC_HEADER_DIRENT -AC_FUNC_CLOSEDIR_VOID -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the four `AC_DEFINE' when you -ajust your code to use `AC_HEADER_DIRENT'.]) -test ac_cv_header_dirent_dirent_h && - AC_DEFINE([DIRENT], 1, [Same as `HAVE_DIRENT_H', don't depend on me.]) -test ac_cv_header_dirent_sys_ndir_h && - AC_DEFINE([SYSNDIR], 1, [Same as `HAVE_SYS_NDIR_H', don't depend on me.]) -test ac_cv_header_dirent_sys_dir_h && - AC_DEFINE([SYSDIR], 1, [Same as `HAVE_SYS_DIR_H', don't depend on me.]) -test ac_cv_header_dirent_ndir_h && - AC_DEFINE([NDIR], 1, [Same as `HAVE_NDIR_H', don't depend on me.]) -]) - - - - - - ## --------------------- ## ## Checks for typedefs. ## ## --------------------- ## diff --git a/tests/Makefile.am b/tests/Makefile.am index de8de2da..1e89017b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -43,7 +43,7 @@ testsuite: atgeneral.m4 atspecific.m4 $(SUITE) # The files which contains macro we check for syntax. MACRO_FILES = ../acgeneral.m4 ../acspecific.m4 \ - ../acfunctions.m4 ../aclang.m4 + ../acfunctions.m4 ../aclang.m4 ../acheaders.m4 syntax.at: mktests.sh $(MACRO_FILES) cd $(srcdir) && ./mktests.sh $(MACRO_FILES) diff --git a/tests/Makefile.in b/tests/Makefile.in index 1607ac4e..3aba5db0 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -75,7 +75,7 @@ EXTRA_DIST = README atgeneral.m4 atspecific.m4 aclocal.m4 # The files which contains macro we check for syntax. -MACRO_FILES = ../acgeneral.m4 ../acspecific.m4 ../acfunctions.m4 ../aclang.m4 +MACRO_FILES = ../acgeneral.m4 ../acspecific.m4 ../acfunctions.m4 ../aclang.m4 ../acheaders.m4 CLEANFILES = debug-*.sh macro configure configure.in config.status config.cache config.log config.h.in config.h