Merge changes from CUPS 1.5svn-r9000.

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

diff --git a/config-scripts/cups-launchd.m4 b/config-scripts/cups-launchd.m4
index 02d89843b8295758fed34847b238456c7e99ad5f..23a2295160289d9084a73d889c18e51e3eb7c4c9 100644 (file)
--- a/config-scripts/cups-launchd.m4
+++ b/config-scripts/cups-launchd.m4
@@ -1,9 +1,9 @@
 dnl
 dnl "$Id: cups-launchd.m4 6649 2007-07-11 21:46:42Z mike $"
 dnl
-dnl   launchd stuff for the Common UNIX Printing System (CUPS).
+dnl   launchd stuff for CUPS.
 dnl
-dnl   Copyright 2007 by Apple Inc.
+dnl   Copyright 2007-2010 by Apple Inc.
 dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -14,7 +14,7 @@ dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 
-AC_ARG_ENABLE(launchd, [  --enable-launchd        turn on launchd support, default=yes])
+AC_ARG_ENABLE(launchd, [  --disable-launchd       disable launchd support])
 
 DEFAULT_LAUNCHD_CONF=""
 LAUNCHDLIBS=""
@@ -35,7 +35,6 @@ if test x$enable_launchd != xno; then
        esac
 fi
 
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LAUNCHD_CONF, "$DEFAULT_LAUNCHD_CONF")
 AC_SUBST(DEFAULT_LAUNCHD_CONF)
 AC_SUBST(LAUNCHDLIBS)