diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-10-18 21:53:15 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-10-18 21:53:15 -0400 |
| commit | e4b72d7ee14d7279f7b0abbe35ff52f5861201e4 (patch) | |
| tree | 2fdd2a07b2a778775972d84aa72a2dc1f2aa106a /config-scripts | |
| parent | 78312b3c7af4094e6d7039a316c6bd9f354df219 (diff) | |
| download | cups-e4b72d7ee14d7279f7b0abbe35ff52f5861201e4.tar.gz | |
Update the location of strings files on newer versions of macOS.
Don't install debug symbols for static libraries.
Diffstat (limited to 'config-scripts')
| -rw-r--r-- | config-scripts/cups-defaults.m4 | 20 | ||||
| -rw-r--r-- | config-scripts/cups-opsys.m4 | 2 |
2 files changed, 17 insertions, 5 deletions
diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4 index 8c12cad8f..ab0322b1a 100644 --- a/config-scripts/cups-defaults.m4 +++ b/config-scripts/cups-defaults.m4 @@ -1,10 +1,11 @@ dnl dnl Default cupsd configuration settings for CUPS. dnl -dnl Copyright 2007-2017 by Apple Inc. -dnl Copyright 2006-2007 by Easy Software Products, all rights reserved. +dnl Copyright © 2007-2018 by Apple Inc. +dnl Copyright © 2006-2007 by Easy Software Products, all rights reserved. dnl -dnl Licensed under Apache License v2.0. See the file "LICENSE" for more information. +dnl Licensed under Apache License v2.0. See the file "LICENSE" for more +dnl information. dnl dnl Default languages... @@ -20,18 +21,27 @@ AC_SUBST(LANGUAGES) dnl macOS bundle-based localization support AC_ARG_WITH(bundledir, [ --with-bundledir set macOS localization bundle directory ], - CUPS_BUNDLEDIR="$withval", + CUPS_BUNDLEDIR="$withval",[ if test "x$host_os_name" = xdarwin -a $host_os_version -ge 100; then CUPS_BUNDLEDIR="/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A" LANGUAGES="" else CUPS_BUNDLEDIR="" - fi) + fi]) AC_SUBST(CUPS_BUNDLEDIR) if test "x$CUPS_BUNDLEDIR" != x; then AC_DEFINE_UNQUOTED(CUPS_BUNDLEDIR, "$CUPS_BUNDLEDIR") + + if test $host_os_version -ge 190; then + CUPS_RESOURCEDIR="$CUPS_BUNDLEDIR/Resources/en.lproj" + else + CUPS_RESOURCEDIR="$CUPS_BUNDLEDIR/Resources/English.lproj" + fi +else + CUPS_RESOURCEDIR="" fi +AC_SUBST(CUPS_RESOURCEDIR) dnl Default executable file permissions AC_ARG_WITH(exe_file_perm, [ --with-exe-file-perm set default executable permissions value, default=0555], diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4 index 36dfa7369..3f4bceb5a 100644 --- a/config-scripts/cups-opsys.m4 +++ b/config-scripts/cups-opsys.m4 @@ -23,6 +23,8 @@ if test "$host_os_name" = darwin -a $host_os_version -lt 120; then AC_MSG_ERROR([Sorry, this version of CUPS requires macOS 10.8 or higher.]) fi +echo host_os_version=$host_os_version + dnl Determine whether we are cross-compiling... if test "$build" = "$host"; then # No, build local targets |