diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2009-11-20 12:51:19 +0200 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2009-11-20 12:51:19 +0200 |
| commit | c74c132f7f79a842c073c66575a4fdb985e4c2e3 (patch) | |
| tree | c8982faab86370e737363d096354529feff87022 /m4/tuklib_cpucores.m4 | |
| parent | Add support for --info-memory and --robot to xz. (diff) | |
| download | xz-c74c132f7f79a842c073c66575a4fdb985e4c2e3.tar.xz | |
Update tuklib_cpucores.m4 and tuklib_physmem.m4 from tuklib,
which now use AC_CACHE_CHECK. Using the cache variable,
configure now warns if there is no method to detect the amount
of RAM and recommends using --enable-assume-ram.
Diffstat (limited to 'm4/tuklib_cpucores.m4')
| -rw-r--r-- | m4/tuklib_cpucores.m4 | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/m4/tuklib_cpucores.m4 b/m4/tuklib_cpucores.m4 index 9058d445..bb33c6f4 100644 --- a/m4/tuklib_cpucores.m4 +++ b/m4/tuklib_cpucores.m4 @@ -25,7 +25,8 @@ AC_REQUIRE([TUKLIB_COMMON]) # sys/param.h might be needed by sys/sysctl.h. AC_CHECK_HEADERS([sys/param.h]) -AC_MSG_CHECKING([how to detect the number of available CPU cores]) +AC_CACHE_CHECK([how to detect the number of available CPU cores], + [tuklib_cv_cpucores_method], [ # Look for sysctl() solution first, because on OS/2, both sysconf() # and sysctl() pass the tests in this file, but only sysctl() @@ -45,12 +46,7 @@ main(void) sysctl(name, 2, &cpus, &cpus_size, NULL, 0); return 0; } -]])], [ - AC_DEFINE([TUKLIB_CPUCORES_SYSCTL], [1], - [Define to 1 if the number of available CPU cores can be - detected with sysctl().]) - AC_MSG_RESULT([sysctl]) -], [ +]])], [tuklib_cv_cpucores_method=sysctl], [ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ #include <unistd.h> @@ -62,11 +58,20 @@ main(void) return 0; } ]])], [ - AC_DEFINE([TUKLIB_CPUCORES_SYSCONF], [1], - [Define to 1 if the number of available CPU cores can be - detected with sysconf(_SC_NPROCESSORS_ONLN).]) - AC_MSG_RESULT([sysconf]) + tuklib_cv_cpucores_method=sysconf ], [ - AC_MSG_RESULT([unknown]) -])]) + tuklib_cv_cpucores_method=unknown +])])]) +case $tuklib_cv_cpucores_method in + sysctl) + AC_DEFINE([TUKLIB_CPUCORES_SYSCTL], [1], + [Define to 1 if the number of available CPU cores + can be detected with sysctl().]) + ;; + sysconf) + AC_DEFINE([TUKLIB_CPUCORES_SYSCONF], [1], + [Define to 1 if the number of available CPU cores + can be detected with sysconf(_SC_NPROCESSORS_ONLN).]) + ;; +esac ])dnl |