From 520c658706aa896d64f374cc74065394111f6122 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 2 Feb 2010 10:58:50 +1000
Subject: radeon: enable by default now that kms is out of staging

---
 configure.ac               | 9 +++++----
 radeon/libdrm_radeon.pc.in | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 49e193e3..185579cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,11 @@ AC_ARG_ENABLE(intel,
 	      [Enable support for intel's KMS API (default: auto)]),
 	      [INTEL=$enableval], [INTEL=auto])
 
+AC_ARG_ENABLE(radeon,
+	      AS_HELP_STRING([--disable-radeon],
+	      [Enable support for radeon's KMS API (default: enabled)]),
+	      [RADEON=$enableval], [RADEON=yes])
+
 AC_ARG_ENABLE(vmwgfx-experimental-api,
 	      AS_HELP_STRING([--enable-vmwgfx-experimental-api],
 	      [Install vmwgfx's experimental kernel API header (default: disabled)]),
@@ -64,10 +69,6 @@ AC_ARG_ENABLE(nouveau-experimental-api,
 	      [Enable support for nouveau's experimental API (default: disabled)]),
 	      [NOUVEAU=$enableval], [NOUVEAU=no])
 
-AC_ARG_ENABLE(radeon-experimental-api,
-	      AS_HELP_STRING([--enable-radeon-experimental-api],
-	      [Enable support for radeon's KMS API (default: disabled)]),
-	      [RADEON=$enableval], [RADEON=no])
 
 dnl ===========================================================================
 dnl check compiler flags
diff --git a/radeon/libdrm_radeon.pc.in b/radeon/libdrm_radeon.pc.in
index 33068448..ab703e13 100644
--- a/radeon/libdrm_radeon.pc.in
+++ b/radeon/libdrm_radeon.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@
 
 Name: libdrm_radeon
 Description: Userspace interface to kernel DRM services for radeon
-Version: 1.0.1
+Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -ldrm_radeon
 Cflags: -I${includedir} -I${includedir}/drm
-- 
cgit v1.2.3