regen

1 files changed, 11 insertions, 26 deletions

diff --git a/driver/xf86-video-cirrus/configure b/driver/xf86-video-cirrus/configure
index 693df594b..060d510c5 100644
--- a/driver/xf86-video-cirrus/configure
+++ b/driver/xf86-video-cirrus/configure
@@ -17926,8 +17926,6 @@ $as_echo "yes" >&6; }
 
 fi
 
-sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
-
 # Checks for libraries.
 SAVE_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
@@ -17971,10 +17969,7 @@ if test "x$XAA" != xno; then
         CPPFLAGS="$XORG_CFLAGS"
         for ac_header in xaa.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "xaa.h" "ac_cv_header_xaa_h" "
-#include <xorg-server.h>
-
-"
+  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
@@ -18009,37 +18004,25 @@ else
   EXA=yes
 fi
 
-SAVE_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
 # 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; }
 if test "x$EXA" = xyes; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	as_ac_File=`$as_echo "ac_cv_file_${sdkdir}/exa.h" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${sdkdir}/exa.h" >&5
-$as_echo_n "checking for ${sdkdir}/exa.h... " >&6; }
-if eval \${$as_ac_File+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "${sdkdir}/exa.h"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+
+        SAVE_CPPFLAGS="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+        ac_fn_c_check_header_compile "$LINENO" "exa.h" "ac_cv_header_exa_h" "#include \"xorg-server.h\"
+"
+if test "x$ac_cv_header_exa_h" = xyes; then :
   have_exa_h="yes"
 else
   have_exa_h="no"
 fi
 
+
+        CPPFLAGS="$SAVE_CPPFLAGS"
 else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -18082,6 +18065,8 @@ $as_echo "#define USE_EXA 1" >>confdefs.h
 
         fi
 fi
+CPPFLAGS="$SAVE_CPPFLAGS"
+
  if test "x$USE_EXA" = xyes; then
   USE_EXA_TRUE=
   USE_EXA_FALSE='#'