From ac80633ce275edddaa3e4fa2ae0c048ed00f7d74 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 22 Mar 2010 10:29:25 +0000
Subject: svn merge -c505 ^/branches/released .

---
 xorg-server/miext/rootless/Makefile.in | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'xorg-server/miext/rootless')

diff --git a/xorg-server/miext/rootless/Makefile.in b/xorg-server/miext/rootless/Makefile.in
index 60288a06b..3151f340b 100644
--- a/xorg-server/miext/rootless/Makefile.in
+++ b/xorg-server/miext/rootless/Makefile.in
@@ -125,6 +125,7 @@ DARWIN_LIBS = @DARWIN_LIBS@
 DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_LIBS = @DBUS_LIBS@
 DEFAULT_LIBRARY_PATH = @DEFAULT_LIBRARY_PATH@
+DEFAULT_LOGDIR = @DEFAULT_LOGDIR@
 DEFAULT_LOGPREFIX = @DEFAULT_LOGPREFIX@
 DEFAULT_MODULE_PATH = @DEFAULT_MODULE_PATH@
 DEFS = @DEFS@
@@ -256,6 +257,8 @@ RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
 SED = @SED@
+SELINUX_CFLAGS = @SELINUX_CFLAGS@
+SELINUX_LIBS = @SELINUX_LIBS@
 SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
 SET_MAKE = @SET_MAKE@
 SHA1_CFLAGS = @SHA1_CFLAGS@
-- 
cgit v1.2.3