diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-10-29 16:36:11 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-10-29 16:36:11 -0400 |
| commit | 171c38f22438a3a2e088c2d6515587b074c19d3c (patch) | |
| tree | 7ac1486b90f1fdd643b8b0d3a93f6ed7fc98f8d5 /config-scripts | |
| parent | 144351068ca29967ae38bb0a1137715bc1b6b910 (diff) | |
| download | cups-171c38f22438a3a2e088c2d6515587b074c19d3c.tar.gz | |
Add libcups component name, localization bundle support for iOS.
Diffstat (limited to 'config-scripts')
| -rw-r--r-- | config-scripts/cups-common.m4 | 15 | ||||
| -rw-r--r-- | config-scripts/cups-defaults.m4 | 17 |
2 files changed, 23 insertions, 9 deletions
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 0da303e8f..df1b1549a 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -1,8 +1,8 @@ dnl dnl Common configuration stuff for CUPS. dnl -dnl Copyright 2007-2018 by Apple Inc. -dnl Copyright 1997-2007 by Easy Software Products, all rights reserved. +dnl Copyright © 2007-2018 by Apple Inc. +dnl Copyright © 1997-2007 by Easy Software Products, all rights reserved. dnl dnl Licensed under Apache License v2.0. See the file "LICENSE" for more dnl information. @@ -433,16 +433,21 @@ COMPONENTS="all" AC_ARG_WITH(components, [ --with-components set components to build: - "all" (default) builds everything - - "core" builds libcups and ipptool], + - "core" builds libcups and ipptool + - "libcups" builds just libcups], COMPONENTS="$withval") case "$COMPONENTS" in all) - BUILDDIRS="filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" + BUILDDIRS="test filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" ;; core) - BUILDDIRS="data locale" + BUILDDIRS="test locale" + ;; + + libcups) + BUILDDIRS="locale" ;; *) diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4 index ab0322b1a..43f034d7b 100644 --- a/config-scripts/cups-defaults.m4 +++ b/config-scripts/cups-defaults.m4 @@ -20,7 +20,7 @@ AC_ARG_WITH(languages, [ --with-languages set installed languages, defau AC_SUBST(LANGUAGES) dnl macOS bundle-based localization support -AC_ARG_WITH(bundledir, [ --with-bundledir set macOS localization bundle directory ], +AC_ARG_WITH(bundledir, [ --with-bundledir set localization bundle directory ], 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" @@ -32,12 +32,21 @@ AC_ARG_WITH(bundledir, [ --with-bundledir set macOS localization bundle AC_SUBST(CUPS_BUNDLEDIR) if test "x$CUPS_BUNDLEDIR" != x; then AC_DEFINE_UNQUOTED(CUPS_BUNDLEDIR, "$CUPS_BUNDLEDIR") +fi +AC_ARG_WITH(bundlelang, [ --with-bundlelang set localization bundle base language (English or en) ], + cups_bundlelang="$withval",[ if test $host_os_version -ge 190; then - CUPS_RESOURCEDIR="$CUPS_BUNDLEDIR/Resources/en.lproj" + cups_bundlelang="en" else - CUPS_RESOURCEDIR="$CUPS_BUNDLEDIR/Resources/English.lproj" - fi + cups_bundlelang="English" + fi]) +else + cups_bundlelang="" +fi + +if test "x$cups_bundlelang" != x -a "x$CUPS_BUNDLEDIR" != x; then + CUPS_RESOURCEDIR="$CUPS_BUNDLEDIR/Resources/$cups_bundlelang.lproj" else CUPS_RESOURCEDIR="" fi |