Change startupitem_install default if not root

Closes: https://trac.macports.org/ticket/56743
This commit is contained in:
Joshua Root
2021-04-14 03:40:41 +10:00
parent 3f248bd82a
commit a18eb94efc
2 changed files with 16 additions and 8 deletions
Vendored
+8 -4
View File
@@ -742,14 +742,18 @@ AC_DEFUN([MP_PATH_FRAMEWORKS],[
AC_DEFUN([MP_CHECK_STARTUPITEMS],[
dnl if the user specifies --without-startupitems,
dnl set "startupitem_install no" in macports.conf
AC_ARG_WITH(startupitems, [AS_HELP_STRING([--without-startupitems],[set "startupitem_install no" in macports.conf])], [with_startupitems=$withval], [with_startupitems=yes] )
AC_ARG_WITH(startupitems, [AS_HELP_STRING([--without-startupitems],[set "startupitem_install no" in macports.conf])], [with_startupitems=$withval], [with_startupitems=default] )
AC_MSG_CHECKING([for startupitem_install])
if test "x$with_startupitems" != "xno" ; then
startupitem_install="#startupitem_install yes"
else
if test "x$with_startupitems" = "xno" ; then
startupitem_install="startupitem_install no"
elif test "x$with_startupitems" = "xdefault" -a "$DSTUSR" != "root" ; then
startupitem_install="startupitem_install no"
with_startupitems=no
else
startupitem_install="#startupitem_install yes"
with_startupitems=yes
fi
AC_MSG_RESULT([$with_startupitems])
Vendored
+8 -4
View File
@@ -7095,17 +7095,21 @@ if test ${with_startupitems+y}
then :
withval=$with_startupitems; with_startupitems=$withval
else $as_nop
with_startupitems=yes
with_startupitems=default
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for startupitem_install" >&5
printf %s "checking for startupitem_install... " >&6; }
if test "x$with_startupitems" != "xno" ; then
startupitem_install="#startupitem_install yes"
else
if test "x$with_startupitems" = "xno" ; then
startupitem_install="startupitem_install no"
elif test "x$with_startupitems" = "xdefault" -a "$DSTUSR" != "root" ; then
startupitem_install="startupitem_install no"
with_startupitems=no
else
startupitem_install="#startupitem_install yes"
with_startupitems=yes
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_startupitems" >&5