X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/61bd904b61ef893246791746517ef7a38ed732db..baf5b59c8aad82395688f0a96efcfba4e16b8fc2:/configure.ac diff --git a/configure.ac b/configure.ac index e3e5c21a..631f7838 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 @@ -59,7 +59,8 @@ AC_DEFUN([catacomb_CPU_FAMILIES], $1([i[[3-6]]86,*], [x86], [sysv]) $1([x86_64,cygwin], [amd64], [win]) $1([x86_64,*], [amd64], [sysv]) - $1([armv*,*-gnueabi | armv*,*-gnueabihf], [armel], [gnueabi])]) + $1([arm,*-gnueabi | arm,*-gnueabihf | dnl + 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. @@ -220,6 +221,7 @@ AC_SUBST([limits]) dnl Functions used for noise-gathering. AC_CHECK_FUNCS([setgroups]) +AC_CHECK_HEADERS([linux/random.h]) AC_CACHE_CHECK([whether the freewheel noise generator will work], [catacomb_cv_freewheel], [AC_TRY_LINK( @@ -248,7 +250,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--------------------------------------------------------------------------