diff --git a/configure b/configure
index 0721dbfada..1d01d508bf 100755
--- a/configure
+++ b/configure
@@ -1209,7 +1209,7 @@ ranlib="${cross_prefix}${ranlib}"
 strip="${cross_prefix}${strip}"
 
 # we need to build at least one lib type
-if disabled lstatic && disabled lshared; then
+if disabled_all lstatic lshared; then
     cat <<EOF
 At least one library type must be built.
 Specify --enable-static to build the static libraries or --enable-shared to
@@ -1543,8 +1543,7 @@ fi
 check_header malloc.h
 check_func memalign
 
-if test "$memalign" = "no" -a "$need_memalign" = "yes" -a \
-        "$memalign_hack" != "yes"; then
+if disabled memalign && enabled_all need_memalign memalign_hack ; then
     die "Error, no memalign() but SSE enabled, disable it or use --enable-memalign-hack."
 fi