You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by yl...@apache.org on 2023/03/02 16:06:12 UTC
svn commit: r1907987 - in /apr/apr/trunk: build/xml.m4 configure.in test/abts_tests.h
Author: ylavic
Date: Thu Mar 2 16:06:12 2023
New Revision: 1907987
URL: http://svn.apache.org/viewvc?rev=1907987&view=rev
Log:
Revert r1907986.
Modified:
apr/apr/trunk/build/xml.m4
apr/apr/trunk/configure.in
apr/apr/trunk/test/abts_tests.h
Modified: apr/apr/trunk/build/xml.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/xml.m4?rev=1907987&r1=1907986&r2=1907987&view=diff
==============================================================================
--- apr/apr/trunk/build/xml.m4 (original)
+++ apr/apr/trunk/build/xml.m4 Thu Mar 2 16:06:12 2023
@@ -218,7 +218,7 @@ APU_FIND_EXPAT
if test ${apu_has_expat} = "1" && test ${apu_has_libxml2} = "1" ; then
AC_MSG_ERROR(Cannot build with both expat and libxml2 - please select one)
-#elif test ${apu_has_expat} != "1" && test ${apu_has_libxml2} != "1" ; then
-# AC_MSG_ERROR(No XML parser found! Please specify --with-expat or --with-libxml2)
+elif test ${apu_has_expat} != "1" && test ${apu_has_libxml2} != "1" ; then
+ AC_MSG_ERROR(No XML parser found! Please specify --with-expat or --with-libxml2)
fi
])
Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=1907987&r1=1907986&r2=1907987&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Thu Mar 2 16:06:12 2023
@@ -566,9 +566,6 @@ if test "$ap_cv_atomic_builtins" = "yes"
if test "$ap_cv__atomic_builtins" = "yes"; then
AC_DEFINE(HAVE__ATOMIC_BUILTINS, 1, [Define if compiler provides 32bit __atomic builtins])
fi
- has_atomic_builtins=yes
-else
- has_atomic_builtins=no
fi
AC_CACHE_CHECK([whether the compiler provides 64bit atomic builtins], [ap_cv_atomic_builtins64],
@@ -832,15 +829,10 @@ AC_ARG_ENABLE(nonportable-atomics,
force_generic_atomics=yes
fi
],
-[force_generic_atomics=no
-case $host_cpu in
- i[[34]]86) force_generic_atomics=yes;;
- i[[56]]86)
- if test $has_atomic_builtins != yes; then
- force_generic_atomics=yes
- fi
- ;;
- *) case $host in
+[case $host_cpu in
+ i[[456]]86) force_generic_atomics=yes ;;
+ *) force_generic_atomics=no
+ case $host in
*solaris2.10*)
AC_TRY_COMPILE(
[#include <atomic.h>],
@@ -855,6 +847,7 @@ case $host_cpu in
;;
esac
])
+
if test $force_generic_atomics = yes; then
AC_DEFINE([USE_ATOMICS_GENERIC], 1,
[Define if use of generic atomics is requested])
Modified: apr/apr/trunk/test/abts_tests.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/abts_tests.h?rev=1907987&r1=1907986&r2=1907987&view=diff
==============================================================================
--- apr/apr/trunk/test/abts_tests.h (original)
+++ apr/apr/trunk/test/abts_tests.h Thu Mar 2 16:06:12 2023
@@ -23,9 +23,7 @@
const struct testlist {
abts_suite *(*func)(abts_suite *suite);
} alltests[] = {
- {testatomic}
-#if 0
- ,
+ {testatomic},
{testdir},
{testdso},
{testdup},
@@ -96,7 +94,6 @@ const struct testlist {
{testsiphash},
{testjson},
{testjose}
-#endif
};
#endif /* APR_TEST_INCLUDES */