From 2eb296bea015f19db05519dbf078829a1a8d10bc Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Fri, 16 Apr 2021 17:56:50 +0300
Subject: [PATCH] updated freetype.m4 from mainstream and fixed help string
alignment
---
acinclude/freetype2.m4 | 11 +++--------
configure | 12 +++++-------
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/acinclude/freetype2.m4 b/acinclude/freetype2.m4
index af2e659..d8ee404 100644
--- a/acinclude/freetype2.m4
+++ b/acinclude/freetype2.m4
@@ -1,7 +1,7 @@
# Configure paths for FreeType2
# Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
#
-# Copyright 2001-2018 by
+# Copyright (C) 2001-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,7 @@
# generated by Autoconf, under the same distribution terms as the rest of
# that program.
#
-# serial 4
+# serial 5
# AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS.
@@ -24,23 +24,19 @@
#
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)]),
[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)]),
[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]),
[],
@@ -116,7 +112,7 @@ AC_DEFUN([AC_CHECK_FT2],
AC_LANG_SOURCE([[
#include <ft2build.h>
-#include FT_FREETYPE_H
+#include <freetype/freetype.h>
#include <stdio.h>
#include <stdlib.h>
@@ -190,5 +186,4 @@ main()
AC_SUBST([FT2_CFLAGS])
AC_SUBST([FT2_LIBS])])
-
# end of freetype2.m4
diff --git a/configure b/configure
index 195f0b9..3f57a8a 100755
--- a/configure
+++ b/configure
@@ -1614,7 +1614,7 @@ Optional Features:
--disable-sdltest Do not try to compile and run a test SDL program
--enable-freetype-builtin
Use included version of FreeType [default=yes]
- --disable-freetypetest Do not try to compile and run a test FreeType
+ --disable-freetypetest Do not try to compile and run a test FreeType
program
--enable-harfbuzz Enable HarfBuzz [default=yes]
--enable-harfbuzz-builtin
@@ -1628,8 +1628,8 @@ Optional Packages:
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sdl-prefix=PFX Prefix where SDL is installed (optional)
--with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)
- --with-ft-prefix=PREFIX Prefix where FreeType is installed (optional)
- --with-ft-exec-prefix=PREFIX
+ --with-ft-prefix=PREFIX Prefix where FreeType is installed (optional)
+ --with-ft-exec-prefix=PREFIX
Exec prefix where FreeType is installed (optional)
--with-x use the X Window System
@@ -16589,7 +16589,6 @@ fi
echo "$FT2_PKG_ERRORS" >&5
# Get the cflags and libraries from the freetype-config script
- #
# Check whether --with-ft-prefix was given.
if test "${with_ft_prefix+set}" = set; then :
@@ -16789,7 +16788,7 @@ else
#include <ft2build.h>
-#include FT_FREETYPE_H
+#include <freetype/freetype.h>
#include <stdio.h>
#include <stdlib.h>
@@ -16900,7 +16899,6 @@ elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
# Get the cflags and libraries from the freetype-config script
- #
# Check whether --with-ft-prefix was given.
if test "${with_ft_prefix+set}" = set; then :
@@ -17100,7 +17098,7 @@ else
#include <ft2build.h>
-#include FT_FREETYPE_H
+#include <freetype/freetype.h>
#include <stdio.h>
#include <stdlib.h>