From f2bbd019a031979ece82694b4e7d681e35c72225 Mon Sep 17 00:00:00 2001
From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 22 Mar 2019 23:11:04 +0000
Subject: Pull out caller actions from AC_CACHE_CHECK in
 APR_CHECK_TYPES_FMT_COMPATIBLE.

This allows to print results in the correct order when the function is chained.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1856089 13f79535-47bb-0310-9956-ffa450edef68
---
 build/apr_common.m4 | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'build')

diff --git a/build/apr_common.m4 b/build/apr_common.m4
index 208017116..f4e2dfd0a 100644
--- a/build/apr_common.m4
+++ b/build/apr_common.m4
@@ -975,8 +975,8 @@ AC_SUBST(MKDEP)
 ])
 
 dnl
-dnl APR_CHECK_TYPES_COMPATIBLE(TYPE-1, TYPE-2, FMT-TAG, 
-dnl                            [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+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).
@@ -995,9 +995,14 @@ APR_TRY_COMPILE_NO_WARNING([#include <sys/types.h>
     ptr1 = &chk2;
     *ptr1 = *ptr2 = 0;
     printf("%$3 %$3", chk1, chk2);
-], [apr_cvname=yes
-$4], [apr_cvname=no
-$5])])
+], [apr_cvname=yes], [apr_cvname=no])])
+if test "$apr_cvname" = "yes"; then
+    :
+    $4
+else
+    :
+    $5
+fi
 ])
 
 dnl
-- 
cgit v1.2.1