Commit aee6b9472732c627ff844d4fb75a588d388b6570
2022-04-01T14:23:37
* builds/unix/configure.raw: Add option `--with-librsvg`. Since 'librsvg' is written in Rust, this option allows distributions to avoid a dependency on the entire Rust toolchain to provide the FreeType demo programs. Suggested by Lars Wendler in !156.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index cfb073e..f4cb228 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -530,16 +530,28 @@ AC_SEARCH_LIBS([clock_gettime],
[test "$ac_cv_search_clock_gettime" = "none required" \
|| LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
-# 'librsvg' is needed to demonstrate SVG support.
-PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
- [have_librsvg="yes (pkg-config)"], [have_librsvg=no])
-
FT_DEMO_CFLAGS=""
FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME"
-if test "$have_librsvg" != no; then
- FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG"
- FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS"
+# 'librsvg' is needed to demonstrate SVG support.
+AC_ARG_WITH([librsvg],
+ [AS_HELP_STRING([--with-librsvg=@<:@yes|no|auto@:>@],
+ [support OpenType SVG fonts in FreeType demo programs @<:@default=auto@:>@])],
+ [], [with_librsvg=auto])
+
+have_librsvg=no
+if test x"$with_librsvg" = xyes -o x"$with_librsvg" = xauto; then
+ PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
+ [have_librsvg="yes (pkg-config)"], [:])
+
+ if test "$have_librsvg" != no; then
+ FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG"
+ FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS"
+ fi
+fi
+
+if test x"$with_librsvg" = xyes -a "$have_librsvg" = no; then
+ AC_MSG_ERROR([librsvg support requested but library not found])
fi
AC_SUBST([FT_DEMO_CFLAGS])