diff options
| author | Yann Ylavic <ylavic@apache.org> | 2023-03-02 16:06:12 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2023-03-02 16:06:12 +0000 |
| commit | c4f3d474982d1f9a4ed851fa08b8d1578d02f88b (patch) | |
| tree | 8d2e950a70d3e0e9236aedd0ad5457fde5b461a6 | |
| parent | dd3257ecd4b2bc4ff554310fa409b2ce4f8ec134 (diff) | |
| download | apr-c4f3d474982d1f9a4ed851fa08b8d1578d02f88b.tar.gz | |
Revert r1907986.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1907987 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build/xml.m4 | 4 | ||||
| -rw-r--r-- | configure.in | 17 | ||||
| -rw-r--r-- | test/abts_tests.h | 5 |
3 files changed, 8 insertions, 18 deletions
diff --git a/build/xml.m4 b/build/xml.m4 index ede123b79..fe26f741d 100644 --- a/build/xml.m4 +++ b/build/xml.m4 @@ -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 ]) diff --git a/configure.in b/configure.in index d8356b76e..e47d8925b 100644 --- a/configure.in +++ b/configure.in @@ -566,9 +566,6 @@ if test "$ap_cv_atomic_builtins" = "yes" -o "$ap_cv__atomic_builtins" = "yes"; t 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]) diff --git a/test/abts_tests.h b/test/abts_tests.h index b36142125..b0302067c 100644 --- a/test/abts_tests.h +++ b/test/abts_tests.h @@ -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 */ |