trawick 2002/10/16 04:46:15
Modified: . CHANGES configure.in
Log:
Fix the detection of INT64_C() when defined in <stdint.h>.
Submitted by: Joe Orton <[EMAIL PROTECTED]>
Reviewed by: Jeff Trawick
Revision Changes Path
1.344 +3 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- CHANGES 16 Oct 2002 11:36:32 -0000 1.343
+++ CHANGES 16 Oct 2002 11:46:14 -0000 1.344
@@ -1,5 +1,8 @@
Changes with APR 0.9.2
+ *) Fix the detection of INT64_C() when defined in <stdint.h>.
+ [Joe Orton <[EMAIL PROTECTED]>]
+
*) Don't use whitespace before preprocessor directives in the configure
logic. Such whitespace breaks with some older preprocessors; a
particularly nasty break occurs on Tru64 4.0f where APR_CHECK_DEFINE
1.487 +16 -19 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -r1.486 -r1.487
--- configure.in 16 Oct 2002 11:36:33 -0000 1.486
+++ configure.in 16 Oct 2002 11:46:14 -0000 1.487
@@ -1093,29 +1093,26 @@
int64_t_fmt_len='#error Can not determine the proper size for
apr_int64_t'
fi
-dnl # If present, allow the C99 macro INT64_C to override our conversion.
-dnl #
-dnl # HP-UX's ANSI C compiler provides this without any includes, so we
-dnl # will first look for INT64_C without adding stdint.h
-AC_MSG_CHECKING(for INT64_C)
-stdint=0
+# If present, allow the C99 macro INT64_C to override our conversion.
+#
+# HP-UX's ANSI C compiler provides this without any includes, so we
+# will first look for INT64_C without adding stdint.h
+AC_CACHE_CHECK([for INT64_C], [apr_cv_define_INT64_C], [
AC_EGREP_CPP(YES_IS_DEFINED,
[#ifdef INT64_C
YES_IS_DEFINED
-#endif
-],
-[ ac_cv_define_INT64_C=yes
- AC_MSG_RESULT(yes)
-],
-[ ac_cv_define_INT64_C=no
- AC_MSG_RESULT(no)
- APR_CHECK_DEFINE(INT64_C, stdint.h)
- if test "$ac_cv_define_INT64_C" = "yes"; then
- stdint=1
- fi
-])
-if test "$ac_cv_define_INT64_C" = "yes"; then
+#endif], [apr_cv_define_INT64_C=yes], [
+ # Now check for INT64_C in stdint.h
+ AC_EGREP_CPP(YES_IS_DEFINED, [#include <stdint.h>
+#ifdef INT64_C
+YES_IS_DEFINED
+#endif], [apr_cv_define_INT64_C=yes], [apr_cv_define_INT64_C=no])])])
+
+if test "$apr_cv_define_INT64_C" = "yes"; then
int64_literal='#define APR_INT64_C(val) INT64_C(val)'
+ stdint=1
+else
+ stdint=0
fi
if test "$ac_cv_type_off_t" = "yes"; then
