diff --git a/configure b/configure
index 1d01d508bf9b8537e7bb9942c698a2a89b631fa2..b4c0d825f988c0fdb122dfd8117989df8f479629 100755
--- a/configure
+++ b/configure
@@ -1232,7 +1232,7 @@ if test "$gpl" != "yes"; then
         die "The Postprocessing code is under GPL and --enable-gpl is not specified."
     fi
 
-    if test "$liba52" != "no" -o "$liba52bin" != "no"; then
+    if enabled_any liba52 liba52bin ; then
         die "liba52 is under GPL and --enable-gpl is not specified."
     fi
 
@@ -1248,7 +1248,7 @@ if test "$gpl" != "yes"; then
         die "libdts is under GPL and --enable-gpl is not specified."
     fi
 
-    if test "$libfaad" != "no" -o "$libfaadbin" != "no"; then
+    if enabled_any libfaad libfaadbin ; then
         if check_header faad.h; then
             check_cc << EOF
                 #include <faad.h>