--- configure.orig	Fri Feb 11 15:18:52 2005
+++ configure	Sun Jul 10 20:38:20 2005
@@ -10139,7 +10139,7 @@
 
 use_cc_g_flag=no
 DRIVERDIRS=""
-LOCALEDIR="/usr/share/locale"
+LOCALEDIR="${prefix}/share/locale"
 DRIVERLIBS="lib/libui.a lib/libui-hlp.a lib/libengine.a lib/libutil.a lib/libfilter.a"
 CFLAGS="$CCOPTS"
 # Find a good install program.  We prefer a C program (faster),
@@ -13597,7 +13597,7 @@
 
     if $search_aalib
     then
-        if test -f /usr/include/aalib.h
+        if /usr/bin/true
         then
             LIBS1="$LIBS"
             if test "x$no_x" = x; then
@@ -13670,8 +13670,8 @@
 fi
 
             if test "x$ac_cv_lib_aa_aa_init" = xyes; then
-              echo "$as_me:$LINENO: result: Found aalib on /usr/include/aalib.h" >&5
-echo "${ECHO_T}Found aalib on /usr/include/aalib.h" >&6
+              echo "$as_me:$LINENO: result: Found aalib on ${PREFIX}/include/aalib.h" >&5
+echo "${ECHO_T}Found aalib on ${PREFIX}/include/aalib.h" >&6
               echo "$as_me:$LINENO: checking whether aalib version >= 1.4" >&5
 echo $ECHO_N "checking whether aalib version >= 1.4... $ECHO_C" >&6
 if test "${ac_aalib_ver_ok+set}" = set; then
@@ -13687,7 +13687,7 @@
  */
 #endif
 }' > conftest.c
-if test -z "`${CC-cc} -c conftest.c 2>&1`"; then
+if test -z "`${CC-cc} ${CFLAGS} -c conftest.c 2>&1`"; then
     ac_aalib_ver_ok=yes
     else
         ac_aalib_ver_ok=no
@@ -17607,7 +17607,7 @@
 #define SVGA_DRIVER 1
 _ACEOF
 
-  STICKY='chmod +s $(bindir)/xaos; chown root $(bindir)/xaos; chgrp root $(bindir)/xaos'
+  STICKY='chmod +s $(bindir)/xaos; chown root $(bindir)/xaos; chgrp wheel $(bindir)/xaos'
   DRIVERDIRS="$DRIVERDIRS ui/ui-drv/svga"
   DRIVERLIBS="$DRIVERLIBS lib/libuisvga.a"
   if test "x$ac_cv_func_pthread_sighandler" = xyes; then
