From 71375066a441621d97ac7698c7206f66c44fbacd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Thu, 19 Jul 2012 14:13:06 -0400
Subject: [PATCH] Never install weston setuid

We don't support this anymore.  weston requires a setuid helper (such as
weston-launch) to run under kms, and should never run as root itself.

Disabe the setuid warning in configure.ac since we now only install the
minimal weston-launch as setuid.
---
 configure.ac    | 10 ----------
 src/Makefile.am |  8 --------
 2 files changed, 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6c27cd48..30c12b49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,13 +247,3 @@ AC_CONFIG_FILES([Makefile
 		 protocol/Makefile
 		 tests/Makefile])
 AC_OUTPUT
-
-if test "x$enable_setuid_install" = xyes; then
-AC_MSG_WARN([
-
- *** You've enabled the setuid install hook.  Weston is still a 
- *** pre-alpha project and may have bugs and issues that make a
- *** setuid install unsafe. Proceed at your own risk.
-])
-fi
-
diff --git a/src/Makefile.am b/src/Makefile.am
index 282df738..f7cb90c2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,14 +62,6 @@ install-exec-hook:
 	chmod u+s $(DESTDIR)$(bindir)/weston-launch
 endif
 
-else # BUILD_WESTON_LAUNCH
-
-if ENABLE_SETUID_INSTALL
-install-exec-hook:
-	chown root $(DESTDIR)$(bindir)/weston
-	chmod u+s $(DESTDIR)$(bindir)/weston
-endif
-
 endif # BUILD_WESTON_LAUNCH
 
 moduledir = @libdir@/weston