]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
host_os_name value in config-scripts has changed to 'solaris'
authorMartin Rehak <martin.rehak@oracle.com>
Fri, 26 May 2023 07:53:07 +0000 (09:53 +0200)
committerMartin Rehak <martin.rehak@oracle.com>
Thu, 1 Jun 2023 12:06:43 +0000 (14:06 +0200)
1  2 
config-scripts/cups-directories.m4
config-scripts/cups-threads.m4

index a2f5c615cb59f5f78cba4227dfbe9f6ae056104f,37c3f3a50878820518ecddd7731e128bcc586db0..407d053160332e2d5216181877864cba53d80e07
@@@ -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"
index f657f2f22826bff7c5b1a4fcec06546671491b90,8699f7df156bc8433d5afb90cc326e47e1a0f07b..0bee39b871bc3fa7e32517023ff171d9326df6ba
@@@ -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