Update the location of strings files on newer versions of macOS.

[thirdparty/cups.git] / config-scripts / cups-defaults.m4

diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
index 22c193884b91b4e0b0444e9f027f382677e329ce..ab0322b1a20ec99acc9ca2100b61f466046ddf96 100644 (file)
--- a/config-scripts/cups-defaults.m4
+++ b/config-scripts/cups-defaults.m4
@@ -1,14 +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 These coded instructions, statements, and computer programs are the
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file.  If this file is
-dnl missing or damaged, see the license at "http://www.cups.org/".
+dnl Licensed under Apache License v2.0.  See the file "LICENSE" for more
+dnl information.
 dnl
 
 dnl Default languages...
@@ -24,54 +21,63 @@ 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 exectuable permissions value, default=0555],
+AC_ARG_WITH(exe_file_perm, [  --with-exe-file-perm    set default executable permissions value, default=0555],
        CUPS_EXE_FILE_PERM="$withval",
-       case "$host_os_name" in
+       [case "$host_os_name" in
                linux* | gnu*)
                        CUPS_EXE_FILE_PERM="755"
                        ;;
                *)
                        CUPS_EXE_FILE_PERM="555"
                        ;;
-       esac)
+       esac])
 AC_SUBST(CUPS_EXE_FILE_PERM)
 
 dnl Default ConfigFilePerm
 AC_ARG_WITH(config_file_perm, [  --with-config-file-perm set default ConfigFilePerm value, default=0640],
        CUPS_CONFIG_FILE_PERM="$withval",
-       if test "x$host_os_name" = xdarwin; then
+       [if test "x$host_os_name" = xdarwin; then
                CUPS_CONFIG_FILE_PERM="644"
        else
                CUPS_CONFIG_FILE_PERM="640"
-       fi)
+       fi])
 AC_SUBST(CUPS_CONFIG_FILE_PERM)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_CONFIG_FILE_PERM, 0$CUPS_CONFIG_FILE_PERM)
 
 dnl Default permissions for cupsd
 AC_ARG_WITH(cupsd_file_perm, [  --with-cupsd-file-perm  set default cupsd permissions, default=0500],
        CUPS_CUPSD_FILE_PERM="$withval",
-       case "$host_os_name" in
+       [case "$host_os_name" in
                linux* | gnu*)
                        CUPS_CUPSD_FILE_PERM="700"
                        ;;
                *)
                        CUPS_CUPSD_FILE_PERM="500"
                        ;;
-       esac)
+       esac])
 AC_SUBST(CUPS_CUPSD_FILE_PERM)
 
 dnl Default LogFilePerm