1 files changed, 56 insertions, 4 deletions

diff --git a/driver/xf86-video-radeonold/configure b/driver/xf86-video-radeonold/configure
index f39241193..25d1bfebb 100644
--- a/driver/xf86-video-radeonold/configure
+++ b/driver/xf86-video-radeonold/configure
@@ -677,6 +677,8 @@ PCIACCESS_CFLAGS
 USE_EXA_FALSE
 USE_EXA_TRUE
 XMODES_CFLAGS
+XAA_FALSE
+XAA_TRUE
 XMODES_FALSE
 XMODES_TRUE
 DRI_LIBS
@@ -813,6 +815,7 @@ with_xorg_module_dir
 enable_dri
 enable_exa
 with_xserver_source
+enable_xaa
 with_ps2pdf
 '
       ac_precious_vars='build_alias
@@ -1465,6 +1468,8 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-dri           Disable DRI support [[default=auto]]
   --disable-exa           Disable EXA support [[default=enabled]]
+  --enable-xaa            Enable legacy X Acceleration Architecture (XAA)
+                          [default=auto]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -12887,10 +12892,6 @@ fi
 
 CFLAGS="$save_CFLAGS"
 
-
-$as_echo "#define USE_XAA 1" >>confdefs.h
-
-
 # Properly handle EXA.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable EXA support" >&5
 $as_echo_n "checking whether to enable EXA support... " >&6; }
@@ -13026,6 +13027,53 @@ if test "x$XSERVER_SOURCE" = x; then
         fi
 fi
 
+# Check whether --enable-xaa was given.
+if test "${enable_xaa+set}" = set; then :
+  enableval=$enable_xaa; XAA="$enableval"
+else
+  XAA=auto
+fi
+
+if test "x$XAA" != xno; then
+        save_CFLAGS=$CFLAGS
+        save_CPPFLAGS=$CPPFLAGS
+        CFLAGS=$XORG_CFLAGS
+        CPPFLAGS="$XORG_CFLAGS"
+        for ac_header in xaa.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "xaa.h" "ac_cv_header_xaa_h" "$ac_includes_default"
+if test "x$ac_cv_header_xaa_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_XAA_H 1
+_ACEOF
+ XAA=yes
+else
+  XAA=no
+fi
+
+done
+
+        CFLAGS=$save_CFLAGS
+        CPPFLAGS=$save_CPPFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include XAA support" >&5
+$as_echo_n "checking whether to include XAA support... " >&6; }
+ if test "x$XAA" = xyes; then
+  XAA_TRUE=
+  XAA_FALSE='#'
+else
+  XAA_TRUE='#'
+  XAA_FALSE=
+fi
+
+if test "x$XAA" = xyes; then
+
+$as_echo "#define USE_XAA test \"x\$XAA\" = xyes" >>confdefs.h
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XAA" >&5
+$as_echo "$XAA" >&6; }
+
 if test -d "$XSERVER_SOURCE"; then
         case "$XSERVER_SOURCE" in
         /*)
@@ -13867,6 +13915,10 @@ if test -z "${XMODES_TRUE}" && test -z "${XMODES_FALSE}"; then
   as_fn_error $? "conditional \"XMODES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${XAA_TRUE}" && test -z "${XAA_FALSE}"; then
+  as_fn_error $? "conditional \"XAA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${USE_EXA_TRUE}" && test -z "${USE_EXA_FALSE}"; then
   as_fn_error $? "conditional \"USE_EXA\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5