libdrm: make libdrm_nouveau conditional, disabled by default

libdrm isn't supposed to ship APIs not present in a released kernel.

diff --git a/configure.ac b/configure.ac
index 62d1a29..dbead72 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,10 @@ AC_ARG_ENABLE(udev,  AS_HELP_STRING([--enable-udev],
                                [Enable support for using udev instead of mknod (default: disabled)]),
                                [UDEV=$enableval], [UDEV=no])
 
+AC_ARG_ENABLE(nouveau-experimental-api,
+             AS_HELP_STRING([--enable-nouveau-experimental-api],
+             [Enable support for nouveau's experimental API (default: disabled)]),
+             [NOUVEAU=$enableval], [NOUVEAU=no])
 
 dnl ===========================================================================
 dnl check compiler flags
@@ -119,6 +123,11 @@ if test "x$UDEV" = xyes; then
        AC_DEFINE(UDEV, 1, [Have UDEV support])
 fi
 
+if test "x$NOUVEAU" = xyes; then
+NOUVEAU_SUBDIR="nouveau"
+AC_SUBST(NOUVEAU_SUBDIR)
+fi
+
 PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
 if test "x$HAVE_CAIRO" = xyes; then
        AC_DEFINE(HAVE_CAIRO, 1, [Have cairo support])

diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am
index cba4586..76145bc 100644 (file)
--- a/libdrm/Makefile.am
+++ b/libdrm/Makefile.am
@@ -18,7 +18,7 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-SUBDIRS = . intel nouveau
+SUBDIRS = . intel @NOUVEAU_SUBDIR@
 
 libdrm_la_LTLIBRARIES = libdrm.la
 libdrm_ladir = $(libdir)