configure.ac: Move prime stuff to where it belongs

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>

diff --git a/configure.ac b/configure.ac
index d66c9f9..1381279 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -59,16 +59,6 @@ XORG_DEFAULT_OPTIONS
 PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.38 libdrm])
 PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
 
-# for dma-buf tests
-AC_ARG_ENABLE(nouveau, AS_HELP_STRING([--disable-nouveau],
-             [Enable use of nouveau API for prime tests (default: enabled)]),
-             [NOUVEAU=$enableval], [NOUVEAU=yes])
-if test "x$NOUVEAU" = xyes; then
-       PKG_CHECK_MODULES(DRM_NOUVEAU, [libdrm_nouveau >= 2.4.33])
-       AC_DEFINE(HAVE_NOUVEAU, 1, [Have nouveau support])
-fi
-AM_CONDITIONAL(HAVE_NOUVEAU, [test "x$NOUVEAU" = xyes])
-
 # for testdisplay
 PKG_CHECK_MODULES(CAIRO, cairo)
 PKG_CHECK_MODULES(LIBUDEV, [libudev], [udev=yes], [udev=no])
@@ -80,6 +70,16 @@ PKG_CHECK_MODULES(GLIB, glib-2.0)
 # -----------------------------------------------------------------------------
 #                      Configuration options
 # -----------------------------------------------------------------------------
+# for dma-buf tests
+AC_ARG_ENABLE(nouveau, AS_HELP_STRING([--disable-nouveau],
+             [Enable use of nouveau API for prime tests (default: enabled)]),
+             [NOUVEAU=$enableval], [NOUVEAU=yes])
+if test "x$NOUVEAU" = xyes; then
+       PKG_CHECK_MODULES(DRM_NOUVEAU, [libdrm_nouveau >= 2.4.33])
+       AC_DEFINE(HAVE_NOUVEAU, 1, [Have nouveau support])
+fi
+AM_CONDITIONAL(HAVE_NOUVEAU, [test "x$NOUVEAU" = xyes])
+
 # Define a configure option for the shadder debugger
 AC_ARG_ENABLE(shader-debugger, AS_HELP_STRING([--enable-shader-debugger],
              [Enable shader debugging support [autodetected]]),