From 8220c4356b6fdc4d0c442fc847078141a996b511 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Thu, 4 Sep 2003 02:49:15 +0000 Subject: [PATCH] * configure.ac: Check for UINT64_C to go along with uint64_t. --- ChangeLog | 4 ++++ configure.ac | 12 ++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d544c5b4d..2c60d1ec5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-09-03 David Shaw + + * configure.ac: Check for UINT64_C to go along with uint64_t. + 2003-08-21 Werner Koch Released 1.2.3. diff --git a/configure.ac b/configure.ac index 23426a886..7d118edf6 100644 --- a/configure.ac +++ b/configure.ac @@ -568,12 +568,20 @@ if test "$ac_cv_sizeof_unsigned_short" = "0" \ fi if test "$use_tiger" = yes || test "$use_new_tiger" = yes || test "$use_sha512" = yes ; then - AC_CHECK_SIZEOF(uint64_t) + # Ensure that we have UINT64_C before we bother to check for uint64_t + AC_CACHE_CHECK([for UINT64_C],[gnupg_cv_uint64_c_works], + AC_COMPILE_IFELSE(AC_LANG_PROGRAM([#include +uint64_t foo=UINT64_C(42);]),gnupg_cv_uint64_c_works=yes,gnupg_cv_uint64_c_works=no)) + + if test "$gnupg_cv_uint64_c_works" = "yes" ; then + AC_CHECK_SIZEOF(uint64_t) + fi + # Do we have any 64-bit data types at all? if test "$ac_cv_sizeof_unsigned_int" != "8" \ && test "$ac_cv_sizeof_unsigned_long" != "8" \ && test "$ac_cv_sizeof_unsigned_long_long" != "8" \ - && test "$ac_cv_sizeof_uint64_t" != "8"; then + && test x"$ac_cv_sizeof_uint64_t" != "x8"; then AC_MSG_WARN([No 64-bit types. Disabling TIGER/192, SHA-384, and SHA-512]) else if test "$use_tiger" = yes ; then