summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2005-11-26 06:37:52 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2005-11-26 06:37:52 +0000
commite05c20ea7ad4596d127a2decfb16ec60a991ee04 (patch)
tree7d8722bcf40f90fd15d164e2477c50f0ac7ec4b2 /m4
parent6771c1b4152f571b6d16f55a749f444821fcbf0d (diff)
downloadcoreutils-e05c20ea7ad4596d127a2decfb16ec60a991ee04.tar.xz
no longer needed.
(gl_STDBOOL_H): New macro, from gnulib. (AC_HEADER_STDBOOL): Sync with gnulib.
Diffstat (limited to 'm4')
-rw-r--r--m4/stdbool.m417
1 files changed, 7 insertions, 10 deletions
diff --git a/m4/stdbool.m4 b/m4/stdbool.m4
index 8893d0b1e..59d38e075 100644
--- a/m4/stdbool.m4
+++ b/m4/stdbool.m4
@@ -11,7 +11,7 @@ AC_DEFUN([AM_STDBOOL_H],
[
AC_REQUIRE([AC_HEADER_STDBOOL])
- # Define two additional variables used in the Makefile substitution.
+ # Define an additional variable used in the Makefile substitution.
if test "$ac_cv_header_stdbool_h" = yes; then
STDBOOL_H=''
@@ -19,15 +19,11 @@ AC_DEFUN([AM_STDBOOL_H],
STDBOOL_H='stdbool.h'
fi
AC_SUBST([STDBOOL_H])
-
- if test "$ac_cv_type__Bool" = yes; then
- HAVE__BOOL=1
- else
- HAVE__BOOL=0
- fi
- AC_SUBST([HAVE__BOOL])
])
+# AM_STDBOOL_H will be renamed to gl_STDBOOL_H in the future.
+AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H])
+
# This macro is only needed in autoconf <= 2.59. Newer versions of autoconf
# have this macro built-in.
@@ -79,7 +75,7 @@ AC_DEFUN([AC_HEADER_STDBOOL],
reject this program, as the initializer for xlcbug is
not one of the forms that C requires support for.
However, doing the test right would require a run-time
- test, and that would make crosss-compilation harder.
+ test, and that would make cross-compilation harder.
Let us hope that IBM fixes the xlc bug, and also adds
support for this kind of constant expression. In the
meantime, this test will reject xlc, which is OK, since
@@ -89,7 +85,8 @@ AC_DEFUN([AC_HEADER_STDBOOL],
#endif
],
[
- return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !j + !k + !l
+ /* Refer to every declared value, to avoid compiler optimizations. */
+ return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+ !m + !n + !o + !p);
],
[ac_cv_header_stdbool_h=yes],