[glick2] Add option to disable setuid during install, use in distcheck

[Alexander Larsson <alexl src gnome org>]

commit 35bceb550336f634e06df537411d1d7a0475eb78
Author: Alexander Larsson <alexl redhat com>
Date:   Thu Oct 13 18:51:22 2011 +0200

    Add option to disable setuid during install, use in distcheck

 Makefile.am  |    4 ++++
 configure.ac |    7 +++++++
 2 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a777291..bf0dec9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,11 +42,13 @@ install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(BUNDLE_PREFIX)
 	$(mkinstalldirs) $(DESTDIR)$(SESSION_PREFIX)
 
+if SETUID_INSTALL
 install-exec-hook:
 	chown root $(DESTDIR)$(libexecdir)/glick-helper
 	chmod 4755 $(DESTDIR)$(libexecdir)/glick-helper
 	chown root $(DESTDIR)$(bindir)/glick-session
 	chmod 4755 $(DESTDIR)$(bindir)/glick-session
+endif
 
 ChangeLog:
 	$(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
@@ -113,3 +115,5 @@ glick.desktop: Makefile glick.desktop.in
 	mv $  tmp $@
 
 EXTRA_DIST=glick2.conf.in glick.desktop.in glick2.xml
+
+DISTCHECK_CONFIGURE_FLAGS=--disable-setuid-install
diff --git a/configure.ac b/configure.ac
index 6d2170b..3530a8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,4 +55,11 @@ AC_ARG_ENABLE(caches,
 
 AM_CONDITIONAL(UPDATE_CACHES, test x"$enable_caches" = "xyes")
 
+AC_ARG_ENABLE(setuid-install,
+		AS_HELP_STRING([--disable-setuid-install],[Don't set setuid flags on binaries during install]),
+		[enable_setuid_install=$enableval],
+		[enable_setuid_install="yes"])
+
+AM_CONDITIONAL(SETUID_INSTALL, test x"$enable_setuid_install" = "xyes")
+
 AC_OUTPUT