From: Martin Rehak <martin.rehak@oracle.com>
Date: Fri, 26 May 2023 07:53:07 +0000 (+0200)
Subject: host_os_name value in config-scripts has changed to 'solaris'
X-Git-Tag: v2.4.3~4^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1cfb9001e21d67ed3532dbbcd1bc6fe47a0cd0a;p=thirdparty%2Fcups.git

host_os_name value in config-scripts has changed to 'solaris'
---

e1cfb9001e21d67ed3532dbbcd1bc6fe47a0cd0a
diff --cc config-scripts/cups-directories.m4
index a2f5c615cb,37c3f3a508..407d053160
--- a/config-scripts/cups-directories.m4
+++ b/config-scripts/cups-directories.m4
@@@ -266,10 -266,8 +266,12 @@@ AC_ARG_WITH([rundir], AS_HELP_STRING([-
      AS_CASE(["$host_os_name"], [darwin*], [
  	# Darwin (macOS)
  	CUPS_STATEDIR="$CUPS_SERVERROOT"
-     ], [sun* | solaris*], [
 -    ], [solaris*], [
 -	CUPS_STATEDIR="/system/volatile/cups"
++    ], [sunos* | solaris*], [
 +	AS_IF([test -d /system/volatile], [
 +	     CUPS_STATEDIR="/system/volatile/cups"
++	], [
++	     CUPS_STATEDIR="$localstatedir/run/cups"
 +	])
      ], [*], [
  	# All others
  	CUPS_STATEDIR="$localstatedir/run/cups"
diff --cc config-scripts/cups-threads.m4
index f657f2f228,8699f7df15..0bee39b871
--- a/config-scripts/cups-threads.m4
+++ b/config-scripts/cups-threads.m4
@@@ -38,7 -38,7 +38,7 @@@ AS_IF([test x$ac_cv_header_pthread_h = 
  
  	    # Solaris requires -D_POSIX_PTHREAD_SEMANTICS to be POSIX-
  	    # compliant... :(
- 	    AS_IF([test $host_os_name = solaris], [
 -	    AS_IF([test $host_os_name = sunos], [
++	    AS_IF([test $host_os_name = sunos -o $host_os_name = solaris], [
  		PTHREAD_FLAGS="$PTHREAD_FLAGS -D_POSIX_PTHREAD_SEMANTICS"
  	    ])
  	    break