+2000-03-02 Akim Demaille <akim@epita.fr>
+
+ Internal macros are named `_AC_'.
+
+ * acgeneral.m4 (AC_CANONICAL_TARGET, AC_CANONICAL_BUILD,
+ AC_CANONICAL_THING, AC_CHECK_TOOL_PREFIX, AC_CONFIG_UNIQUE):
+ Prepend `_' to their names.
+ * acspecific.m4 (AC_CHECK_HEADER_DIRENT, AC_CHECK_HEADERS_DIRENT,
+ AC_PATH_X_XMKMF, AC_PATH_X_DIRECT): Prepend `_' to their names.
+ * doc/autoconf.texi (Macro Names): Adjusted.
+
2000-03-02 Akim Demaille <akim@epita.fr>
* acgeneral.m4: Formatting changes.
AC_DEFUN(AC_CANONICAL_SYSTEM,
[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_TARGET])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_AC_CANONICAL_TARGET])dnl
+AC_REQUIRE([_AC_CANONICAL_BUILD])dnl
AC_BEFORE([$0], [AC_ARG_PROGRAM])
# Do some error checking and defaulting for the host and target type.
# The inputs are:
test "$program_prefix$program_suffix$program_transform_name" = \
NONENONEs,x,x, &&
program_prefix=${target_alias}-
-])
-
-
-
-# Subroutines of AC_CANONICAL_SYSTEM.
+])# AC_CANONICAL_SYSTEM
-# AC_CANONICAL_THING(THING)
-# -------------------------
+# _AC_CANONICAL_THING(THING)
+# --------------------------
# Worker routine for AC_CANONICAL_{HOST TARGET BUILD}. THING is one of
# `host', `target', or `build'. Canonicalize the appropriate thing,
# generating the variables THING, THING_{alias cpu vendor os}, and the
# associated cache entries. We also redo the cache entries if the user
# specifies something different from ac_cv_$THING_alias on the command line.
-define(AC_CANONICAL_THING,
+define(_AC_CANONICAL_THING,
[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
ifelse([$1], [host], , [AC_REQUIRE([AC_CANONICAL_HOST])])dnl
AC_MSG_CHECKING([$1 system type])
AC_SUBST($1_cpu)dnl
AC_SUBST($1_vendor)dnl
AC_SUBST($1_os)dnl
-])# AC_CANONICAL_THING
+])# _AC_CANONICAL_THING
-AC_DEFUN(AC_CANONICAL_HOST, [AC_CANONICAL_THING([host])])
+AC_DEFUN(AC_CANONICAL_HOST, [_AC_CANONICAL_THING([host])])
# Internal use only.
-AC_DEFUN(AC_CANONICAL_TARGET, [AC_CANONICAL_THING([target])])
-AC_DEFUN(AC_CANONICAL_BUILD, [AC_CANONICAL_THING([build])])
+AC_DEFUN(_AC_CANONICAL_TARGET, [_AC_CANONICAL_THING([target])])
+AC_DEFUN(_AC_CANONICAL_BUILD, [_AC_CANONICAL_THING([build])])
# AC_VALIDATE_CACHED_SYSTEM_TUPLE([CMD])
## Checking for tools. ##
## -------------------- ##
-# Internal subroutine.
+
+# _AC_CHECK_TOOL_PREFIX
+# ---------------------
AC_DEFUN(AC_CHECK_TOOL_PREFIX,
-[AC_REQUIRE([AC_CANONICAL_HOST])AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+[AC_REQUIRE([_AC_CANONICAL_HOST])dnl
+AC_REQUIRE([_AC_CANONICAL_BUILD])dnl
if test $host != $build; then
ac_tool_prefix=${host_alias}-
else
ac_tool_prefix=
fi
-])
+])# _AC_CHECK_TOOL_PREFIX
-# AC_PATH_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND [, PATH]])
-# ------------------------------------------------------------------------
+
+# AC_PATH_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH])
+# -----------------------------------------------------------------------
AC_DEFUN(AC_PATH_TOOL,
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
+[AC_REQUIRE([_AC_CHECK_TOOL_PREFIX])dnl
AC_PATH_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2,
ifelse([$3], , [$2], ), $4)
ifelse([$3], , , [
])
-# AC_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND [, PATH]])
-# -------------------------------------------------------------------------
+# AC_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH])
+# ------------------------------------------------------------------------
AC_DEFUN(AC_CHECK_TOOL,
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
+[AC_REQUIRE([_AC_CHECK_TOOL_PREFIX])dnl
AC_CHECK_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2,
ifelse([$3], , [$2], ), $4)
ifelse([$3], , , [
-1, [$4], [$3])])
-# AC_CONFIG_UNIQUE(DEST[:SOURCE]...)
-# ----------------------------------
+# _AC_CONFIG_UNIQUE(DEST[:SOURCE]...)
+# -----------------------------------
#
# Verify that there is no double definition of an output file
# (precisely, guarantees there is no common elements between
#
# Note that this macro does not check if the list $[1] itself
# contains doubles.
-define(AC_CONFIG_UNIQUE,
+define(_AC_CONFIG_UNIQUE,
[AC_DIVERT_PUSH(AC_DIVERSION_KILL)
AC_FOREACH([AC_File], [$1],
[pushdef([AC_Dest], patsubst(AC_File, [:.*]))
# as the name of a file the COMMANDS create.
AC_DEFUN([AC_CONFIG_COMMANDS],
[AC_DIVERT_PUSH(AC_DIVERSION_KILL)
-AC_CONFIG_UNIQUE([$1])
+_AC_CONFIG_UNIQUE([$1])
m4_append([AC_LIST_COMMANDS], [ $1])
ifelse([$2],,, [AC_FOREACH([AC_Name], [$1],
# esac
AC_DEFUN([AC_CONFIG_HEADERS],
[AC_DIVERT_PUSH(AC_DIVERSION_KILL)
-AC_CONFIG_UNIQUE([$1])
+_AC_CONFIG_UNIQUE([$1])
m4_append([AC_LIST_HEADERS], [ $1])
dnl Register the commands
ifelse([$2],,, [AC_FOREACH([AC_File], [$1],
# to guess the links to establish (`./config.status .').
AC_DEFUN(AC_CONFIG_LINKS,
[AC_DIVERT_PUSH(AC_DIVERSION_KILL)
-AC_CONFIG_UNIQUE([$1])
+_AC_CONFIG_UNIQUE([$1])
ifelse(regexp([$1], [^\.:\| \.:]), -1,,
[AC_FATAL([$0: invalid destination: `.'])])
m4_append([AC_LIST_LINKS], [ $1])
# esac
AC_DEFUN([AC_CONFIG_FILES],
[AC_DIVERT_PUSH(AC_DIVERSION_KILL)
-AC_CONFIG_UNIQUE([$1])
+_AC_CONFIG_UNIQUE([$1])
m4_append([AC_LIST_FILES], [ $1])
dnl Register the commands.
ifelse([$2],,, [AC_FOREACH([AC_File], [$1],
# --------------------------
# FIXME: `subdirs=' should not be here.
AC_DEFUN(AC_CONFIG_SUBDIRS,
-[AC_CONFIG_UNIQUE([$1])dnl
+[_AC_CONFIG_UNIQUE([$1])dnl
AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
m4_append([AC_LIST_SUBDIRS], [ $1])dnl
subdirs="AC_LIST_SUBDIRS"
])# AC_HEADER_MAJOR
-# AC_CHECK_HEADER_DIRENT(HEADER-FILE, ACTION-IF-FOUND)
+# _AC_CHECK_HEADER_DIRENT(HEADER-FILE, ACTION-IF-FOUND)
# ----------------------------------------------------
# Like AC_CHECK_HEADER, except also make sure that HEADER-FILE
# defines the type `DIR'. dirent.h on NextStep 3.2 doesn't.
-AC_DEFUN(AC_CHECK_HEADER_DIRENT,
+AC_DEFUN(_AC_CHECK_HEADER_DIRENT,
[ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
AC_MSG_CHECKING([for $1 that defines DIR])
AC_CACHE_VAL(ac_cv_header_dirent_$ac_safe,
else
AC_MSG_RESULT(no)
fi
-])
+])# _AC_CHECK_HEADER_DIRENT
-# AC_CHECK_HEADERS_DIRENT(HEADER-FILE... [, ACTION])
+# _AC_CHECK_HEADERS_DIRENT(HEADER-FILE... [, ACTION])
# --------------------------------------------------
# Like AC_CHECK_HEADERS, except succeed only for a HEADER-FILE that
# defines `DIR'.
-define(AC_CHECK_HEADERS_DIRENT,
+define(_AC_CHECK_HEADERS_DIRENT,
[for ac_hdr in $1
do
-AC_CHECK_HEADER_DIRENT($ac_hdr,
+_AC_CHECK_HEADER_DIRENT($ac_hdr,
[changequote(, )dnl
ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
changequote([, ])dnl
AC_DEFINE_UNQUOTED($ac_tr_hdr) $2])dnl
-done])
+done])# _AC_CHECK_HEADERS_DIRENT
+
+# AC_HEADER_DIRENT
+# ----------------
AC_DEFUN(AC_HEADER_DIRENT,
[ac_header_dirent=no
-AC_CHECK_HEADERS_DIRENT(dirent.h sys/ndir.h sys/dir.h ndir.h,
+_AC_CHECK_HEADERS_DIRENT(dirent.h sys/ndir.h sys/dir.h ndir.h,
[ac_header_dirent=$ac_hdr; break])
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
else
AC_CHECK_LIB(x, opendir, LIBS="$LIBS -lx")
fi
-])
+])# AC_HEADER_DIRENT
# AC_HEADER_STAT
AC_DEFUNCT(AC_MEMORY_H,
[; instead use AC_CHECK_HEADERS(memory.h) and HAVE_MEMORY_H])
-AC_DEFUNCT(AC_DIR_HEADER, [; instead use AC_HEADER_DIRENT])
+
+# 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. This macro and the names it defines are
+# considered obsolete.
+AC_DEFUNCT(AC_DIR_HEADER,
+[; instead use AC_HEADER_DIRENT])
# AC_PATH_X
# ---------
AC_DEFUN(AC_PATH_X,
-[AC_REQUIRE_CPP()dnl Set CPP; we run AC_PATH_X_DIRECT conditionally.
+[AC_REQUIRE_CPP()dnl Set CPP; we run _AC_PATH_X_DIRECT conditionally.
# If we find X, set shell vars x_includes and x_libraries to the
# paths, otherwise set no_x=yes.
# Uses ac_ vars as temps to allow command line to override cache and checks.
AC_CACHE_VAL(ac_cv_have_x,
[# One or both of the vars are not set, and there is no cached value.
ac_x_includes=NO ac_x_libraries=NO
-AC_PATH_X_XMKMF
-AC_PATH_X_DIRECT
+_AC_PATH_X_XMKMF
+_AC_PATH_X_DIRECT
if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
# Didn't find X anywhere. Cache the known absence of X.
ac_cv_have_x="have_x=no"
])# AC_PATH_X
-# AC_PATH_X_XMKMF
+# _AC_PATH_X_XMKMF
# ---------------
# Internal subroutine of AC_PATH_X.
# Set ac_x_includes and/or ac_x_libraries.
-AC_DEFUN(AC_PATH_X_XMKMF,
+AC_DEFUN(_AC_PATH_X_XMKMF,
[rm -fr conftestdir
if mkdir conftestdir; then
cd conftestdir
cd ..
rm -fr conftestdir
fi
-])# AC_PATH_X_XMKMF
+])# _AC_PATH_X_XMKMF
-# AC_PATH_X_DIRECT
+# _AC_PATH_X_DIRECT
# ----------------
# Internal subroutine of AC_PATH_X.
# Set ac_x_includes and/or ac_x_libraries.
-AC_DEFUN(AC_PATH_X_DIRECT,
+AC_DEFUN(_AC_PATH_X_DIRECT,
[if test "$ac_x_includes" = NO; then
# Guess where to find include files, by looking for this one X11 .h file.
test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
done
done])
fi # $ac_x_libraries = NO
-])# AC_PATH_X_DIRECT
+])# _AC_PATH_X_DIRECT
# AC_PATH_XTRA
behavior of the @code{utime} function when called with a @code{NULL}
pointer.
-A macro that is an internal subroutine of another macro should have a
-name that starts with the name of that other macro, followed by one or
-more words saying what the internal macro does. For example,
-@code{AC_PATH_X} has internal macros @code{AC_PATH_X_XMKMF} and
-@code{AC_PATH_X_DIRECT}.
+An internal macro should have a name which starts with an underscore;
+Autoconf internals should therefore start with @samp{_AC_}.
+Additionally, a macro that is an internal subroutine of another macro
+should have a name that starts with an underscore and the name of that
+other macro, followed by one or more words saying what the internal
+macro does. For example, @code{AC_PATH_X} has internal macros
+@code{_AC_PATH_X_XMKMF} and @code{_AC_PATH_X_DIRECT}.
@node Quoting, Dependencies Between Macros, Macro Names, Writing Macros
@section Quoting
AC_DEFUN(AC_CANONICAL_SYSTEM,
[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_TARGET])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_AC_CANONICAL_TARGET])dnl
+AC_REQUIRE([_AC_CANONICAL_BUILD])dnl
AC_BEFORE([$0], [AC_ARG_PROGRAM])
# Do some error checking and defaulting for the host and target type.
# The inputs are:
test "$program_prefix$program_suffix$program_transform_name" = \
NONENONEs,x,x, &&
program_prefix=${target_alias}-
-])
-
-
-
-# Subroutines of AC_CANONICAL_SYSTEM.
+])# AC_CANONICAL_SYSTEM
-# AC_CANONICAL_THING(THING)
-# -------------------------
+# _AC_CANONICAL_THING(THING)
+# --------------------------
# Worker routine for AC_CANONICAL_{HOST TARGET BUILD}. THING is one of
# `host', `target', or `build'. Canonicalize the appropriate thing,
# generating the variables THING, THING_{alias cpu vendor os}, and the
# associated cache entries. We also redo the cache entries if the user
# specifies something different from ac_cv_$THING_alias on the command line.
-define(AC_CANONICAL_THING,
+define(_AC_CANONICAL_THING,
[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
ifelse([$1], [host], , [AC_REQUIRE([AC_CANONICAL_HOST])])dnl
AC_MSG_CHECKING([$1 system type])
AC_SUBST($1_cpu)dnl
AC_SUBST($1_vendor)dnl
AC_SUBST($1_os)dnl
-])# AC_CANONICAL_THING
+])# _AC_CANONICAL_THING
-AC_DEFUN(AC_CANONICAL_HOST, [AC_CANONICAL_THING([host])])
+AC_DEFUN(AC_CANONICAL_HOST, [_AC_CANONICAL_THING([host])])
# Internal use only.
-AC_DEFUN(AC_CANONICAL_TARGET, [AC_CANONICAL_THING([target])])
-AC_DEFUN(AC_CANONICAL_BUILD, [AC_CANONICAL_THING([build])])
+AC_DEFUN(_AC_CANONICAL_TARGET, [_AC_CANONICAL_THING([target])])
+AC_DEFUN(_AC_CANONICAL_BUILD, [_AC_CANONICAL_THING([build])])
# AC_VALIDATE_CACHED_SYSTEM_TUPLE([CMD])
## Checking for tools. ##
## -------------------- ##
-# Internal subroutine.
+
+# _AC_CHECK_TOOL_PREFIX
+# ---------------------
AC_DEFUN(AC_CHECK_TOOL_PREFIX,
-[AC_REQUIRE([AC_CANONICAL_HOST])AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+[AC_REQUIRE([_AC_CANONICAL_HOST])dnl
+AC_REQUIRE([_AC_CANONICAL_BUILD])dnl
if test $host != $build; then
ac_tool_prefix=${host_alias}-
else
ac_tool_prefix=
fi
-])
+])# _AC_CHECK_TOOL_PREFIX
-# AC_PATH_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND [, PATH]])
-# ------------------------------------------------------------------------
+
+# AC_PATH_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH])
+# -----------------------------------------------------------------------
AC_DEFUN(AC_PATH_TOOL,
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
+[AC_REQUIRE([_AC_CHECK_TOOL_PREFIX])dnl
AC_PATH_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2,
ifelse([$3], , [$2], ), $4)
ifelse([$3], , , [
])
-# AC_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND [, PATH]])
-# -------------------------------------------------------------------------
+# AC_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH])
+# ------------------------------------------------------------------------
AC_DEFUN(AC_CHECK_TOOL,
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
+[AC_REQUIRE([_AC_CHECK_TOOL_PREFIX])dnl
AC_CHECK_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2,
ifelse([$3], , [$2], ), $4)
ifelse([$3], , , [
-1, [$4], [$3])])
-# AC_CONFIG_UNIQUE(DEST[:SOURCE]...)
-# ----------------------------------
+# _AC_CONFIG_UNIQUE(DEST[:SOURCE]...)
+# -----------------------------------
#
# Verify that there is no double definition of an output file
# (precisely, guarantees there is no common elements between
#
# Note that this macro does not check if the list $[1] itself
# contains doubles.
-define(AC_CONFIG_UNIQUE,
+define(_AC_CONFIG_UNIQUE,
[AC_DIVERT_PUSH(AC_DIVERSION_KILL)
AC_FOREACH([AC_File], [$1],
[pushdef([AC_Dest], patsubst(AC_File, [:.*]))
# as the name of a file the COMMANDS create.
AC_DEFUN([AC_CONFIG_COMMANDS],
[AC_DIVERT_PUSH(AC_DIVERSION_KILL)
-AC_CONFIG_UNIQUE([$1])
+_AC_CONFIG_UNIQUE([$1])
m4_append([AC_LIST_COMMANDS], [ $1])
ifelse([$2],,, [AC_FOREACH([AC_Name], [$1],
# esac
AC_DEFUN([AC_CONFIG_HEADERS],
[AC_DIVERT_PUSH(AC_DIVERSION_KILL)
-AC_CONFIG_UNIQUE([$1])
+_AC_CONFIG_UNIQUE([$1])
m4_append([AC_LIST_HEADERS], [ $1])
dnl Register the commands
ifelse([$2],,, [AC_FOREACH([AC_File], [$1],
# to guess the links to establish (`./config.status .').
AC_DEFUN(AC_CONFIG_LINKS,
[AC_DIVERT_PUSH(AC_DIVERSION_KILL)
-AC_CONFIG_UNIQUE([$1])
+_AC_CONFIG_UNIQUE([$1])
ifelse(regexp([$1], [^\.:\| \.:]), -1,,
[AC_FATAL([$0: invalid destination: `.'])])
m4_append([AC_LIST_LINKS], [ $1])
# esac
AC_DEFUN([AC_CONFIG_FILES],
[AC_DIVERT_PUSH(AC_DIVERSION_KILL)
-AC_CONFIG_UNIQUE([$1])
+_AC_CONFIG_UNIQUE([$1])
m4_append([AC_LIST_FILES], [ $1])
dnl Register the commands.
ifelse([$2],,, [AC_FOREACH([AC_File], [$1],
# --------------------------
# FIXME: `subdirs=' should not be here.
AC_DEFUN(AC_CONFIG_SUBDIRS,
-[AC_CONFIG_UNIQUE([$1])dnl
+[_AC_CONFIG_UNIQUE([$1])dnl
AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
m4_append([AC_LIST_SUBDIRS], [ $1])dnl
subdirs="AC_LIST_SUBDIRS"
])# AC_HEADER_MAJOR
-# AC_CHECK_HEADER_DIRENT(HEADER-FILE, ACTION-IF-FOUND)
+# _AC_CHECK_HEADER_DIRENT(HEADER-FILE, ACTION-IF-FOUND)
# ----------------------------------------------------
# Like AC_CHECK_HEADER, except also make sure that HEADER-FILE
# defines the type `DIR'. dirent.h on NextStep 3.2 doesn't.
-AC_DEFUN(AC_CHECK_HEADER_DIRENT,
+AC_DEFUN(_AC_CHECK_HEADER_DIRENT,
[ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
AC_MSG_CHECKING([for $1 that defines DIR])
AC_CACHE_VAL(ac_cv_header_dirent_$ac_safe,
else
AC_MSG_RESULT(no)
fi
-])
+])# _AC_CHECK_HEADER_DIRENT
-# AC_CHECK_HEADERS_DIRENT(HEADER-FILE... [, ACTION])
+# _AC_CHECK_HEADERS_DIRENT(HEADER-FILE... [, ACTION])
# --------------------------------------------------
# Like AC_CHECK_HEADERS, except succeed only for a HEADER-FILE that
# defines `DIR'.
-define(AC_CHECK_HEADERS_DIRENT,
+define(_AC_CHECK_HEADERS_DIRENT,
[for ac_hdr in $1
do
-AC_CHECK_HEADER_DIRENT($ac_hdr,
+_AC_CHECK_HEADER_DIRENT($ac_hdr,
[changequote(, )dnl
ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
changequote([, ])dnl
AC_DEFINE_UNQUOTED($ac_tr_hdr) $2])dnl
-done])
+done])# _AC_CHECK_HEADERS_DIRENT
+
+# AC_HEADER_DIRENT
+# ----------------
AC_DEFUN(AC_HEADER_DIRENT,
[ac_header_dirent=no
-AC_CHECK_HEADERS_DIRENT(dirent.h sys/ndir.h sys/dir.h ndir.h,
+_AC_CHECK_HEADERS_DIRENT(dirent.h sys/ndir.h sys/dir.h ndir.h,
[ac_header_dirent=$ac_hdr; break])
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
else
AC_CHECK_LIB(x, opendir, LIBS="$LIBS -lx")
fi
-])
+])# AC_HEADER_DIRENT
# AC_HEADER_STAT
AC_DEFUNCT(AC_MEMORY_H,
[; instead use AC_CHECK_HEADERS(memory.h) and HAVE_MEMORY_H])
-AC_DEFUNCT(AC_DIR_HEADER, [; instead use AC_HEADER_DIRENT])
+
+# 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. This macro and the names it defines are
+# considered obsolete.
+AC_DEFUNCT(AC_DIR_HEADER,
+[; instead use AC_HEADER_DIRENT])
# AC_PATH_X
# ---------
AC_DEFUN(AC_PATH_X,
-[AC_REQUIRE_CPP()dnl Set CPP; we run AC_PATH_X_DIRECT conditionally.
+[AC_REQUIRE_CPP()dnl Set CPP; we run _AC_PATH_X_DIRECT conditionally.
# If we find X, set shell vars x_includes and x_libraries to the
# paths, otherwise set no_x=yes.
# Uses ac_ vars as temps to allow command line to override cache and checks.
AC_CACHE_VAL(ac_cv_have_x,
[# One or both of the vars are not set, and there is no cached value.
ac_x_includes=NO ac_x_libraries=NO
-AC_PATH_X_XMKMF
-AC_PATH_X_DIRECT
+_AC_PATH_X_XMKMF
+_AC_PATH_X_DIRECT
if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
# Didn't find X anywhere. Cache the known absence of X.
ac_cv_have_x="have_x=no"
])# AC_PATH_X
-# AC_PATH_X_XMKMF
+# _AC_PATH_X_XMKMF
# ---------------
# Internal subroutine of AC_PATH_X.
# Set ac_x_includes and/or ac_x_libraries.
-AC_DEFUN(AC_PATH_X_XMKMF,
+AC_DEFUN(_AC_PATH_X_XMKMF,
[rm -fr conftestdir
if mkdir conftestdir; then
cd conftestdir
cd ..
rm -fr conftestdir
fi
-])# AC_PATH_X_XMKMF
+])# _AC_PATH_X_XMKMF
-# AC_PATH_X_DIRECT
+# _AC_PATH_X_DIRECT
# ----------------
# Internal subroutine of AC_PATH_X.
# Set ac_x_includes and/or ac_x_libraries.
-AC_DEFUN(AC_PATH_X_DIRECT,
+AC_DEFUN(_AC_PATH_X_DIRECT,
[if test "$ac_x_includes" = NO; then
# Guess where to find include files, by looking for this one X11 .h file.
test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
done
done])
fi # $ac_x_libraries = NO
-])# AC_PATH_X_DIRECT
+])# _AC_PATH_X_DIRECT
# AC_PATH_XTRA
projects / thirdparty / autoconf.git / commitdiff
