Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelrsweet merged 5 commits into from
Jun 1, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
19e03f5
host_os_name value in config-scripts has changed to 'solaris' some ti…
l1gi May 18, 2023
2bc20b7
host_os_name value in config-scripts has changed to 'solaris' some ti…
l1gi May 18, 2023
bad0f9d
Merge branch 'master' of https://github.com/l1gi/cups
l1gi May 26, 2023
e1cfb90
host_os_name value in config-scripts has changed to 'solaris'
l1gi May 26, 2023
c2aabce
host_os_name value in config-scripts has changed to 'solaris'
l1gi Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config-scripts/cups-compiler.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ AS_IF([test -n "$GCC"], [
])
], [
# Add vendor-specific compiler options...
AS_CASE([$host_os_name], [sunos*], [
AS_CASE([$host_os_name], [sunos* | solaris*], [
# Solaris
AS_IF([test -z "$OPTIM"], [
OPTIM="-xO2"
Expand Down
2 changes: 1 addition & 1 deletion config-scripts/cups-defaults.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ AS_IF([test x$default_printcap != xno], [
AS_IF([test "x$default_printcap" = "xdefault"], [
AS_CASE([$host_os_name], [darwin*], [
CUPS_DEFAULT_PRINTCAP="/Library/Preferences/org.cups.printers.plist"
], [sunos*], [
], [sunos* | solaris*], [
CUPS_DEFAULT_PRINTCAP="/etc/printers.conf"
], [*], [
CUPS_DEFAULT_PRINTCAP="/etc/printcap"
Expand Down
8 changes: 7 additions & 1 deletion config-scripts/cups-directories.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ AC_SUBST([CUPS_DOCROOT])

# Locale data
AS_IF([test "$localedir" = "\${datarootdir}/locale"], [
AS_CASE(["$host_os_name"], [linux* | gnu* | *bsd* | darwin*], [
AS_CASE(["$host_os_name"], [linux* | gnu* | *bsd* | darwin* | solaris*], [
CUPS_LOCALEDIR="$datarootdir/locale"
], [*], [
# This is the standard System V location...
Expand Down Expand Up @@ -266,6 +266,12 @@ AC_ARG_WITH([rundir], AS_HELP_STRING([--with-rundir], [set transient run-time st
AS_CASE(["$host_os_name"], [darwin*], [
# Darwin (macOS)
CUPS_STATEDIR="$CUPS_SERVERROOT"
], [sunos* | solaris*], [
AS_IF([test -d /system/volatile], [
CUPS_STATEDIR="/system/volatile/cups"
Copy link
Copy Markdown
Member

@michaelrsweet michaelrsweet May 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need an 'else' clause for this.

], [
CUPS_STATEDIR="$localstatedir/run/cups"
])
], [*], [
# All others
CUPS_STATEDIR="$localstatedir/run/cups"
Expand Down
2 changes: 1 addition & 1 deletion config-scripts/cups-gssapi.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ AS_IF([test x$enable_gssapi = xyes], [
], [
AC_MSG_RESULT([no])
])
], [sunos*], [
], [sunos* | solaris*], [
# Solaris has a non-standard krb5-config, don't use it!
SAVELIBS="$LIBS"
AC_CHECK_LIB([gss], [gss_display_status], [
Expand Down
4 changes: 2 additions & 2 deletions config-scripts/cups-sharedlibs.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ AS_IF([test x$enable_shared != xno], [
DSO="\$(CC)"
DSOXX="\$(CXX)"
DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G"
], [linux* | gnu* | *bsd*], [
], [linux* | gnu* | *bsd* | solaris*], [
LIBCUPS="lib$cupsbase.so.2"
AS_IF([test "x$cupsimagebase" != x], [
LIBCUPSIMAGE="lib$cupsimagebase.so.2"
Expand Down Expand Up @@ -102,7 +102,7 @@ AS_IF([test "$DSO" != ":"], [
# Tell the run-time linkers where to find a DSO. Some platforms
# need this option, even when the library is installed in a
# standard location...
AS_CASE([$host_os_name], [sunos*], [
AS_CASE([$host_os_name], [sunos* | solaris*], [
# Solaris...
AS_IF([test $exec_prefix != /usr], [
DSOFLAGS="-R$libdir $DSOFLAGS"
Expand Down
2 changes: 1 addition & 1 deletion config-scripts/cups-threads.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ AS_IF([test x$ac_cv_header_pthread_h = xyes], [

# Solaris requires -D_POSIX_PTHREAD_SEMANTICS to be POSIX-
# compliant... :(
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
Expand Down