[svn-commits] pabelanger: branch pabelanger/non-root r276614 - /team/pabelanger/non-root/

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Wed Jul 14 23:20:47 2010
New Revision: 276614

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=276614
Log:
rename command to --enable-root

Modified:
    team/pabelanger/non-root/Makefile
    team/pabelanger/non-root/configure
    team/pabelanger/non-root/configure.ac

Modified: team/pabelanger/non-root/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/Makefile?view=diff&rev=276614&r1=276613&r2=276614
==============================================================================
--- team/pabelanger/non-root/Makefile (original)
+++ team/pabelanger/non-root/Makefile Wed Jul 14 23:20:47 2010
@@ -716,8 +716,7 @@
 	done
 	if [ "$(OVERWRITE)" = "y" ]; then \
 		echo "Updating asterisk.conf" ; \
-		sed \
-			-e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
+		sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
 			-e 's|^astmoddir.*$$|astmoddir => $(MODULES_DIR)|' \
 			-e 's|^astvarlibdir.*$$|astvarlibdir => $(ASTVARLIBDIR)|' \
 			-e 's|^astdbdir.*$$|astdbdir => $(ASTDBDIR)|' \

Modified: team/pabelanger/non-root/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/configure.ac?view=diff&rev=276614&r1=276613&r2=276614
==============================================================================
--- team/pabelanger/non-root/configure.ac (original)
+++ team/pabelanger/non-root/configure.ac Wed Jul 14 23:20:47 2010
@@ -497,17 +497,17 @@
 AC_DEFINE_UNQUOTED([AST_USER],"$ast_user",[name of the Asterisk user])
 AC_DEFINE_UNQUOTED([AST_GROUP],"$ast_group",[name of the Asterisk group])
 
-AC_ARG_ENABLE([non-root],
-	[AS_HELP_STRING([--disable-non-root],
-		[Explicitly disable non-root installation])],
+AC_ARG_ENABLE([root],
+	[AS_HELP_STRING([--enable-root],
+		[Explicitly enable root installation])],
 	[case "${enableval}" in
-		y|ye|yes) disable_nonroot=no ;;
-		n|no) disable_nonroot=yes ;;
-		*) AC_MSG_ERROR(bad value ${enableval} for --disable-non-root) ;;
-	esac], [disable_nonroot=no])
+		y|ye|yes) enable_root=yes ;;
+		n|no) enable_root=no ;;
+		*) AC_MSG_ERROR(bad value ${enableval} for --enable-root) ;;
+	esac], [enable_root=no])
 
 dnl Check for asterisk in /etc/passwd
-if test "${disable_nonroot}" != "yes" ; then
+if test "${enable_root}" = "no" ; then
 	dnl parse /etc/passwd
 	AC_MSG_CHECKING([for ${ast_user} user])
 	if test -r /etc/passwd ; then
@@ -517,8 +517,8 @@
 	if test "${astuser}" -eq 0 ; then
 		AC_MSG_RESULT(no)
 		AC_MSG_NOTICE(*** Unable to install Asterisk using ${ast_user} user permission; confirm the user exists.)
-		AC_MSG_NOTICE(*** Please run the 'configure' script with the '--disable-non-root' parameter option)
-		AC_MSG_NOTICE(*** or create the appropiate user.) 
+		AC_MSG_NOTICE(*** Please run the 'configure' script with the '--enable-root' parameter option)
+		AC_MSG_NOTICE(*** or create the appropiate user.)
 		exit 1
 	else
 		AC_MSG_RESULT(yes)
@@ -534,8 +534,8 @@
 	if test "${astgroup}" -eq 0 ; then
 		AC_MSG_RESULT(no)
 		AC_MSG_NOTICE(*** Unable to install Asterisk using ${ast_group} group permission; confirm the group exists.)
-		AC_MSG_NOTICE(*** Please run the 'configure' script with the '--disable-non-root' parameter option)
-		AC_MSG_NOTICE(*** or create the appropiate group.) 
+		AC_MSG_NOTICE(*** Please run the 'configure' script with the '--enable-root' parameter option)
+		AC_MSG_NOTICE(*** or create the appropiate group.)
 		exit 1
 	else
 		AC_MSG_RESULT(yes)
@@ -1545,7 +1545,7 @@
 
 AC_ARG_ENABLE([xmldoc],
 	[AS_HELP_STRING([--disable-xmldoc],
-		[Explicity disable XML documentation])],
+		[Explicitly disable XML documentation])],
 	[case "${enableval}" in
 		y|ye|yes) disable_xmldoc=no ;;
 		n|no)  disable_xmldoc=yes ;;