svn merge -c505 ^/branches/released .

1 files changed, 166 insertions, 117 deletions

diff --git a/xorg-server/configure b/xorg-server/configure
index 30c44d599..74af775ac 100644
--- a/xorg-server/configure
+++ b/xorg-server/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for xorg-server 1.7.99.901.
+# Generated by GNU Autoconf 2.65 for xorg-server 1.7.99.902.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -702,8 +702,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xorg-server'
 PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.7.99.901'
-PACKAGE_STRING='xorg-server 1.7.99.901'
+PACKAGE_VERSION='1.7.99.902'
+PACKAGE_STRING='xorg-server 1.7.99.902'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 PACKAGE_URL=''
 
@@ -848,6 +848,7 @@ XWIN_LIBS
 XWINMODULES_LIBS
 XWINMODULES_CFLAGS
 WINDRES
+DEFAULT_LOGDIR
 SYSCONFDIR
 XF86VIDMODE_FALSE
 XF86VIDMODE_TRUE
@@ -973,6 +974,8 @@ MULTIBUFFER_FALSE
 MULTIBUFFER_TRUE
 XCSECURITY_FALSE
 XCSECURITY_TRUE
+SELINUX_LIBS
+SELINUX_CFLAGS
 XSELINUX_FALSE
 XSELINUX_TRUE
 XACE_FALSE
@@ -1140,6 +1143,8 @@ CCAS
 HAVE_DOXYGEN_FALSE
 HAVE_DOXYGEN_TRUE
 DOXYGEN
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
 ADMIN_MAN_DIR
 DRIVER_MAN_DIR
 MISC_MAN_DIR
@@ -1163,8 +1168,6 @@ build
 INSTALL_CMD
 PKG_CONFIG
 CHANGELOG_CMD
-AM_BACKSLASH
-AM_DEFAULT_VERBOSITY
 CWARNFLAGS
 EGREP
 GREP
@@ -1254,9 +1257,9 @@ ac_user_opts='
 enable_option_checking
 enable_maintainer_mode
 enable_dependency_tracking
-enable_silent_rules
 enable_strict_compilation
 with_release_version
+enable_silent_rules
 with_doxygen
 enable_static
 enable_shared
@@ -1396,6 +1399,8 @@ DRI2PROTO_CFLAGS
 DRI2PROTO_LIBS
 LIBDRM_CFLAGS
 LIBDRM_LIBS
+SELINUX_CFLAGS
+SELINUX_LIBS
 XDMCP_CFLAGS
 XDMCP_LIBS
 GLIB_CFLAGS
@@ -1981,7 +1986,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xorg-server 1.7.99.901 to adapt to many kinds of systems.
+\`configure' configures xorg-server 1.7.99.902 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2051,7 +2056,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xorg-server 1.7.99.901:";;
+     short | recursive ) echo "Configuration of xorg-server 1.7.99.902:";;
    esac
   cat <<\_ACEOF
 
@@ -2063,11 +2068,11 @@ Optional Features:
 			  (and sometimes confusing) to the casual installer
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
-  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')
   --enable-strict-compilation
                           Enable all warnings from compiler and make them
                           errors (default: disabled)
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')
   --enable-static[=PKGS]  build static libraries [default=no]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-fast-install[=PKGS]
@@ -2263,6 +2268,10 @@ Some influential environment variables:
   LIBDRM_CFLAGS
               C compiler flags for LIBDRM, overriding pkg-config
   LIBDRM_LIBS linker flags for LIBDRM, overriding pkg-config
+  SELINUX_CFLAGS
+              C compiler flags for SELINUX, overriding pkg-config
+  SELINUX_LIBS
+              linker flags for SELINUX, overriding pkg-config
   XDMCP_CFLAGS
               C compiler flags for XDMCP, overriding pkg-config
   XDMCP_LIBS  linker flags for XDMCP, overriding pkg-config
@@ -2411,7 +2420,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xorg-server configure 1.7.99.901
+xorg-server configure 1.7.99.902
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -3110,7 +3119,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xorg-server $as_me 1.7.99.901, which was
+It was created by xorg-server $as_me 1.7.99.902, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -3457,7 +3466,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-RELEASE_DATE="2010-02-12"
+RELEASE_DATE="2010-03-21"
 
 am__api_version='1.11'
 
@@ -3920,7 +3929,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xorg-server'
- VERSION='1.7.99.901'
+ VERSION='1.7.99.902'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5745,7 +5754,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 if  test "x$GCC" = xyes ; then
     CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
 -Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
--Wbad-function-cast"
+-Wbad-function-cast -Wformat=2"
     case `$CC -dumpversion` in
     3.4.* | 4.*)
 	CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
@@ -5764,18 +5773,6 @@ fi
     fi
 fi
 
-# Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
-  enableval=$enable_silent_rules;
-fi
-
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=0;;
-esac
-AM_BACKSLASH='\'
-
 
 
 
@@ -5941,6 +5938,18 @@ fi
 
 
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=0;;
+esac
+AM_BACKSLASH='\'
+
 
 
 
@@ -6055,6 +6064,7 @@ $as_echo "$as_me: WARNING: ignoring DOXYGEN environment variable since --with-do
 else
    as_fn_error "--with-doxygen expects 'yes' or 'no'" "$LINENO" 5
 fi
+
  if test "$have_doxygen" = yes; then
   HAVE_DOXYGEN_TRUE=
   HAVE_DOXYGEN_FALSE='#'
@@ -7718,13 +7728,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:7721: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:7731: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7724: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:7734: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7727: output\"" >&5)
+  (eval echo "\"\$as_me:7737: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -8915,7 +8925,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8918 "configure"' > conftest.$ac_ext
+  echo '#line 8928 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -10145,11 +10155,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10148: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10158: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10152: \$? = $ac_status" >&5
+   echo "$as_me:10162: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10484,11 +10494,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10487: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10497: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10491: \$? = $ac_status" >&5
+   echo "$as_me:10501: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10589,11 +10599,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10592: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10602: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10596: \$? = $ac_status" >&5
+   echo "$as_me:10606: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10644,11 +10654,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10647: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10657: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10651: \$? = $ac_status" >&5
+   echo "$as_me:10661: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13028,7 +13038,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13031 "configure"
+#line 13041 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13124,7 +13134,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13127 "configure"
+#line 13137 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17022,7 +17032,8 @@ if test "$ac_res" != no; then :
 
 fi
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lws2_32" >&5
+ if test "$ac_cv_search_socket$ac_cv_search_gethostbyname" = "nono"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lws2_32" >&5
 $as_echo_n "checking for main in -lws2_32... " >&6; }
 if test "${ac_cv_lib_ws2_32_main+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -17062,6 +17073,7 @@ _ACEOF
 fi
 ac_cv_lib_ws2_32=ac_cv_lib_ws2_32_main
 
+ fi
 
  # Needs to come after above checks for libsocket & libnsl for SVR4 systems
  # Check whether --enable-ipv6 was given.
@@ -17414,8 +17426,8 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether to build documentation" >&5
-$as_echo_n "checking Whether to build documentation... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build documentation" >&5
+$as_echo_n "checking whether to build documentation... " >&6; }
 
 if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
    BUILDDOC=yes
@@ -17435,8 +17447,8 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILDDOC" >&5
 $as_echo "$BUILDDOC" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether to build pdf documentation" >&5
-$as_echo_n "checking Whether to build pdf documentation... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build pdf documentation" >&5
+$as_echo_n "checking whether to build pdf documentation... " >&6; }
 
 if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
    BUILDPDFDOC=yes
@@ -17561,6 +17573,7 @@ LIBXTST="xtst >= 1.0.99.2"
 LIBPCIACCESS="pciaccess >= 0.8.0"
 LIBGLIB="glib-2.0 >= 2.16"
 LIBUDEV="libudev >= 143"
+LIBSELINUX="libselinux >= 2.0.86"
 
 if test "x$CONFIG_UDEV" = xyes &&
  { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then
@@ -18836,69 +18849,6 @@ if test "x$XSELINUX" = xyes; then
 	if test "x$XACE" != xyes; then
 		as_fn_error "cannot build SELinux extension without X-ACE" "$LINENO" 5
 	fi
-	for ac_header in selinux/selinux.h selinux/avc.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  as_fn_error "SELinux include files not found" "$LINENO" 5
-fi
-
-done
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avc_init in -lselinux" >&5
-$as_echo_n "checking for avc_init in -lselinux... " >&6; }
-if test "${ac_cv_lib_selinux_avc_init+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lselinux  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char avc_init ();
-int
-main ()
-{
-return avc_init ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_selinux_avc_init=yes
-else
-  ac_cv_lib_selinux_avc_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_avc_init" >&5
-$as_echo "$ac_cv_lib_selinux_avc_init" >&6; }
-if test "x$ac_cv_lib_selinux_avc_init" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSELINUX 1
-_ACEOF
-
-  LIBS="-lselinux $LIBS"
-
-else
-  as_fn_error "SELinux library not found" "$LINENO" 5
-fi
-
 	for ac_header in libaudit.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "libaudit.h" "ac_cv_header_libaudit_h" "$ac_includes_default"
@@ -18960,18 +18910,100 @@ else
   as_fn_error "SELinux extension requires audit system library" "$LINENO" 5
 fi
 
-        ac_fn_c_check_decl "$LINENO" "avc_netlink_acquire_fd" "ac_cv_have_decl_avc_netlink_acquire_fd" "#include <selinux/avc.h>
-"
-if test "x$ac_cv_have_decl_avc_netlink_acquire_fd" = x""yes; then :
 
-$as_echo "#define HAVE_AVC_NETLINK_ACQUIRE_FD 1" >>confdefs.h
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SELINUX" >&5
+$as_echo_n "checking for SELINUX... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$SELINUX_CFLAGS"; then
+        pkg_cv_SELINUX_CFLAGS="$SELINUX_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBSELINUX\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$LIBSELINUX") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SELINUX_CFLAGS=`$PKG_CONFIG --cflags "$LIBSELINUX" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$SELINUX_LIBS"; then
+        pkg_cv_SELINUX_LIBS="$SELINUX_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBSELINUX\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$LIBSELINUX") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SELINUX_LIBS=`$PKG_CONFIG --libs "$LIBSELINUX" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
 
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
 fi
+        if test $_pkg_short_errors_supported = yes; then
+	        SELINUX_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBSELINUX"`
+        else
+	        SELINUX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBSELINUX"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SELINUX_PKG_ERRORS" >&5
+
+	as_fn_error "Package requirements ($LIBSELINUX) were not met:
+
+$SELINUX_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables SELINUX_CFLAGS
+and SELINUX_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" "$LINENO" 5
+elif test $pkg_failed = untried; then
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
 
+Alternatively, you may set the environment variables SELINUX_CFLAGS
+and SELINUX_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." "$LINENO" 5; }
+else
+	SELINUX_CFLAGS=$pkg_cv_SELINUX_CFLAGS
+	SELINUX_LIBS=$pkg_cv_SELINUX_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	:
+fi
+	SELINUX_LIBS="$SELINUX_LIBS -laudit"
 
 $as_echo "#define XSELINUX 1" >>confdefs.h
 
-	SELINUX_LIB="-lselinux -laudit"
 fi
 
  if test "x$XCSECURITY" = xyes; then
@@ -20716,7 +20748,7 @@ done
 
 	LIBS=$SAVE_LIBS
 	CFLAGS=$SAVE_CFLAGS
-	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $GLX_SYS_LIBS $SELINUX_LIB"
+	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $GLX_SYS_LIBS"
 	XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
 
 	case $host_os in
@@ -21683,6 +21715,23 @@ _ACEOF
   test "$exec_prefix_NONE" && exec_prefix=NONE
 
 
+  prefix_NONE=
+  exec_prefix_NONE=
+  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+  eval ac_define_dir="\"$logdir\""
+  eval ac_define_dir="\"$ac_define_dir\""
+  DEFAULT_LOGDIR="$ac_define_dir"
+
+
+cat >>confdefs.h <<_ACEOF
+#define DEFAULT_LOGDIR "$ac_define_dir"
+_ACEOF
+
+  test "$prefix_NONE" && prefix=NONE
+  test "$exec_prefix_NONE" && exec_prefix=NONE
+
+
 cat >>confdefs.h <<_ACEOF
 #define XORG_VERSION_CURRENT $VENDOR_RELEASE
 _ACEOF
@@ -24603,7 +24652,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xorg-server $as_me 1.7.99.901, which was
+This file was extended by xorg-server $as_me 1.7.99.902, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24669,7 +24718,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xorg-server config.status 1.7.99.901
+xorg-server config.status 1.7.99.902
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"