From 86d126fc32ad738f1800ad74b02a8facf0864812 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 16 Feb 2015 16:40:10 +0000 Subject: [PATCH 04/31] fix: configure.ac: avoid potential non-portability from "test EXPR -a EXPR" Bug: https://bugs.freedesktop.org/show_bug.cgi?id=75113 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 5f1b5f9..dc6acc5 100644 --- a/configure.ac +++ b/configure.ac @@ -1056,9 +1056,9 @@ AS_IF([test x$enable_apparmor = xno], PKG_CHECK_MODULES([APPARMOR], [libapparmor >= 2.8.95], [have_apparmor=yes], [have_apparmor=no]) - AS_IF([test x$enable_apparmor = xauto -a x$have_apparmor = xno], + AS_IF([test x$enable_apparmor = xauto && test x$have_apparmor = xno], [AC_MSG_WARN([Sufficiently new AppArmor library not found])]) - AS_IF([test x$enable_apparmor != xauto -a x$have_apparmor = xno], + AS_IF([test x$enable_apparmor != xauto && test x$have_apparmor = xno], [AC_MSG_ERROR([AppArmor explicitly required, and AppArmor library not found])]) ]) -- 2.1.4