From: Paul Eggert Date: Wed, 29 Aug 2001 06:36:20 +0000 (+0000) Subject: (jm_AC_HEADER_INTTYPES_H): Remove; now done by autoconf. X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=cae5fa25ae776ba2a22c0a225d9e001d7a9aa323;p=chaz%2Ftar (jm_AC_HEADER_INTTYPES_H): Remove; now done by autoconf. (jm_AC_TYPE_INTMAX_T, jm_AC_TYPE_UINTMAX_T): Replace with Use AC_CHECK_TYPE instead of merely looking for the header. --- diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index 536c31f..9571814 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -2,40 +2,19 @@ dnl From Paul Eggert. -AC_PREREQ(2.13) - -# Define HAVE_INTTYPES_H if exists, -# doesn't clash with , and declares intmax_t and uintmax_t. - -AC_DEFUN([jm_AC_HEADER_INTTYPES_H], -[ - AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, - [AC_TRY_COMPILE( - [#include -#include ], - [intmax_t i = (intmax_t) -1; uintmax_t ui = (uintmax_t) -1;], - jm_ac_cv_header_inttypes_h=yes, - jm_ac_cv_header_inttypes_h=no)]) - if test $jm_ac_cv_header_inttypes_h = yes; then - AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, -[Define if exists, doesn't clash with , - and declares intmax_t and uintmax_t.]) - fi -]) +AC_PREREQ(2.52) # Define intmax_t to long or long long if doesn't define. AC_DEFUN([jm_AC_TYPE_INTMAX_T], [ - AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) - if test $jm_ac_cv_header_inttypes_h = no; then - AC_REQUIRE([jm_AC_TYPE_LONG_LONG]) - test $ac_cv_type_long_long = yes \ - && ac_type='long long' \ - || ac_type='long' - AC_DEFINE_UNQUOTED(intmax_t, $ac_type, - [Define to long or long long if doesn't define.]) - fi + AC_REQUIRE([jm_AC_TYPE_LONG_LONG]) + AC_CHECK_TYPE(intmax_t, , + [test $ac_cv_type_long_long = yes \ + && ac_type='long long' \ + || ac_type='long' + AC_DEFINE_UNQUOTED(intmax_t, $ac_type, + [Define to widest signed type if doesn't define.])]) ]) # Define uintmax_t to unsigned long or unsigned long long @@ -43,14 +22,11 @@ AC_DEFUN([jm_AC_TYPE_INTMAX_T], AC_DEFUN([jm_AC_TYPE_UINTMAX_T], [ - AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) - if test $jm_ac_cv_header_inttypes_h = no; then - AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) - test $ac_cv_type_unsigned_long_long = yes \ - && ac_type='unsigned long long' \ - || ac_type='unsigned long' - AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, -[Define to unsigned long or unsigned long long - if doesn't define.]) - fi + AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) + AC_CHECK_TYPE(uintmax_t, , + [test $ac_cv_type_unsigned_long_long = yes \ + && ac_type='unsigned long long' \ + || ac_type='unsigned long' + AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, + [Define to widest unsigned type if doesn't define.])]) ])