980707ac10
Backport a bunch of patches that fixes build when using new Autoconf and Automake. The patches removed are replaced by upstream backports which are more complete. Signed-off-by: Michael Pratt <mcpratt@pm.me>
39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
From ea9344182b7559b12aa523548bb6d37d0e009028
|
|
From: Yann Ylavic <ylavic@apache.org>
|
|
Date: Wed, 24 Mar 2021 15:02:52 +0000
|
|
Subject: [PATCH] Follow up to r1887279: fix new APR_TRY_COMPILE_NO_WARNING.
|
|
|
|
AC_LANG_PROGRAM generates an "int main()" prototype which some compilers warn
|
|
about. Restore AC_LANG_SOURCE to manually set the correct main() but do not
|
|
#include "confdefs.h" if it is inlined already by AC_LANG_SOURCE (i.e.
|
|
check whether PACKAGE_NAME is already defined).
|
|
|
|
Github: closes #25
|
|
|
|
|
|
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1888017 13f79535-47bb-0310-9956-ffa450edef68
|
|
---
|
|
build/apr_common.m4 | 11 +++++++++--
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
--- a/build/apr_common.m4
|
|
+++ b/build/apr_common.m4
|
|
@@ -467,9 +467,16 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
|
|
CFLAGS="$CFLAGS -Werror"
|
|
fi
|
|
AC_COMPILE_IFELSE(
|
|
- [AC_LANG_PROGRAM(
|
|
- [[$1]],
|
|
+ [AC_LANG_SOURCE(
|
|
+ [
|
|
+#ifndef PACKAGE_NAME
|
|
+#include "confdefs.h"
|
|
+#endif
|
|
+ ]
|
|
+ [[$1]]
|
|
+ [int main(int argc, const char *const *argv) {]
|
|
[[$2]]
|
|
+ [ return 0; }]
|
|
)], [CFLAGS=$apr_save_CFLAGS
|
|
$3], [CFLAGS=$apr_save_CFLAGS
|
|
$4])
|