mirror of
git://git.sv.nongnu.org/freetype/freetype2.git
synced 2026-01-19 04:52:09 +00:00
* builds/unix/configure.raw: Fix HarfBuzz library detection for MinGW.
Set `have_harfbuzz*` variables explicitly to dynamic for MinGW, since Windows uses its own `LoadLibrary` call. This fixes a MinGW configuration error: ``` checking for HARFBUZZ... no checking for dlopen in -lc... no checking for dlopen in -ldl... no configure: error: harfbuzz support requested but library not found ```
This commit is contained in:
committed by
Werner Lemberg
parent
3eb5188e8e
commit
f0679e7592
@@ -468,21 +468,30 @@ fi
|
||||
have_harfbuzz_dynamic=no
|
||||
if test x"$have_harfbuzz" = xno; then
|
||||
if test x"$with_harfbuzz" = xdynamic -o x"$with_harfbuzz" = xauto; then
|
||||
# Check for libdl
|
||||
AC_CHECK_LIB([c],
|
||||
[dlopen],
|
||||
[have_harfbuzz_dynamic=yes],
|
||||
AC_CHECK_LIB([dl],
|
||||
[dlopen],
|
||||
[have_harfbuzz_dynamic=yes
|
||||
need_libdl=yes]))
|
||||
if test x"$have_harfbuzz_dynamic" = xyes; then
|
||||
case "$host" in
|
||||
*-*-mingw*)
|
||||
# Windows uses its own LoadLibrary(), set variables to dynamic.
|
||||
have_harfbuzz_dynamic=yes
|
||||
have_harfbuzz="yes (dynamic)"
|
||||
HARFBUZZ_CFLAGS=
|
||||
if test x"$need_libdl" = xyes; then
|
||||
HARFBUZZ_LIBS="-ldl"
|
||||
;;
|
||||
*)
|
||||
# Check for libdl
|
||||
AC_CHECK_LIB([c],
|
||||
[dlopen],
|
||||
[have_harfbuzz_dynamic=yes],
|
||||
AC_CHECK_LIB([dl],
|
||||
[dlopen],
|
||||
[have_harfbuzz_dynamic=yes
|
||||
need_libdl=yes]))
|
||||
if test x"$have_harfbuzz_dynamic" = xyes; then
|
||||
have_harfbuzz="yes (dynamic)"
|
||||
HARFBUZZ_CFLAGS=
|
||||
if test x"$need_libdl" = xyes; then
|
||||
HARFBUZZ_LIBS="-ldl"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user