Merge r1856560, r1856561, r1856846 from trunk:

Update apr_common.m4 to latest (trunk).

Note: why is that file in the httpd repo??

Revert r1856560: was not the latest apr_common.m4 version anyway...

How does that change came in my local workspace in the first place??

Well, our build with latest APR trunk seems to insist on updating apr_common.m4

So be it.

Submitted by: ylavic
Reviewed by: rjung, jorton, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1864614 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 0f15b21281e76b1733b16648abdc1305a0e019e0..a38c9254a147ca56fccb0cd55622e20a1d579164 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -128,20 +128,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) apr_common.m4: Pick up from APR 1.7.0.
-     apr_common.m4 is currently from APR 1.6.x. When running buildconf
-     against APR 1.7.x it gets updated from there. Therefore in the
-     apr_common.m4 in the 2.4.40 tarball differs from the one in svn for 2.4.x
-     (a copy of the APR 1.6.x version in svn, a copy of the APR 1.7.x version
-     in the tarball).
-     The below backports the changes to apr_common.m4 in httpd trunk which
-     in effect result in the 2.4.x apr_common.m4 to become identical with
-     the one in APR 1.7.x (and trunk).
-     trunk patch: http://svn.apache.org/r1856560
-                  http://svn.apache.org/r1856561
-                  http://svn.apache.org/r1856846
-     2.4.x patch: svn merge -c 1856560,1856561,1856846 ^/httpd/httpd/trunk .
-     +1: rjung, jorton, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:

diff --git a/build/apr_common.m4 b/build/apr_common.m4
index 6b5c0f033b9e2aca5343a44ef26086f4e4cf1a66..f4e2dfd0a7cbc406fe327585d1461d6bd79e72b6 100644 (file)
--- 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
@@ -974,12 +974,45 @@ fi
 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, [