X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/0f23f75ff53acadf80e9d3dfd2dfd14cb526074f..1da1ed6a5815deef6c33d74f1eb3c856793df3e5:/configure.ac diff --git a/configure.ac b/configure.ac index 8a58d782..715a5c28 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ mdw_AUTO_VERSION AC_INIT([catacomb], AUTO_VERSION, [mdw@distorted.org.uk]) AC_CONFIG_SRCDIR([catacomb.pc.in]) AC_CONFIG_AUX_DIR([config]) -AM_INIT_AUTOMAKE([foreign parallel-tests]) +AM_INIT_AUTOMAKE([foreign parallel-tests color-tests subdir-objects]) AC_CANONICAL_HOST mdw_SILENT_RULES @@ -58,7 +58,8 @@ AC_DEFUN([catacomb_CPU_FAMILIES], [$1([i[[3-6]]86,cygwin], [x86], [win]) $1([i[[3-6]]86,*], [x86], [sysv]) $1([x86_64,cygwin], [amd64], [win]) - $1([x86_64,*], [amd64], [sysv])]) + $1([x86_64,*], [amd64], [sysv]) + $1([armv*,*-gnueabi | armv*,*-gnueabihf], [armel], [gnueabi])]) dnl A utility to clear the `seen' flags, used so as to process each CPU or dnl ABI once. @@ -128,6 +129,12 @@ case $CPUFAM in *) AC_MSG_RESULT([$CPUFAM/$ABI]) ;; esac +dnl Some equipment wanted for checking CPU features at runtime. +AC_CHECK_HEADERS([asm/hwcap.h]) +AC_CHECK_HEADERS([sys/auxv.h]) +AC_CHECK_HEADERS([linux/auxvec.h]) +AC_CHECK_FUNCS([getauxval]) + dnl-------------------------------------------------------------------------- dnl C programming environment. @@ -241,7 +248,7 @@ dnl Memory locking support. AC_CHECK_FUNCS([mlock]) dnl Necessary support libraries. -PKG_CHECK_MODULES([mLib], [mLib >= 2.2.1]) +PKG_CHECK_MODULES([mLib], [mLib >= 2.2.2.1]) AM_CFLAGS="$AM_CFLAGS $mLib_CFLAGS" dnl--------------------------------------------------------------------------