Merge changes from CUPS 1.4svn-r8540.

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

diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
index 78a4c96d385094c9744269ec3bc6631aba9fcbd9..6f969aae272f0d943b3623bfe34073d747bf6dfc 100644 (file)
--- a/config-scripts/cups-directories.m4
+++ b/config-scripts/cups-directories.m4
@@ -411,8 +411,17 @@ AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups")
 AC_SUBST(CUPS_SERVERROOT)
 
 # Transient run-time state
-CUPS_STATEDIR="$localstatedir/run/cups"
-AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups")
+case "$uname" in
+       Darwin*)
+               # Darwin (Mac OS X)
+               CUPS_STATEDIR="$CUPS_SERVERROOT"
+               ;;
+       *)
+               # All others
+               CUPS_STATEDIR="$localstatedir/run/cups"
+               ;;
+esac
+AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
 AC_SUBST(CUPS_STATEDIR)
 
 dnl