From 19e03f542e4ca535a8204bb048365b4dfe48f296 Mon Sep 17 00:00:00 2001 From: Martin Rehak Date: Thu, 18 May 2023 15:48:43 +0200 Subject: [PATCH 1/2] host_os_name value in config-scripts has changed to 'solaris' some time ago --- config-scripts/cups-compiler.m4 | 2 +- config-scripts/cups-defaults.m4 | 2 +- config-scripts/cups-directories.m4 | 4 +++- config-scripts/cups-gssapi.m4 | 2 +- config-scripts/cups-sharedlibs.m4 | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4 index 6a4f4ba87e..33d444e743 100644 --- a/config-scripts/cups-compiler.m4 +++ b/config-scripts/cups-compiler.m4 @@ -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" diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4 index 8678f6a7a7..04a9f533f3 100644 --- a/config-scripts/cups-defaults.m4 +++ b/config-scripts/cups-defaults.m4 @@ -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" diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 index bb6008c092..37c3f3a508 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 @@ -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... @@ -266,6 +266,8 @@ 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" + ], [solaris*], [ + CUPS_STATEDIR="/system/volatile/cups" ], [*], [ # All others CUPS_STATEDIR="$localstatedir/run/cups" diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4 index 996bca8711..e90b6a8641 100644 --- a/config-scripts/cups-gssapi.m4 +++ b/config-scripts/cups-gssapi.m4 @@ -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], [ diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4 index c17cd48754..0fc90edb63 100644 --- a/config-scripts/cups-sharedlibs.m4 +++ b/config-scripts/cups-sharedlibs.m4 @@ -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" @@ -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" From 2bc20b79efc0ca6286848ca87f1b4b8a41088eae Mon Sep 17 00:00:00 2001 From: Martin Rehak Date: Thu, 18 May 2023 15:48:43 +0200 Subject: [PATCH 2/2] host_os_name value in config-scripts has changed to 'solaris' some time ago --- config-scripts/cups-compiler.m4 | 2 +- config-scripts/cups-defaults.m4 | 2 +- config-scripts/cups-directories.m4 | 6 +++++- config-scripts/cups-gssapi.m4 | 2 +- config-scripts/cups-sharedlibs.m4 | 4 ++-- config-scripts/cups-threads.m4 | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4 index 6a4f4ba87e..33d444e743 100644 --- a/config-scripts/cups-compiler.m4 +++ b/config-scripts/cups-compiler.m4 @@ -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" diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4 index 8678f6a7a7..04a9f533f3 100644 --- a/config-scripts/cups-defaults.m4 +++ b/config-scripts/cups-defaults.m4 @@ -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" diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 index bb6008c092..a2f5c615cb 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 @@ -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... @@ -266,6 +266,10 @@ 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" + ], [sun* | solaris*], [ + AS_IF([test -d /system/volatile], [ + CUPS_STATEDIR="/system/volatile/cups" + ]) ], [*], [ # All others CUPS_STATEDIR="$localstatedir/run/cups" diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4 index 996bca8711..e90b6a8641 100644 --- a/config-scripts/cups-gssapi.m4 +++ b/config-scripts/cups-gssapi.m4 @@ -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], [ diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4 index c17cd48754..0fc90edb63 100644 --- a/config-scripts/cups-sharedlibs.m4 +++ b/config-scripts/cups-sharedlibs.m4 @@ -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" @@ -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" diff --git a/config-scripts/cups-threads.m4 b/config-scripts/cups-threads.m4 index 8699f7df15..f657f2f228 100644 --- a/config-scripts/cups-threads.m4 +++ b/config-scripts/cups-threads.m4 @@ -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 = solaris], [ PTHREAD_FLAGS="$PTHREAD_FLAGS -D_POSIX_PTHREAD_SEMANTICS" ]) break