Skip to content

Commit 425ba0f

Browse files
committed
Update configure script.
1 parent 1878df8 commit 425ba0f

1 file changed

Lines changed: 20 additions & 7 deletions

File tree

configure

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7469,7 +7469,7 @@ if test "$localedir" = "\${datarootdir}/locale"
74697469
then :
74707470

74717471
case "$host_os_name" in #(
7472-
linux* | gnu* | *bsd* | darwin*) :
7472+
linux* | gnu* | *bsd* | darwin* | solaris*) :
74737473

74747474
CUPS_LOCALEDIR="$datarootdir/locale"
74757475
;; #(
@@ -7616,6 +7616,19 @@ else $as_nop
76167616
# Darwin (macOS)
76177617
CUPS_STATEDIR="$CUPS_SERVERROOT"
76187618
;; #(
7619+
sunos* | solaris*) :
7620+
7621+
if test -d /system/volatile
7622+
then :
7623+
7624+
CUPS_STATEDIR="/system/volatile/cups"
7625+
7626+
else $as_nop
7627+
7628+
CUPS_STATEDIR="$localstatedir/run/cups"
7629+
7630+
fi
7631+
;; #(
76197632
*) :
76207633

76217634
# All others
@@ -7696,7 +7709,7 @@ fi
76967709
DSOXX="\$(CXX)"
76977710
DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G"
76987711
;; #(
7699-
linux* | gnu* | *bsd*) :
7712+
linux* | gnu* | *bsd* | solaris*) :
77007713

77017714
LIBCUPS="lib$cupsbase.so.2"
77027715
if test "x$cupsimagebase" != x
@@ -7809,7 +7822,7 @@ then :
78097822
# need this option, even when the library is installed in a
78107823
# standard location...
78117824
case $host_os_name in #(
7812-
sunos*) :
7825+
sunos* | solaris*) :
78137826

78147827
# Solaris...
78157828
if test $exec_prefix != /usr
@@ -8321,7 +8334,7 @@ else $as_nop
83218334

83228335
# Add vendor-specific compiler options...
83238336
case $host_os_name in #(
8324-
sunos*) :
8337+
sunos* | solaris*) :
83258338

83268339
# Solaris
83278340
if test -z "$OPTIM"
@@ -9279,7 +9292,7 @@ printf "%s\n" "no" >&6; }
92799292

92809293
fi
92819294
;; #(
9282-
sunos*) :
9295+
sunos* | solaris*) :
92839296

92849297
# Solaris has a non-standard krb5-config, don't use it!
92859298
SAVELIBS="$LIBS"
@@ -9652,7 +9665,7 @@ then :
96529665

96539666
# Solaris requires -D_POSIX_PTHREAD_SEMANTICS to be POSIX-
96549667
# compliant... :(
9655-
if test $host_os_name = sunos
9668+
if test $host_os_name = sunos -o $host_os_name = solaris
96569669
then :
96579670

96589671
PTHREAD_FLAGS="$PTHREAD_FLAGS -D_POSIX_PTHREAD_SEMANTICS"
@@ -12103,7 +12116,7 @@ then :
1210312116

1210412117
CUPS_DEFAULT_PRINTCAP="/Library/Preferences/org.cups.printers.plist"
1210512118
;; #(
12106-
sunos*) :
12119+
sunos* | solaris*) :
1210712120

1210812121
CUPS_DEFAULT_PRINTCAP="/etc/printers.conf"
1210912122
;; #(

0 commit comments

Comments
 (0)