summaryrefslogtreecommitdiff
path: root/Build/source/libs/freetype2/freetype-src/builds/unix
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/builds/unix')
-rwxr-xr-xBuild/source/libs/freetype2/freetype-src/builds/unix/configure24
-rw-r--r--Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac6
-rw-r--r--Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw4
-rw-r--r--Build/source/libs/freetype2/freetype-src/builds/unix/freetype-config.in18
-rw-r--r--Build/source/libs/freetype2/freetype-src/builds/unix/unix-def.in2
5 files changed, 28 insertions, 26 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/configure b/Build/source/libs/freetype2/freetype-src/builds/unix/configure
index a4c66ebeae0..fda99fc8453 100755
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/configure
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for FreeType 2.8.
+# Generated by GNU Autoconf 2.69 for FreeType 2.8.1.
#
# Report bugs to <freetype@nongnu.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='FreeType'
PACKAGE_TARNAME='freetype'
-PACKAGE_VERSION='2.8'
-PACKAGE_STRING='FreeType 2.8'
+PACKAGE_VERSION='2.8.1'
+PACKAGE_STRING='FreeType 2.8.1'
PACKAGE_BUGREPORT='freetype@nongnu.org'
PACKAGE_URL=''
@@ -1329,7 +1329,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures FreeType 2.8 to adapt to many kinds of systems.
+\`configure' configures FreeType 2.8.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1394,7 +1394,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of FreeType 2.8:";;
+ short | recursive ) echo "Configuration of FreeType 2.8.1:";;
esac
cat <<\_ACEOF
@@ -1541,7 +1541,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-FreeType configure 2.8
+FreeType configure 2.8.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2139,7 +2139,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by FreeType $as_me 2.8, which was
+It was created by FreeType $as_me 2.8.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2495,7 +2495,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Don't forget to update `docs/VERSIONS.TXT'!
-version_info='20:0:14'
+version_info='21:0:15'
ft_version=`echo $version_info | tr : .`
@@ -13193,8 +13193,8 @@ main ()
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, add it to XX_ANSIFLAGS" >&5
-$as_echo "ok, add it to XX_ANSIFLAGS" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, adding to XX_ANSIFLAGS" >&5
+$as_echo "ok, adding to XX_ANSIFLAGS" >&6; }
XX_ANSIFLAGS="${XX_ANSIFLAGS} ${a}"
else
@@ -15017,7 +15017,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by FreeType $as_me 2.8, which was
+This file was extended by FreeType $as_me 2.8.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15083,7 +15083,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-FreeType config.status 2.8
+FreeType config.status 2.8.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac
index 7cdafccc176..9da9f0bdd2f 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac
@@ -11,13 +11,13 @@
# indicate that you have read the license and understand and accept it
# fully.
-AC_INIT([FreeType], [2.8], [freetype@nongnu.org], [freetype])
+AC_INIT([FreeType], [2.8.1], [freetype@nongnu.org], [freetype])
AC_CONFIG_SRCDIR([ftconfig.in])
# Don't forget to update `docs/VERSIONS.TXT'!
-version_info='20:0:14'
+version_info='21:0:15'
AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version])
@@ -275,7 +275,7 @@ if test "x$GCC" = xyes; then
}
])],
- [AC_MSG_RESULT([ok, add it to XX_ANSIFLAGS])
+ [AC_MSG_RESULT([ok, adding to XX_ANSIFLAGS])
XX_ANSIFLAGS="${XX_ANSIFLAGS} ${a}"
],
[AC_MSG_RESULT([no])])
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw
index ef6debed4e5..d91a732669d 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw
@@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])
# Don't forget to update `docs/VERSIONS.TXT'!
-version_info='20:0:14'
+version_info='21:0:15'
AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version])
@@ -275,7 +275,7 @@ if test "x$GCC" = xyes; then
}
])],
- [AC_MSG_RESULT([ok, add it to XX_ANSIFLAGS])
+ [AC_MSG_RESULT([ok, adding to XX_ANSIFLAGS])
XX_ANSIFLAGS="${XX_ANSIFLAGS} ${a}"
],
[AC_MSG_RESULT([no])])
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/freetype-config.in b/Build/source/libs/freetype2/freetype-src/builds/unix/freetype-config.in
index 97de1344985..2c1c160f883 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/freetype-config.in
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/freetype-config.in
@@ -14,7 +14,7 @@ export LC_ALL
# if `pkg-config' is available, use values from `freetype2.pc'
-pkg-config --version >/dev/null 2>&1
+%PKG_CONFIG% --atleast-pkgconfig-version 0.24 >/dev/null 2>&1
if test $? -eq 0 ; then
# note that option `--variable' is not affected by the
# PKG_CONFIG_SYSROOT_DIR environment variable
@@ -23,17 +23,17 @@ if test $? -eq 0 ; then
export PKG_CONFIG_SYSROOT_DIR
fi
- prefix=`pkg-config --variable prefix freetype2`
- exec_prefix=`pkg-config --variable exec_prefix freetype2`
+ prefix=`%PKG_CONFIG% --variable prefix freetype2`
+ exec_prefix=`%PKG_CONFIG% --variable exec_prefix freetype2`
- includedir=`pkg-config --variable includedir freetype2`
- libdir=`pkg-config --variable libdir freetype2`
+ includedir=`%PKG_CONFIG% --variable includedir freetype2`
+ libdir=`%PKG_CONFIG% --variable libdir freetype2`
- version=`pkg-config --modversion freetype2`
+ version=`%PKG_CONFIG% --modversion freetype2`
- cflags=`pkg-config --cflags freetype2`
- dynamic_libs=`pkg-config --libs freetype2`
- static_libs=`pkg-config --static --libs freetype2`
+ cflags=`%PKG_CONFIG% --cflags freetype2`
+ dynamic_libs=`%PKG_CONFIG% --libs freetype2`
+ static_libs=`%PKG_CONFIG% --static --libs freetype2`
else
prefix="%prefix%"
exec_prefix="%exec_prefix%"
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-def.in b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-def.in
index feae99b6583..34e06e38038 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-def.in
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-def.in
@@ -62,6 +62,7 @@ version_info := @version_info@
# Variables needed for `freetype-config' and `freetype.pc'.
#
+PKG_CONFIG := @PKG_CONFIG@
REQUIRES_PRIVATE := @REQUIRES_PRIVATE@
LIBS_PRIVATE := @LIBS_PRIVATE@
LIBSSTATIC_CONFIG := @LIBSSTATIC_CONFIG@
@@ -102,6 +103,7 @@ NO_OUTPUT := 2> /dev/null
$(OBJ_BUILD)/freetype-config: $(TOP_DIR)/builds/unix/freetype-config.in
rm -f $@ $@.tmp
sed -e 's|%LIBSSTATIC_CONFIG%|$(LIBSSTATIC_CONFIG)|' \
+ -e 's|%PKG_CONFIG%|$(PKG_CONFIG)|' \
-e 's|%build_libtool_libs%|$(build_libtool_libs)|' \
-e 's|%exec_prefix%|$(exec_prefix)|' \
-e 's|%ft_version%|$(ft_version)|' \