From 3355de3d8a7ca092d8be622af25e902687245da0 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Fri, 16 Apr 2021 17:56:56 +0300 Subject: [PATCH] updates to freetype2.m4: - remove dnl'ed notes about not quoting AS_HELP_STRING, which used to insert 5 spaces of unwanted indentation to help string in the generated configure scripts. - quote the AS_HELP_STRINGs. - bump the serial number to 6. --- builds/unix/freetype2.m4 | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/builds/unix/freetype2.m4 b/builds/unix/freetype2.m4 index 3736d15..4795398 100644 --- a/builds/unix/freetype2.m4 +++ b/builds/unix/freetype2.m4 @@ -15,7 +15,7 @@ # generated by Autoconf, under the same distribution terms as the rest of # that program. # -# serial 5 +# serial 6 # AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) # Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS. @@ -24,25 +24,21 @@ # AC_DEFUN([AC_CHECK_FT2], [# Get the cflags and libraries from the freetype-config script - # AC_ARG_WITH([ft-prefix], - dnl don't quote AS_HELP_STRING! - AS_HELP_STRING([--with-ft-prefix=PREFIX], - [Prefix where FreeType is installed (optional)]), + [AS_HELP_STRING([--with-ft-prefix=PREFIX], + [Prefix where FreeType is installed (optional)])], [ft_config_prefix="$withval"], [ft_config_prefix=""]) AC_ARG_WITH([ft-exec-prefix], - dnl don't quote AS_HELP_STRING! - AS_HELP_STRING([--with-ft-exec-prefix=PREFIX], - [Exec prefix where FreeType is installed (optional)]), + [AS_HELP_STRING([--with-ft-exec-prefix=PREFIX], + [Exec prefix where FreeType is installed (optional)])], [ft_config_exec_prefix="$withval"], [ft_config_exec_prefix=""]) AC_ARG_ENABLE([freetypetest], - dnl don't quote AS_HELP_STRING! - AS_HELP_STRING([--disable-freetypetest], - [Do not try to compile and run a test FreeType program]), + [AS_HELP_STRING([--disable-freetypetest], + [Do not try to compile and run a test FreeType program])], [], [enable_fttest=yes]) @@ -190,5 +186,4 @@ main() AC_SUBST([FT2_CFLAGS]) AC_SUBST([FT2_LIBS])]) - # end of freetype2.m4 -- 1.7.1