diff options
| author | Akira TAGOH <akira@tagoh.org> | 2021-03-03 21:26:47 +0900 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2021-03-03 22:17:36 +0900 |
| commit | d263d4075ea90f7a296c4d65e69eea504906689e (patch) | |
| tree | 56d3bde05a7e57702e9e0302db5e328df74e150a | |
| parent | 10c7390e358c5ad9192f35c7e5314230e75acc03 (diff) | |
Refactoring configure.ac to add <dir> element around font paths
| -rw-r--r-- | configure.ac | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index faee5b0..574be2e 100644 --- a/configure.ac +++ b/configure.ac @@ -486,30 +486,24 @@ AC_ARG_WITH(default-fonts, case "$default_fonts" in yes) if test "$os_win32" = "yes"; then - FC_DEFAULT_FONTS_IN="WINDOWSFONTDIR" + default_fonts="WINDOWSFONTDIR" elif test "$os_darwin" = "yes"; then - FC_DEFAULT_FONTS_IN="/System/Library/Fonts,/Library/Fonts,~/Library/Fonts,/System/Library/Assets/com_apple_MobileAsset_Font3,/System/Library/Assets/com_apple_MobileAsset_Font4" + default_fonts="/System/Library/Fonts,/Library/Fonts,~/Library/Fonts,/System/Library/Assets/com_apple_MobileAsset_Font3,/System/Library/Assets/com_apple_MobileAsset_Font4" else - FC_DEFAULT_FONTS_IN="/usr/share/fonts" + default_fonts="/usr/share/fonts" fi ;; -*) - FC_DEFAULT_FONTS_IN="$default_fonts" - ;; -esac - -AC_SUBST(FC_DEFAULT_FONTS_IN) - -case "$FC_DEFAULT_FONTS_IN" in -"") - FC_DEFAULT_FONTS="" - ;; -*) - FC_DEFAULT_FONTS=`echo $FC_DEFAULT_FONTS_IN | - sed -e 's/^/<dir>/' -e 's/$/<\/dir>/' -e 's/,/<\/dir> <dir>/g'` - ;; esac +FC_DEFAULT_FONTS="" +if test x${default_fonts+set} = xset; then + fc_IFS=$IFS + IFS="," + for p in "$default_fonts"; do + FC_DEFAULT_FONTS="$FC_DEFAULT_FONTS\t<dir>$p</dir>\n" + done + IFS=$fc_IFS +fi AC_DEFINE_UNQUOTED(FC_DEFAULT_FONTS, "$FC_DEFAULT_FONTS", [System font directory]) |