fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 configure.ac |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 18894df0e8cee9c59d5b40052fea28d6dfc80735
Merge: 2899142 82a2765
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Jun 5 05:33:33 2025 +0000

    Merge branch 'issues/468' into 'main'
    
    Add default font paths for Android in configure script
    
    Closes #468
    
    See merge request fontconfig/fontconfig!418

commit 82a276549aa6e87a06e183a41dfeb06784072226
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Jun 2 16:07:26 2025 +0900

    Add default font paths for Android in configure script
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/468
    
    Changelog: fixed

diff --git a/configure.ac b/configure.ac
index ea6382f..42a7fe1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,7 +96,11 @@ dnl ==========================================================================
 AC_CANONICAL_HOST
 os_win32=no
 os_darwin=no
+os_android=no
 case "${host_os}" in
+	linux*android*)
+        os_android=yes
+        ;;
 	cygwin*|mingw*)
 		os_win32=yes
 		;;
@@ -525,6 +529,8 @@ yes)
 		default_fonts="WINDOWSFONTDIR,WINDOWSUSERFONTDIR"
 	elif test "$os_darwin" = "yes"; then
 		default_fonts="/System/Library/Fonts,/Library/Fonts,~/Library/Fonts,/System/Library/Assets/com_apple_MobileAsset_Font3,/System/Library/Assets/com_apple_MobileAsset_Font4"
+	elif test "$os_android" = "yes"; then
+		default_fonts="/system/fonts,/product/fonts"
 	else
 		default_fonts="/usr/share/fonts"
 	fi