diff options
| author | Yann Ylavic <ylavic@apache.org> | 2019-04-02 23:37:27 +0200 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2019-04-02 23:37:27 +0200 |
| commit | c051a01aed4c091334d1e50c5744e65a2e85945d (patch) | |
| tree | 125ba24dea5f52d8ba24671b116ad49cf5e6a0f3 /build | |
| parent | Fix for: [Bug 62372] Load balancer byrequests required when bytraffic chosen (diff) | |
| download | apache2-c051a01aed4c091334d1e50c5744e65a2e85945d.tar.xz apache2-c051a01aed4c091334d1e50c5744e65a2e85945d.zip | |
Well, our build with latest APR trunk seems to insist on updating apr_common.m4
So be it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1856846 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build')
| -rw-r--r-- | build/apr_common.m4 | 39 |
1 files changed, 36 insertions, 3 deletions
diff --git a/build/apr_common.m4 b/build/apr_common.m4 index 6b5c0f033b..f4e2dfd0a7 100644 --- a/build/apr_common.m4 +++ b/build/apr_common.m4 @@ -511,9 +511,9 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], [int main(int argc, const char *const *argv) {] [[$2]] [ return 0; }] - )], - [$3], [$4]) - CFLAGS=$apr_save_CFLAGS + )], [CFLAGS=$apr_save_CFLAGS +$3], [CFLAGS=$apr_save_CFLAGS +$4]) ]) dnl @@ -975,11 +975,44 @@ AC_SUBST(MKDEP) ]) dnl +dnl APR_CHECK_TYPES_FMT_COMPATIBLE(TYPE-1, TYPE-2, FMT-TAG, +dnl [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +dnl +dnl Try to determine whether two types are the same and accept the given +dnl printf formatter (bare token, e.g. literal d, ld, etc). +dnl +AC_DEFUN([APR_CHECK_TYPES_FMT_COMPATIBLE], [ +define([apr_cvname], apr_cv_typematch_[]translit([$1], [ ], [_])_[]translit([$2], [ ], [_])_[][$3]) +AC_CACHE_CHECK([whether $1 and $2 use fmt %$3], apr_cvname, [ +APR_TRY_COMPILE_NO_WARNING([#include <sys/types.h> +#include <stdio.h> +#ifdef HAVE_STDINT_H +#include <stdint.h> +#endif +], [ + $1 chk1, *ptr1; + $2 chk2, *ptr2 = &chk1; + ptr1 = &chk2; + *ptr1 = *ptr2 = 0; + printf("%$3 %$3", chk1, chk2); +], [apr_cvname=yes], [apr_cvname=no])]) +if test "$apr_cvname" = "yes"; then + : + $4 +else + : + $5 +fi +]) + +dnl dnl APR_CHECK_TYPES_COMPATIBLE(TYPE-1, TYPE-2, [ACTION-IF-TRUE]) dnl dnl Try to determine whether two types are the same. Only works dnl for gcc and icc. dnl +dnl @deprecated @see APR_CHECK_TYPES_FMT_COMPATIBLE +dnl AC_DEFUN([APR_CHECK_TYPES_COMPATIBLE], [ define([apr_cvname], apr_cv_typematch_[]translit([$1], [ ], [_])_[]translit([$2], [ ], [_])) AC_CACHE_CHECK([whether $1 and $2 are the same], apr_cvname, [ |