Load cups into easysw/current.

[thirdparty/cups.git] / config-scripts / cups-opsys.m4

diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4
index b2b53126dfd676232c2fbb0a7cac46046bc10123..ae81eb481c961e7540fe31d80a3612867995fc83 100644 (file)
--- a/config-scripts/cups-opsys.m4
+++ b/config-scripts/cups-opsys.m4
@@ -1,30 +1,22 @@
 dnl
-dnl "$Id: cups-opsys.m4 4960 2006-01-20 16:41:20Z mike $"
+dnl "$Id: cups-opsys.m4 6649 2007-07-11 21:46:42Z mike $"
 dnl
 dnl   Operating system stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl   Copyright 2007 by Apple Inc.
+dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
-dnl Get the operating system and version number...
+dnl Get the operating system, version number, and architecture...
 uname=`uname`
 uversion=`uname -r | sed -e '1,$s/^[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\).*/\1\2/'`
+uarch=`uname -m`
 
 case "$uname" in
        GNU* | GNU/*)
@@ -38,63 +30,6 @@ case "$uname" in
                ;;
 esac
 
-dnl Determine the correct username and group for this OS...
-AC_ARG_WITH(cups-user, [  --with-cups-user        set default user for CUPS],
-       CUPS_USER="$withval",
-       AC_MSG_CHECKING(for default print user)
-       if test -f /etc/passwd; then
-               CUPS_USER=""
-               for user in lp lpd guest daemon nobody; do
-                       if test "`grep \^${user}: /etc/passwd`" != ""; then
-                               CUPS_USER="$user"
-                               AC_MSG_RESULT($user)
-                               break;
-                       fi
-               done
-
-               if test x$CUPS_USER = x; then
-                       CUPS_USER="${USER:=nobody}"
-                       AC_MSG_RESULT(not found, using "$CUPS_USER")
-               fi
-       else
-               CUPS_USER="${USER:=nobody}"
-               AC_MSG_RESULT(no password file, using "$CUPS_USER")
-       fi)
-
-AC_ARG_WITH(cups-group, [  --with-cups-group       set default group for CUPS],
-       CUPS_GROUP="$withval",
-       AC_MSG_CHECKING(for default print group)
-       if test -f /etc/group; then
-               if test x$uname = xDarwin; then
-                       GROUP_LIST="lp admin"
-               else
-                       GROUP_LIST="lpadmin sys system root"
-               fi
-
-               CUPS_GROUP=""
-               for group in $GROUP_LIST; do
-                       if test "`grep \^${group}: /etc/group`" != ""; then
-                               CUPS_GROUP="$group"
-                               AC_MSG_RESULT($group)
-                               break;
-                       fi
-               done
-
-               if test x$CUPS_GROUP = x; then
-                       CUPS_GROUP="${GROUP:=nobody}"
-                       AC_MSG_RESULT(not found, using "$CUPS_GROUP")
-               fi
-       else
-               CUPS_GROUP="${GROUP:=nobody}"
-               AC_MSG_RESULT(no group file, using "$CUPS_GROUP")
-       fi)
-
-AC_SUBST(CUPS_USER)
-AC_SUBST(CUPS_GROUP)
-
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_USER, "$CUPS_USER")
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GROUP, "$CUPS_GROUP")
-
 dnl
-dnl "$Id: cups-opsys.m4 4960 2006-01-20 16:41:20Z mike $"
+dnl "$Id: cups-opsys.m4 6649 2007-07-11 21:46:42Z mike $"
 dnl