From 71e867c5f5ee2c188244da33366e506935abffb7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 29 Nov 2006 21:06:58 +0000 Subject: * Remove --enable-setuid, --with-nix-user and --with-nix-group. Rather, setuid support is now always compiled in (at least on platforms that have the setresuid system call, e.g., Linux and FreeBSD), but it must enabled by chowning/chmodding the Nix binaries. --- configure.ac | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 37ebe06b5c2c..b5c0e61b590c 100644 --- a/configure.ac +++ b/configure.ac @@ -237,33 +237,13 @@ AM_CONDITIONAL(INIT_STATE, test "$init_state" = "yes") # Setuid installations. -AC_ARG_ENABLE(setuid, AC_HELP_STRING([--enable-setuid], - [install Nix setuid]), - setuid_hack=$enableval, setuid_hack=no) -AM_CONDITIONAL(SETUID_HACK, test "$setuid_hack" = "yes") -if test "$setuid_hack" = "yes"; then - AC_DEFINE(SETUID_HACK, 1, [whether to install Nix setuid]) -fi - AC_CHECK_FUNC(setresuid, [HAVE_SETRESUID=1], [HAVE_SETRESUID=]) AM_CONDITIONAL(HAVE_SETRESUID, test "$HAVE_SETRESUID" = "1") if test "$HAVE_SETRESUID" = "1"; then AC_DEFINE(HAVE_SETRESUID, 1, [whether we have setresuid()]) fi -AC_ARG_WITH(nix-user, AC_HELP_STRING([--with-nix-user=USER], - [user for Nix setuid binaries]), - NIX_USER=$withval, NIX_USER=nix) -AC_SUBST(NIX_USER) -AC_DEFINE_UNQUOTED(NIX_USER, ["$NIX_USER"], [Nix user]) - -AC_ARG_WITH(nix-group, AC_HELP_STRING([--with-nix-group=USER], - [group for Nix setuid binaries]), - NIX_GROUP=$withval, NIX_GROUP=nix) -AC_SUBST(NIX_GROUP) -AC_DEFINE_UNQUOTED(NIX_GROUP, ["$NIX_GROUP"], [Nix group]) - - + # This is needed if ATerm, Berkeley DB or bzip2 are static libraries, # and the Nix libraries are dynamic. if test "$(uname)" = "Darwin"; then -- cgit 1.4.1