Fix some typos (MacmacOS, etc.) that slipped in due to inconsistent usage.

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

diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
index f4227506fb89af6753d10999f1eddff1192ebd33..30e45d93f896ea03388860715a1ad033b101fb31 100644 (file)
--- a/config-scripts/cups-directories.m4
+++ b/config-scripts/cups-directories.m4
@@ -1,9 +1,7 @@
 dnl
-dnl "$Id$"
-dnl
 dnl Directory stuff for CUPS.
 dnl
-dnl Copyright 2007-2014 by Apple Inc.
+dnl Copyright 2007-2016 by Apple Inc.
 dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl These coded instructions, statements, and computer programs are the
@@ -121,102 +119,6 @@ fi
 AC_SUBST(privateinclude)
 AC_SUBST(PRIVATEINCLUDE)
 
-dnl Setup init.d locations...
-AC_ARG_WITH(rcdir, [  --with-rcdir            set path for rc scripts],rcdir="$withval",rcdir="")
-AC_ARG_WITH(rclevels, [  --with-rclevels         set run levels for rc scripts],rclevels="$withval",rclevels="2 3 5")
-AC_ARG_WITH(rcstart, [  --with-rcstart          set start number for rc scripts],rcstart="$withval",rcstart="99")
-AC_ARG_WITH(rcstop, [  --with-rcstop           set stop number for rc scripts],rcstop="$withval",rcstop="00")
-AC_ARG_WITH(smfmanifestdir, [  --with-smfmanifestdir   set path for Solaris SMF manifest],smfmanifestdir="$withval",smfmanifestdir="")
-
-INITDIR=""
-INITDDIR=""
-RCLEVELS="$rclevels"
-RCSTART="$rcstart"
-RCSTOP="$rcstop"
-SMFMANIFESTDIR=""
-
-if test x$rcdir = x; then
-       case "$uname" in
-               Darwin*)
-                       # Darwin and MacOS X...
-                       if test ! -x /sbin/launchd; then
-                               INITDDIR="/System/Library/StartupItems/PrintingServices"
-                       fi
-                       ;;
-
-               FreeBSD* | OpenBSD* | MirBSD* | ekkoBSD*)
-                       # FreeBSD and OpenBSD
-                       ;;
-
-               Linux | GNU | GNU/k*BSD*)
-                       # Linux/HURD seems to choose an init.d directory at random...
-                       if test -d /sbin/init.d; then
-                               # SuSE
-                               INITDIR="/sbin/init.d"
-                       else
-                               if test -d /etc/init.d; then
-                                       # Others
-                                       INITDIR="/etc"
-                               else
-                                       # RedHat
-                                       INITDIR="/etc/rc.d"
-                               fi
-                       fi
-                       RCSTART="81"
-                       RCSTOP="36"
-                       ;;
-
-               NetBSD*)
-                       # NetBSD
-                       INITDDIR="/etc/rc.d"
-                       ;;
-
-               SunOS*)
-                       # Solaris
-                       if test "x$smfmanifestdir" != x; then
-                               SMFMANIFESTDIR=$smfmanifestdir
-                       else
-                               INITDIR="/etc"
-                               RCSTART="81"
-                       fi
-                       ;;
-
-               *)
-                       INITDIR="/etc"
-                       ;;
-
-       esac
-elif test "x$rcdir" != xno; then
-       if test "x$rclevels" = x; then
-               INITDDIR="$rcdir"
-       else
-               INITDIR="$rcdir"
-       fi
-fi
-
-AC_SUBST(INITDIR)
-AC_SUBST(INITDDIR)
-AC_SUBST(RCLEVELS)
-AC_SUBST(RCSTART)
-AC_SUBST(RCSTOP)
-AC_SUBST(SMFMANIFESTDIR)
-
-dnl Xinetd support...
-AC_ARG_WITH(xinetd, [  --with-xinetd           set path for xinetd config files],XINETD="$withval",XINETD="")
-
-if test "x$XINETD" = x -a ! -x /sbin/launchd; then
-       for dir in /private/etc/xinetd.d /etc/xinetd.d /usr/local/etc/xinetd.d; do
-               if test -d $dir; then
-                       XINETD="$dir"
-                       break
-               fi
-       done
-elif test "x$XINETD" = xno; then
-       XINETD=""
-fi
-
-AC_SUBST(XINETD)
-
 dnl LPD sharing support...
 AC_ARG_WITH(lpdconfig, [  --with-lpdconfig        set URI for LPD config file],
        LPDCONFIG="$withval", LPDCONFIG="")
@@ -365,7 +267,7 @@ AC_SUBST(CUPS_REQUESTS)
 # Server executables...
 case "$uname" in
        *BSD* | Darwin*)
-               # *BSD and Darwin (MacOS X)
+               # *BSD and Darwin (macOS)
                INSTALL_SYSV=""
                CUPS_SERVERBIN="$exec_prefix/libexec/cups"
                ;;
@@ -389,7 +291,7 @@ AC_SUBST(CUPS_SERVERROOT)
 AC_ARG_WITH(rundir, [  --with-rundir           set transient run-time state directory],CUPS_STATEDIR="$withval",[
        case "$uname" in
                Darwin*)
-                       # Darwin (OS X)
+                       # Darwin (macOS)
                        CUPS_STATEDIR="$CUPS_SERVERROOT"
                        ;;
                *)
@@ -399,7 +301,3 @@ AC_ARG_WITH(rundir, [  --with-rundir           set transient run-time state dire
        esac])
 AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
 AC_SUBST(CUPS_STATEDIR)
-
-dnl
-dnl End of "$Id$".
-dnl