From e40b0dc252b36a1cdd240b169672fcfb6a2686b8 Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Mon, 31 Jan 2022 14:41:32 -0700 Subject: [PATCH] configure: openssl / memcached build fix On Debian/Ubuntu, compilation against openssl 3.0 causes a failure to find INT_MAX, despite the openssl headers including limits.h. However, the fact that the libmemcached-dev package provides both /usr/include/libmemcached{,-1.0} directories, both of which contain memcached.h, mean that MCACHED_IPATH ends up set to the libmemcached-1.0 one, which contains a limits.h, which shadows /usr/include/limits.h. Don't do that. --- configure | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 8ad8af2..1cde2f1 100755 --- a/configure +++ b/configure @@ -998,11 +998,9 @@ echo "Checking for Memcached (libmemcached/memcached.h) ..." if [ "X" = "X$MCACHED_IPATH" ]; then if [ -f "$i/memcached.h" ]; then MCACHED_IPATH="$i" - fi - if [ -f "$i/libmemcached/memcached.h" ]; then + elif [ -f "$i/libmemcached/memcached.h" ]; then MCACHED_IPATH="$i/libmemcached" - fi - if [ -f "$i/libmemcached-1.0/memcached.h" ]; then + elif [ -f "$i/libmemcached-1.0/memcached.h" ]; then MCACHED_IPATH="$i/libmemcached-1.0" fi fi