From 97b2b267e0f507de39db41ba4473831d4c22b548 Mon Sep 17 00:00:00 2001 From: David Bercovitz Date: Thu, 27 Oct 2011 13:53:52 +0200 Subject: [PATCH] Define conditional with AM_CONDITIONAL before its use. Usage of Conditionals describes that a conditional must be defined before it is used in configure.ac using the macro AM_CONDITIONAL. This commit fixes ./configure step when --enable-test is undefined. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index f07ff96..e80c08e 100644 --- a/configure.ac +++ b/configure.ac @@ -56,13 +56,11 @@ if test "x$TEST" = xyes; then # Check for individual driver implementations... not required for # libdri2, but is required for the test app to map the buffer.. PKG_CHECK_MODULES(NOUVEAU, libdrm_nouveau, [HAVE_NOUVEAU=yes], [HAVE_NOUVEAU=no]) - AM_CONDITIONAL(ENABLE_NOUVEAU, [test "x$HAVE_NOUVEAU" = xyes]) if test "x$HAVE_NOUVEAU" = "xyes"; then have_drm_driver=yes AC_DEFINE(HAVE_NOUVEAU, 1, [Have nouveau support]) fi PKG_CHECK_MODULES(OMAP, libdrm_omap, [HAVE_OMAP=yes], [HAVE_OMAP=no]) - AM_CONDITIONAL(ENABLE_OMAP, [test "x$HAVE_OMAP" = xyes]) if test "x$HAVE_OMAP" = "xyes"; then have_drm_driver=yes AC_DEFINE(HAVE_OMAP, 1, [Have omap support]) @@ -75,6 +73,8 @@ if test "x$TEST" = xyes; then TEST=no fi fi +AM_CONDITIONAL(ENABLE_OMAP, [test "x$HAVE_OMAP" = xyes]) +AM_CONDITIONAL(ENABLE_NOUVEAU, [test "x$HAVE_NOUVEAU" = xyes]) AM_CONDITIONAL(ENABLE_TEST, [test "x$TEST" = xyes]) # Allow checking code with lint, sparse, etc. -- 2.39.2