Update in-tree freetype2 lib (unused) to 2.9.1

2026-05-30 11:32:38 +00:00 · 2018-05-15 20:21:34 +02:00
parent 4070f2c744
commit 7ec8b4bf6f
713 changed files with 36763 additions and 45248 deletions
@@ -1,6 +1,6 @@
 # CMakeLists.txt
 #
-# Copyright 2013-2016 by
+# Copyright 2013-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # Written originally by John Cary <cary@txcorp.com>
@@ -12,35 +12,40 @@
 # fully.
 #
 #
-# As a preliminary, create a compilation directory and change into it, for
+# The following will 1. create a build directory and 2. change into it and
-# example
+# call cmake to configure the build with default parameters as a static
 # library.
 #
-#   mkdir ~/freetype2.compiled
+#   cmake -E make_directory build
-#   cd ~/freetype2.compiled
+#   cmake -E chdir build cmake ..
 #
 # Now you can say
 #
 #   cmake <path-to-freetype2-src-dir>
 #
 # to create a Makefile that builds a static version of the library.
 #
 # For a dynamic library, use
 #
-#   cmake <path-to-freetype2-src-dir> -D BUILD_SHARED_LIBS:BOOL=true
+#   cmake -E chdir build cmake -D BUILD_SHARED_LIBS:BOOL=true ..
 #
 # For a framework on OS X, use
 #
-#   cmake <path-to-freetype2-src-dir> -D BUILD_FRAMEWORK:BOOL=true -G Xcode
+#   cmake -E chdir build cmake -G Xcode -D BUILD_FRAMEWORK:BOOL=true ..
 #
 # instead.
 #
 # For an iOS static library, use
 #
-#   cmake -D IOS_PLATFORM=OS -G Xcode <path-to-freetype2-src-dir>
+#   cmake -E chdir build cmake -G Xcode -D IOS_PLATFORM=OS ..
 #
 # or
 #
-#   cmake -D IOS_PLATFORM=SIMULATOR -G Xcode <path-to-freetype2-src-dir>
+#   cmake -E chdir build cmake -G Xcode -D IOS_PLATFORM=SIMULATOR ..
 #
 # Finally, build the project with:
 #
 #   cmake --build build
 #
 # Install it with
 #
 #   (sudo) cmake --build build --target install
 #
 # A binary distribution can be made with
 #
 #   cmake --build build --config Release --target package
 #
 # Please refer to the cmake manual for further options, in particular, how
 # to modify compilation and linking parameters.
@@ -59,28 +64,33 @@
 # . `CMakeLists.txt' is provided as-is since it is normally not used by the
 #   developer team.
 #
-# . If you want to disable the automatic generation of the distribution
+# . Set the `FT_WITH_ZLIB', `FT_WITH_BZIP2', `FT_WITH_PNG', and
-#   targets, add the `-D FREETYPE_NO_DIST=true' command line argument.
+#   `FT_WITH_HARFBUZZ' CMake variables to `ON' to force using a dependency.
 #
 # . Set the `WITH_ZLIB', `WITH_BZip2', `WITH_PNG', and `WITH_HarfBuzz'
 #   CMake variables to `ON' or `OFF' to force or skip using a dependency.
 #   Leave a variable undefined (which is the default) to use the dependency
-#   only if it is available.  Example:
+#   only if it is available.  Set `CMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE' to
 #   disable a dependency completely (CMake package name, so `BZip2' instead of
 #   `BZIP2'). Example:
 #
-#     cmake ... -DWITH_ZLIB=ON -DWITH_HarfBuzz=OFF ...
+#     cmake -DFT_WITH_ZLIB=ON -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE [...]
 #
 # . Installation of FreeType can be controlled with the CMake variables
 #   `SKIP_INSTALL_HEADERS', `SKIP_INSTALL_LIBRARIES', and `SKIP_INSTALL_ALL'
 #   (this is compatible with the same CMake variables in zlib's CMake
 #   support).
 # FreeType explicitly marks the API to be exported and relies on the compiler
 # to hide all other symbols. CMake supports a C_VISBILITY_PRESET property
 # starting with 2.8.12.
 cmake_minimum_required(VERSION 2.8.12)
-cmake_minimum_required(VERSION 2.6)
+if (NOT CMAKE_VERSION VERSION_LESS 3.3)
-
+  # Allow symbol visibility settings also on static libraries. CMake < 3.3
  # only sets the propery on a shared library build.
  cmake_policy(SET CMP0063 NEW)
 endif ()
 include(CheckIncludeFile)
 # CMAKE_TOOLCHAIN_FILE must be set before `project' is called, which
 # configures the base build environment and references the toolchain file
 if (APPLE)
@@ -116,30 +126,47 @@ else ()
 endif ()
-project(freetype)
+project(freetype C)
 set(VERSION_MAJOR "2")
 set(VERSION_MINOR "9")
 set(VERSION_PATCH "1")
 # SOVERSION scheme: CURRENT.AGE.REVISION
 #   If there was an incompatible interface change:
 #     Increment CURRENT. Set AGE and REVISION to 0
 #   If there was a compatible interface change:
 #     Increment AGE. Set REVISION to 0
 #   If the source code was changed, but there were no interface changes:
 #     Increment REVISION.
 set(LIBRARY_VERSION "6.16.0")
 set(LIBRARY_SOVERSION "6")
 # These options mean "require x and complain if not found". They'll get
 # optionally found anyway. Use `-DCMAKE_DISABLE_FIND_PACKAGE_x=TRUE` to disable
 # searching for a packge entirely (x is the CMake package name, so "BZip2"
 # instead of "BZIP2").
 option(FT_WITH_ZLIB "Use system zlib instead of internal library." OFF)
 option(FT_WITH_BZIP2 "Support bzip2 compressed fonts." OFF)
 option(FT_WITH_PNG "Support PNG compressed OpenType embedded bitmaps." OFF)
 option(FT_WITH_HARFBUZZ "Improve auto-hinting of OpenType fonts." OFF)
 if (WIN32 AND NOT MINGW AND BUILD_SHARED_LIBS)
  message(FATAL_ERROR "Building shared libraries on Windows needs MinGW")
 endif ()
 # Disallow in-source builds
 if ("${PROJECT_BINARY_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}")
  message(FATAL_ERROR
-    "
+    "In-source builds are not permitted!  Make a separate folder for"
-In-source builds are not permitted!  Make a separate folder for"
+    " building, e.g.,\n"
-    " building, e.g.,"
+    "  cmake -E make_directory build\n"
-    "
+    "  cmake -E chdir build cmake ..\n"
-  mkdir build; cd build; cmake .."
+    "Before that, remove the files created by this failed run with\n"
-    "
+    "  cmake -E remove CMakeCache.txt\n"
-Before that, remove the files created by this failed run with"
+    "  cmake -E remove_directory CMakeFiles")
    "
  rm -rf CMakeCache.txt CMakeFiles")
 endif ()
 # Add local cmake modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/builds/cmake)
+list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/builds/cmake)
 if (BUILD_FRAMEWORK)
@@ -152,45 +179,32 @@ if (BUILD_FRAMEWORK)
 endif ()
 set(VERSION_MAJOR "2")
 set(VERSION_MINOR "7")
 set(VERSION_PATCH "1")
 set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 set(SHARED_LIBRARY_VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
 # Compiler definitions for building the library
 add_definitions(-DFT2_BUILD_LIBRARY)
 # Find dependencies
-foreach (d ZLIB BZip2 PNG HarfBuzz)
+if (FT_WITH_HARFBUZZ)
-  string(TOUPPER "${d}" D)
+  find_package(HarfBuzz 1.3.0 REQUIRED)
 else ()
  find_package(HarfBuzz 1.3.0)
 endif ()
-  if (DEFINED WITH_${d} OR DEFINED WITH_${D})
+if (FT_WITH_PNG)
-    if (WITH_${d} OR WITH_${D})
+  find_package(PNG REQUIRED)
-      find_package(${d} QUIET REQUIRED)
+else ()
-    endif ()
+  find_package(PNG)
-  else ()
+endif ()
    find_package(${d} QUIET)
  endif ()
-  if (${d}_FOUND OR ${D}_FOUND)
+if (FT_WITH_ZLIB)
-    message(STATUS "Building with ${d}")
+  find_package(ZLIB REQUIRED)
-  endif ()
+else ()
-endforeach ()
+  find_package(ZLIB)
-
+endif ()
 message(STATUS
  "Creating directory ${PROJECT_BINARY_DIR}/include/freetype/config")
 file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/include/freetype/config")
 if (FT_WITH_BZIP2)
  find_package(BZip2 REQUIRED)
 else ()
  find_package(BZip2)
 endif ()
 # Create the configuration file
 message(STATUS
  "Creating file ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h")
 if (UNIX)
  check_include_file("unistd.h" HAVE_UNISTD_H)
  check_include_file("fcntl.h" HAVE_FCNTL_H)
@@ -200,38 +214,27 @@ if (UNIX)
    FTCONFIG_H)
  if (HAVE_UNISTD_H)
    string(REGEX REPLACE
-      "#undef +(HAVE_UNISTD_H)" "#define \\1"
+      "#undef +(HAVE_UNISTD_H)" "#define \\1 1"
      FTCONFIG_H "${FTCONFIG_H}")
  endif ()
  if (HAVE_FCNTL_H)
    string(REGEX REPLACE
-      "#undef +(HAVE_FCNTL_H)" "#define \\1"
+      "#undef +(HAVE_FCNTL_H)" "#define \\1 1"
      FTCONFIG_H "${FTCONFIG_H}")
  endif ()
  if (HAVE_STDINT_H)
    string(REGEX REPLACE
-      "#undef +(HAVE_STDINT_H)" "#define \\1"
+      "#undef +(HAVE_STDINT_H)" "#define \\1 1"
      FTCONFIG_H "${FTCONFIG_H}")
  endif ()
  string(REPLACE "/undef " "#undef "
    FTCONFIG_H "${FTCONFIG_H}")
-  file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h-new"
+  file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h"
    "${FTCONFIG_H}")
 else ()
  file(READ "${PROJECT_SOURCE_DIR}/include/freetype/config/ftconfig.h"
    FTCONFIG_H)
  file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h-new"
    "${FTCONFIG_H}")
 endif ()
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
  "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h-new"
  "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h")
 # Create the options file
 message(STATUS
  "Creating file ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h")
 file(READ "${PROJECT_SOURCE_DIR}/include/freetype/config/ftoption.h"
  FTOPTION_H)
 if (ZLIB_FOUND)
@@ -254,16 +257,8 @@ if (HARFBUZZ_FOUND)
    "/\\* +(#define +FT_CONFIG_OPTION_USE_HARFBUZZ) +\\*/" "\\1"
    FTOPTION_H "${FTOPTION_H}")
 endif ()
-file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h-new"
+file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h"
  "${FTOPTION_H}")
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
  "${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h-new"
  "${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h")
 # Specify library include directories
 include_directories("${PROJECT_SOURCE_DIR}/include")
 include_directories(BEFORE "${PROJECT_BINARY_DIR}/include")
 file(GLOB PUBLIC_HEADERS "include/ft2build.h" "include/freetype/*.h")
@@ -278,13 +273,11 @@ set(BASE_SRCS
  src/base/ftbdf.c
  src/base/ftbitmap.c
  src/base/ftcid.c
  src/base/ftfntfmt.c
  src/base/ftfstype.c
  src/base/ftgasp.c
  src/base/ftglyph.c
  src/base/ftgxval.c
  src/base/ftinit.c
  src/base/ftlcdfil.c
  src/base/ftmm.c
  src/base/ftotval.c
  src/base/ftpatent.c
@@ -316,22 +309,24 @@ set(BASE_SRCS
 )
 if (WIN32)
-  set(BASE_SRCS ${BASE_SRCS} builds/windows/ftdebug.c)
+  enable_language(RC)
  list(APPEND BASE_SRCS builds/windows/ftdebug.c
                        src/base/ftver.rc)
 elseif (WINCE)
-  set(BASE_SRCS ${BASE_SRCS} builds/wince/ftdebug.c)
+  list(APPEND BASE_SRCS builds/wince/ftdebug.c)
 else ()
-  set(BASE_SRCS ${BASE_SRCS} src/base/ftdebug.c)
+  list(APPEND BASE_SRCS src/base/ftdebug.c)
 endif ()
 if (BUILD_FRAMEWORK)
-  set(BASE_SRCS
+  list(APPEND BASE_SRCS builds/mac/freetype-Info.plist)
    ${BASE_SRCS}
    builds/mac/freetype-Info.plist
  )
 endif ()
-set(CMAKE_DEBUG_POSTFIX d)
+
 if (NOT DISABLE_FORCE_DEBUG_POSTFIX)
  set(CMAKE_DEBUG_POSTFIX d)
 endif()
 add_library(freetype
  ${PUBLIC_HEADERS}
@@ -340,15 +335,35 @@ add_library(freetype
  ${BASE_SRCS}
 )
 set_target_properties(
  freetype PROPERTIES
    C_VISIBILITY_PRESET hidden)
 target_compile_definitions(
  freetype PRIVATE FT2_BUILD_LIBRARY)
 if (WIN32)
  target_compile_definitions(
    freetype PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS)
 endif ()
 if (BUILD_SHARED_LIBS)
  set_target_properties(freetype PROPERTIES
-    VERSION ${PROJECT_VERSION}
+    VERSION ${LIBRARY_VERSION}
-    SOVERSION ${SHARED_LIBRARY_VERSION}
+    SOVERSION ${LIBRARY_SOVERSION})
    COMPILE_DEFINITIONS freetype_EXPORTS
  )
 endif ()
 target_include_directories(
  freetype BEFORE  # Pick up ftconfig.h and ftoption.h generated above.
    PRIVATE "${PROJECT_BINARY_DIR}/include")
 target_include_directories(
  freetype
    PRIVATE "${PROJECT_SOURCE_DIR}/include")
 target_include_directories(
  freetype
    PUBLIC $<INSTALL_INTERFACE:include/freetype2>)
 if (BUILD_FRAMEWORK)
  set_property(SOURCE ${PUBLIC_CONFIG_HEADERS}
@@ -362,91 +377,121 @@ if (BUILD_FRAMEWORK)
  )
 endif ()
 if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
  target_include_directories(freetype
    PUBLIC $<INSTALL_INTERFACE:include/freetype2>)
 endif ()
-if (CMAKE_VERSION VERSION_LESS 2.8.12)
+set(PKG_CONFIG_REQUIRED_PRIVATE "")
  set(MAYBE_PRIVATE "")
 else ()
  set(MAYBE_PRIVATE "PRIVATE")
 endif ()
 if (ZLIB_FOUND)
-  target_link_libraries(freetype ${MAYBE_PRIVATE} ${ZLIB_LIBRARIES})
+  target_link_libraries(freetype PRIVATE ${ZLIB_LIBRARIES})
-  include_directories(${ZLIB_INCLUDE_DIRS})
+  target_include_directories(freetype PRIVATE ${ZLIB_INCLUDE_DIRS})
  list(APPEND PKG_CONFIG_REQUIRED_PRIVATE zlib)
 endif ()
 if (BZIP2_FOUND)
-  target_link_libraries(freetype ${MAYBE_PRIVATE} ${BZIP2_LIBRARIES})
+  target_link_libraries(freetype PRIVATE ${BZIP2_LIBRARIES})
-  include_directories(${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS
+  target_include_directories(freetype PRIVATE ${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS
  list(APPEND PKG_CONFIG_REQUIRED_PRIVATE bzip2)
 endif ()
 if (PNG_FOUND)
-  add_definitions(${PNG_DEFINITIONS})
+  target_link_libraries(freetype PRIVATE ${PNG_LIBRARIES})
-  target_link_libraries(freetype ${MAYBE_PRIVATE} ${PNG_LIBRARIES})
+  target_compile_definitions(freetype PRIVATE ${PNG_DEFINITIONS})
-  include_directories(${PNG_INCLUDE_DIRS})
+  target_include_directories(freetype PRIVATE ${PNG_INCLUDE_DIRS})
  list(APPEND PKG_CONFIG_REQUIRED_PRIVATE libpng)
 endif ()
 if (HARFBUZZ_FOUND)
-  target_link_libraries(freetype ${MAYBE_PRIVATE} ${HARFBUZZ_LIBRARIES})
+  target_link_libraries(freetype PRIVATE ${HARFBUZZ_LIBRARIES})
-  include_directories(${HARFBUZZ_INCLUDE_DIRS})
+  target_include_directories(freetype PRIVATE ${HARFBUZZ_INCLUDE_DIRS})
  list(APPEND PKG_CONFIG_REQUIRED_PRIVATE harfbuzz)
 endif ()
-# Installations
+# Installation
-# Note the trailing slash in the argument to the `DIRECTORY' directive
+include(GNUInstallDirs)
 if (NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
-  install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
+  install(
-    DESTINATION include/freetype2
+    # Note the trailing slash in the argument to `DIRECTORY'!
-    PATTERN "internal" EXCLUDE
+    DIRECTORY ${PROJECT_SOURCE_DIR}/include/
-    PATTERN "ftconfig.h" EXCLUDE
+      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2
-    PATTERN "ftoption.h" EXCLUDE
+      COMPONENT headers
-    )
+      PATTERN "internal" EXCLUDE
-  install(FILES
+      PATTERN "ftconfig.h" EXCLUDE
-    ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h
+      PATTERN "ftoption.h" EXCLUDE)
-    ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h
+  install(
-    DESTINATION include/freetype2/freetype/config
+    FILES ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h
-    )
+          ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h
      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2/freetype/config
      COMPONENT headers)
 endif ()
 if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
-  install(TARGETS freetype
+  # Generate the pkg-config file
  if (UNIX)
    file(READ ${PROJECT_SOURCE_DIR}/builds/unix/freetype2.in FREETYPE2_PC_IN)
    string(REPLACE ";" ", " PKG_CONFIG_REQUIRED_PRIVATE "${PKG_CONFIG_REQUIRED_PRIVATE}")
    string(REPLACE "%prefix%" ${CMAKE_INSTALL_PREFIX}
           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    string(REPLACE "%exec_prefix%" "\${prefix}"
           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    string(REPLACE "%libdir%" "\${prefix}/${CMAKE_INSTALL_LIBDIR}"
           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    string(REPLACE "%includedir%" "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}"
           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    string(REPLACE "%ft_version%" "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}"
           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    string(REPLACE "%REQUIRES_PRIVATE%" "${PKG_CONFIG_REQUIRED_PRIVATE}"
           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    string(REPLACE "%LIBS_PRIVATE%" ""  # All libs support pkg-config
           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    file(WRITE ${PROJECT_BINARY_DIR}/freetype2.pc ${FREETYPE2_PC_IN})
    install(
      FILES ${PROJECT_BINARY_DIR}/freetype2.pc
      DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
      COMPONENT pkgconfig)
  endif ()
  install(
    TARGETS freetype
      EXPORT freetype-targets
      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
      FRAMEWORK DESTINATION Library/Frameworks
      COMPONENT libraries)
  install(
    EXPORT freetype-targets
-    RUNTIME DESTINATION bin
+      DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype
-    LIBRARY DESTINATION lib
+      FILE freetype-config.cmake
-    ARCHIVE DESTINATION lib
+      COMPONENT headers)
    FRAMEWORK DESTINATION Library/Frameworks
    )
  install(EXPORT freetype-targets
    DESTINATION lib/cmake/freetype
    FILE freetype-config.cmake
    )
 endif ()
 # Packaging
-# CPack version numbers for release tarball name.
+set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The FreeType font rendering library.")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/docs/LICENSE.TXT")
 set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
-set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH}})
+set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
-if (NOT DEFINED CPACK_PACKAGE_DESCRIPTION_SUMMARY)
+set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-  set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${CMAKE_PROJECT_NAME}")
+
-endif ()
+if (WIN32)
-if (NOT DEFINED CPACK_SOURCE_PACKAGE_FILE_NAME)
+  set(CPACK_GENERATOR ZIP)
-  set(CPACK_SOURCE_PACKAGE_FILE_NAME
+else()
-    "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION}-r${PROJECT_REV}"
+  set(CPACK_GENERATOR TGZ)
-    CACHE INTERNAL "tarball basename"
+endif()
-  )
+
-endif ()
+set(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "Libraries")
-set(CPACK_SOURCE_GENERATOR TGZ)
+set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C/C++ Headers")
-set(CPACK_SOURCE_IGNORE_FILES
+set(CPACK_COMPONENT_LIBRARIES_DESCRIPTION
-  "/CVS/;/.svn/;.swp$;.#;/#;/build/;/serial/;/ser/;/parallel/;/par/;~;/preconfig.out;/autom4te.cache/;/.config")
+  "Library used to build programs which use FreeType")
-set(CPACK_GENERATOR TGZ)
+set(CPACK_COMPONENT_HEADERS_DESCRIPTION
  "C/C++ header files for use with FreeType")
 set(CPACK_COMPONENT_HEADERS_DEPENDS libraries)
 set(CPACK_COMPONENT_LIBRARIES_GROUP "Development")
 set(CPACK_COMPONENT_HEADERS_GROUP "Development")
 include(CPack)
 # Add `make dist' target if FREETYPE_DIST is set (which is the default)
 if (NOT DEFINED FREETYPE_NO_DIST)
  add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
 endif ()
 # eof
@@ -1338,7 +1338,7 @@
 	(cff_compute_bias): Use `U' for constant.
 	* src/cid/cidload.c (cid_decrypt): Ditto.
 	* src/psaux/psobjs.c (T1_Decrypt): Ditto.
-	* src/psaux/t1decode.c (T1_Decoder_Parse_CharStrings): Ditto.
+	* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
 	* src/sfnt/ttload.c (TT_Load_Kern): Remove unused `version'
 	variable.
 	* src/sfnt/ttsbit.c (TT_Load_SBit_Image): Remove unused `top'
@@ -1524,7 +1524,7 @@
 	* src/base/ftcalc.c (FT_DivFix): Fixed a bug in the 64-bit code that
 	created incorrect scale factors!
-	(FT_Round_Fix, FT_CeilFix, FT_FloorFix): Minor improvements.
+	(FT_RoundFix, FT_CeilFix, FT_FloorFix): Minor improvements.
 2001-05-12  Werner Lemberg  <wl@gnu.org>
@@ -2159,7 +2159,7 @@
 	* include/freetype/internal/t2types.h,
 	include/freetype/internal/cfftypes.h: Changed the structures for
-	CFF_Encoding and CFF_Encoding for the new implementations of the
+	CFF_Charset and CFF_Encoding for the new implementations of the
 	charset and encoding parsers in the CFF driver.
 	* src/cff/t2gload.c (t2_lookup_glyph_by_stdcharcode,
@@ -2597,7 +2597,7 @@
 ----------------------------------------------------------------------------
-Copyright 2000-2016 by
+Copyright 2000-2018 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 This file is part of the FreeType project, and may only be used, modified,
@@ -170,7 +170,7 @@
 	FTC_CACHE_TRYLOOP_END): New macros.
 	* src/cache/ftccache.c (FTC_Cache_NewNode), src/cache/ftcsbits.c
-	(ftc_snode_compare): Use FT_CACHE_TRYLOOP and FTC_CACE_TRYLOOP_END.
+	(ftc_snode_compare): Use FT_CACHE_TRYLOOP and FTC_CACHE_TRYLOOP_END.
 2005-05-23  Werner Lemberg  <wl@gnu.org>
@@ -617,7 +617,7 @@
 	`ft_get_adobe_glyph_index', a new function defined in `pstables.h'.
 	(ps_get_macintosh_name, ps_get_standard_strings): Updated.
-	* src/base/ftobjs.c (FT_Set_Char_Sizes): Handle fractional sizes
+	* src/base/ftobjs.c (FT_Set_Char_Size): Handle fractional sizes
 	more carefully.  This fixes Savannah bug #12263.
 2005-03-06  David Turner  <david@freetype.org>
@@ -1819,7 +1819,7 @@
 2004-08-11  Detlef Würkner  <TetiSoft@apg.lahn.de>
 	* src/base/ftrfork.c (FT_Raccess_Guess)
-	[!FT_CONFIG_OPTION_GUESSING_EMBEDDED_FORK]: Remove compiler
+	[!FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK]: Remove compiler
 	warnings.
 2004-08-06  Adam Piotrowski  <st_intel@poczta.onet.pl>
@@ -2101,7 +2101,7 @@
 2004-06-08  David Turner  <david@freetype.org>
-	* include/freetype/freetype.h (FT_GlyphMetrics): Move `lsb_delta'
+	* include/freetype/freetype.h (FT_Glyph_Metrics): Move `lsb_delta'
 	and `rsb_delta' elements to...
 	(FT_GlyphSlotRec): Here to retain binary compatibility with older
 	FreeType versions.
@@ -2528,7 +2528,7 @@
 	* src/truetype/ttgload.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
 	ttgxvar.h.
 	(TT_Process_Simple_Glyph, load_truetype_glyph)
-	[TT_CONFIG_OPTION_GX_VAR_SUPPORT] :Support GX var fonts.
+	[TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Support GX var fonts.
 	* src/truetype/ttobjs.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
 	ttgxvar.h.
@@ -2864,7 +2864,7 @@
 	(psh_blues_snap_stem): Don't use blue_shift but blue_threshold.
 	* src/pshinter/pshalgo.c (PSH_STRONG_THRESHOLD_MAXIMUM): New macro.
-	(psh_glyph_find_string_points): Use PSH_STRONG_THRESHOLD_MAXIMUM.
+	(psh_glyph_find_strong_points): Use PSH_STRONG_THRESHOLD_MAXIMUM.
 	(psh_glyph_find_blue_points): New function.  Needed for fonts like
 	p052003l.pfb (URW Palladio L Roman) which have flex curves at the
 	base line within blue zones, but the flex curves aren't covered by
@@ -3361,7 +3361,7 @@
 	* src/base/ftstroke.c: Include FT_INTERNAL_OBJECTS_H.
 	(FT_Outline_GetOutsideBorder): Inverse result.
-	(FT_Stroker_Rewind, FT_Glyph_Stroke, FT_GlyphStrokeBorder): New
+	(FT_Stroker_Rewind, FT_Glyph_Stroke, FT_Glyph_StrokeBorder): New
 	functions.
 	(FT_Stroker_EndSubPath): Close path if needed.
 	(FT_Stroker_Set, FT_Stroker_ParseOutline): Use FT_Stroker_Rewind.
@@ -3493,8 +3493,8 @@
 2003-12-23  David Turner  <david@freetype.org>
 	* include/freetype/internal/ftobjs.h (FT_PAD_FLOOR, FT_PAD_ROUND,
-	FT_PAD_CEIL, FT_PIX_FLOOR, FT_PIX_ROUND, FT_CEIL): New macros.  They
+	FT_PAD_CEIL, FT_PIX_FLOOR, FT_PIX_ROUND, FT_PIX_CEIL): New macros.
-	are used to avoid compiler warnings with very pedantic compilers.
+	They are used to avoid compiler warnings with very pedantic compilers.
 	Note that `(x) & -64' causes a warning if (x) is not signed.  Use
 	`(x) & ~63' instead!
 	Updated all related code.
@@ -4231,7 +4231,7 @@
 	(t42_parse_encoding): Use `ft_isdigit'.
-	* src/base/ftmm.c (ft_face_get_mm_service): Return FT_Err_OK if
+	* src/base/ftmm.c (ft_face_get_mm_service): Return FT_Err_Ok if
 	success.
 2003-10-05  Werner Lemberg  <wl@gnu.org>
@@ -4355,7 +4355,7 @@
 	new POSTSCRIPT_NAMES service.
 	* src/psaux/t1decode.h (t1_lookup_glyph_by_stdcharcode,
 	t1_decode_init): Use new POSTSCRIPT_NAMES service.
-	* src/psaux/t1cmap.h, src/psaux/t1decode.h: Dont' include
+	* src/psaux/t1cmap.h, src/psaux/t1decode.h: Don't include
 	FT_INTERNAL_POSTSCRIPT_NAMES_H.
 	* src/psnames/psmodule.c:  Don't include
@@ -4749,8 +4749,7 @@
 	* include/freetype/ttunpat.h: Fixing documentation comment.
 	* include/freetype/config/ftoption.h, devel/ftoption.h
-	(TT_CONFIG_OPTION_OPTION_COMPILE_UNPATENTED_HINTING): Replaced
+	(TT_CONFIG_OPTION_COMPILE_UNPATENTED_HINTING): Replaced with...
 	with...
 	(TT_CONFIG_OPTION_UNPATENTED_HINTING): This.  Updated all users.
 	(TT_CONFIG_OPTION_FORCE_UNPATENTED_HINTING): Removed.
@@ -5024,7 +5023,7 @@
 	drivers.
 	* src/base/ftobjs.c (FT_Set_Char_Size): Remove redundant code.
-	(FT_Set_Pixel_Size): Assign value to `metrics' after validation of
+	(FT_Set_Pixel_Sizes): Assign value to `metrics' after validation of
 	arguments.
 2003-06-20  Werner Lemberg  <wl@gnu.org>
@@ -5200,7 +5199,7 @@
 	* src/cid/cidload.c (cid_load_keyword): Handle
 	T1_FIELD_LOCATION_BBOX.
 	(parse_font_bbox): Commented out.
-	(cid_field_record): Comment out element for parsing FontBBox.
+	(cid_field_records): Comment out element for parsing FontBBox.
 	* src/type42/t42parse.c (t42_parse_font_bbox): Commented out.
 	(t42_keywords): Handle FontBBox with T1_FIELD_BBOX, not with
@@ -5916,7 +5915,7 @@
 2003-04-23  Werner Lemberg  <wl@gnu.org>
 	* src/pfr/pfrload.c (pfr_extra_item_load_font_id): Use FT_PtrDist
-	instead of FT_Uint for `len'.
+	instead of FT_UInt for `len'.
 2003-04-22  Werner Lemberg  <wl@gnu.org>
@@ -6550,7 +6549,7 @@
 	* src/cache/ftcsbits.c (ftc_sbit_node_load): Fixed a small bug that
 	caused problems with embedded bitmaps.
-	* src/otlayout/otlayout.h, src/otlyaout/otlconf.h,
+	* src/otlayout/otlayout.h, src/otlayout/otlconf.h,
 	src/otlayout/otlgsub.c, src/otlayout/otlgsub.h,
 	src/otlayout/otlparse.c, src/otlayout/otlparse.h,
 	src/otlayout/otlutils.h: Updating the OpenType Layout code, adding
@@ -6996,7 +6995,7 @@
 2002-09-08  David Turner  <david@freetype.org>
-	Various updates to correctly support sub-pixel rendering.
+	Various updates to correctly support subpixel rendering.
 	* include/freetype/config/ftmodule.h: Add two renderers for LCD.
@@ -7239,7 +7238,7 @@
 	(ft_smooth_render, ft_smooth_render_lcd, ft_smooth_render_lcd_v):
 	New functions.
-	(ft_smooth_locd_renderer_class, ft_smooth_lcdv_renderer_class): New
+	(ft_smooth_lcd_renderer_class, ft_smooth_lcdv_renderer_class): New
 	classes.
 	* src/truetype/ttobjs.c (TT_{Done,New}_GlyphZone): Renamed to...
@@ -7376,7 +7375,7 @@
 	* src/pcf/pcfdriver.c (PCF_Glyph_Load): Fix computation of
 	horiBearingX.
-	* src/bdf/bdfdrivr.c (BDF_GlyphLoad): Fix computation of
+	* src/bdf/bdfdrivr.c (BDF_Glyph_Load): Fix computation of
 	horiBearingY.
 2002-08-16  George Williams  <gww@silcom.com>
@@ -7581,7 +7580,7 @@
 	* include/freetype/cache/ftccache.h, src/cache/ftccache.i,
 	src/cache/ftccache.c [!FTC_CACHE_USE_LINEAR_HASHING]: Removed.
-	(FTC_CACHE_USE_LINEAR_HASHING: Removed also.
+	(FTC_CACHE_USE_LINEAR_HASHING): Removed also.
 	FT_CONFIG_OPTION_USE_CMAPS is now the default.
@@ -7603,7 +7602,7 @@
 	* src/cid/cidriver.c (Cid_Get_Char_Index, Cid_Get_Next_Char):
 	Removed.
-	(t1_cid_driver_class): Updated.
+	(t1cid_driver_class): Updated.
 	* src/truetype/ttdriver.c (tt_driver_class): Updated.
 	* src/type1/t1driver.c (Get_Char_Index, Get_Next_Char): Removed
 	(t1_driver_class): Updated.
@@ -7698,7 +7697,7 @@
 	  CFF_Done_SubFont -> cff_subfont_done
 	  CFF_Load_Font -> cff_font_load
 	  CFF_Done_Font -> cff_font_done
-	  CFF_Size_Get_Global_Funcs -> cff_size_get_global_funcs
+	  CFF_Size_Get_Globals_Funcs -> cff_size_get_globals_funcs
 	  CFF_Size_Done -> cff_size_done
 	  CFF_Size_Init -> cff_size_init
 	  CFF_Size_Reset -> cff_size_reset
@@ -8636,7 +8635,7 @@
 	src/pfr/*: New files.
 	* include/freetype/config/ftmodule.h,
-	include/freetype/internal/fttrace.h, src/Jamefile: Updated.
+	include/freetype/internal/fttrace.h, src/Jamfile: Updated.
 	* src/type1/t1gload.h (T1_Load_Glyph), src/type1/t1gload.c
 	(T1_Load_Glyph): Fixed incorrect parameter sign-ness in callback
@@ -9063,7 +9062,7 @@
 	  FT_Glyph_Name_Requester => FT_Face_GetGlyphNameFunc
 	  FT_Name_Index_Requester => FT_Face_GetGlyphNameIndexFunc
-	* src/base/ftapi.c: New file.  It contains backwards compatibility
+	* src/base/ftapi.c: New file.  It contains backward compatibility
 	functions.
 	* include/freetype/internal/psaux.h, src/cid/cidload.c,
@@ -9106,7 +9105,7 @@
 	FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
 	* src/base/ftcalc.c (FT_MulFix): Ditto.
 	* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
-	* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
+	* src/cff/cffobjs.c (CFF_Size_Get_Globals_Funcs, CFF_Size_Init,
 	CFF_GlyphSlot_Init): Ditto.
 	* src/cid/cidobjs.c (CID_GlyphSlot_Init,
 	CID_Size_Get_Globals_Funcs): Ditto.
@@ -9247,7 +9246,7 @@
 	  {
 	  } PS_StructRec, *PS_Struct;
-	  typedef PS_StructRec  T1_Struct;  /* backwards-compatibility */
+	  typedef PS_StructRec  T1_Struct;  /* backward compatibility */
 	Hence, we increase the coherency of the source code by effectively
 	using the `Rec' prefix for structure types.
@@ -9384,7 +9383,7 @@
 	* src/pcf/pcfread.c (pcf_seek_to_table_type): Ditto.
 	* src/sfnt/sfdriver.c (get_sfnt_postscript_name): Ditto.
 	(pcf_get_bitmaps): The same for `sizebitmaps'.
-	* src/psaux/t1decode.c (T1_Decode_Parse_Charstrings): The same for
+	* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): The same for
 	`orig_y'.
 	(t1operator_seac): Comment out more dead code.
 	* src/pshinter/pshalgo2.c (ps2_hints_apply): Add `DEBUG_HINTER'
@@ -9423,7 +9422,7 @@
 ----------------------------------------------------------------------------
-Copyright 2002-2016 by
+Copyright 2002-2018 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 This file is part of the FreeType project, and may only be used, modified,
@@ -189,7 +189,7 @@
 	* src/base/ftdbgmem.c (_ft_debug_file, _ft_debug_lineno)
 	[FT_DEBUG_MEMORY]: New global variables, replacing...
-	(FT_MemTable_Rec) [FT_DEBUG_MEMORY]: Remove `filename' and
+	(FT_MemTableRec) [FT_DEBUG_MEMORY]: Remove `filename' and
 	`line_no'.  Update all callers.
 	(ft_mem_debug_alloc) [FT_DEBUG_MEMORY]: Avoid possible integer
 	overflow.
@@ -494,7 +494,7 @@
 	FTC_MruList_Init, FTC_MruList_Reset, FTC_MruList_Done,
 	FTC_MruList_New, FTC_MruList_Remove, FTC_MruList_RemoveSelection):
 	Declare as FT_LOCAL_DEF.
-	(FTC_MruListFind, FTC_MruList_Lookup) [!FTC_INLINE]: Compile
+	(FTC_MruList_Find, FTC_MruList_Lookup) [!FTC_INLINE]: Compile
 	conditionally.
 	Declare as FT_LOCAL_DEF.
@@ -605,14 +605,14 @@
 	* docs/release: Minor additions and clarifications.
-	* docs/CHANGES: Updated to reflect many fixes for backwards
+	* docs/CHANGES: Updated to reflect many fixes for backward
 	compatibility.  Still incomplete.
 2006-02-26  David Turner  <david@freetype.org>
 	* src/base/ftobjs.c (ft_recompute_scaled_metrics): Re-enable
 	conservative rounding of metrics to avoid breaking clients like
-	Pango (see http://bugzilla.gnome.org/show_bug.cgi?id=327852).
+	Pango (see https://bugzilla.gnome.org/show_bug.cgi?id=327852).
 2006-02-25  Werner Lemberg  <wl@gnu.org>
@@ -814,7 +814,7 @@
 	* include/freetype/ftcache.h (FTC_IMAGE_TYPE_COMPARE,
 	FTC_IMAGE_TYPE_HASH), src/cache/ftcbasic.c (FTC_OldFontRec,
 	FTC_OldImageDescRec, FTC_ImageCache_Lookup, FTC_Image_Cache_New,
-	FTC_OldImage_Desc, FTC_OLD_IMAGE_FORMAT, ftc_old_image_xxx,
+	FTC_OldImageDesc, FTC_OLD_IMAGE_FORMAT, ftc_old_image_xxx,
 	ftc_image_type_from_old_desc, FTC_Image_Cache_Lookup,
 	FTC_SBitCache_Lookup, FTC_SBit_Cache_New, FTC_SBit_Cache_Lookup)
 	[FT_CONFIG_OPTION_OLD_INTERNALS]: Try to revive old functions of the
@@ -2318,7 +2318,7 @@
 	Further information on the SING Glyphlet format can be found at:
-	  http://www.adobe.com/products/indesign/sing_gaiji.html
+	  https://www.adobe.com/content/dam/acom/en/devnet/font/pdfs/5148.SING_Tutorial.pdf
 	* include/freetype/tttags.h (TTAG_SING, TTAG_META): New macros for
 	the OpenType tables `SING' and `META'.  These two tables are used in
@@ -2458,8 +2458,8 @@
 	* src/gxvalid/gxvbsln.c (GXV_BSLN_VALUE_EMPTY): Add `U'.
-	* src/gxvalid/gxmort1.c (GXV_MORT_SUBTABLE_TYPE1_HEADER_SIZE),
+	* src/gxvalid/gxvmort1.c (GXV_MORT_SUBTABLE_TYPE1_HEADER_SIZE),
-	src/gxvalid/gxmort2.c (GXV_MORT_SUBTABLE_TYPE2_HEADER_SIZE): Fix
+	src/gxvalid/gxvmort2.c (GXV_MORT_SUBTABLE_TYPE2_HEADER_SIZE): Fix
 	typo.
 	* src/gxvalid/gxvmorx0.c, src/gxvalid/gxvmorx1.c,
@@ -2787,7 +2787,7 @@
 2005-06-15  Kirill Smelkov  <kirr@mns.spb.ru>
 	The next release will be 2.2.0, so don't worry about source code
-	backwards compatibility.
+	backward compatibility.
 	* include/freetype/ftimage.h (FT_Outline_MoveToFunc,
 	FT_Outline_LineToFunc, FT_Outline_ConicToFunc,
@@ -2821,7 +2821,7 @@
 ----------------------------------------------------------------------------
-Copyright 2005-2016 by
+Copyright 2005-2018 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 This file is part of the FreeType project, and may only be used, modified,
@@ -43,7 +43,7 @@
 	* src/base/ftoutln.c (FT_Outline_New_Internal): The length of
 	FT_Outline->points[] should be numPoints, not 2 * numPoints.
 	Found by Paul Messmer, see
-	http://lists.gnu.org/archive/html/freetype-devel/2010-02/msg00003.html
+	https://lists.gnu.org/archive/html/freetype-devel/2010-02/msg00003.html
 2010-02-10  Ken Sharp  <ken.sharp@artifex.com>
@@ -108,7 +108,7 @@
 	Preferred family names should be used for legacy systems that
 	can hold only a few faces (<= 4) for a family name. Suggested by
 	Andreas Heinrich.
-	http://lists.gnu.org/archive/html/freetype/2010-01/msg00001.html
+	https://lists.gnu.org/archive/html/freetype/2010-01/msg00001.html
 	* include/freetype/ftsnames.h (FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY,
 	FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY): Define.
@@ -607,7 +607,7 @@
 	(ft_black_render): Initialize `worker->gray_lines' (problem found by
 	valgrind).
-	(FT_RASTER_OPTION_ANTI_ALIASING, DEBUG_RASTER): Dont' #undef, just
+	(FT_RASTER_OPTION_ANTI_ALIASING, DEBUG_RASTER): Don't #undef, just
 	comment out.
 2009-09-12  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
@@ -631,7 +631,7 @@
 	The issue of incompatible cast between unsigned long and void*
 	on LLP64 platform is reported by NightStrike from MinGW-Win64
 	project.  See
-	http://lists.gnu.org/archive/html/freetype/2009-09/msg00000.html
+	https://lists.gnu.org/archive/html/freetype/2009-09/msg00000.html
 	* src/bdf/bdf.h: The type of hashnode->data is changed from
 	void* to size_t.
@@ -657,7 +657,7 @@
 	On LLP64 platform, the conversion from pointer to FT_Fixed need
 	to drop higher 32-bit.  Explicit casts are required. Reported by
 	NightStrike from MinGW-w64 project.  See
-	http://lists.gnu.org/archive/html/freetype/2009-09/msg00000.html
+	https://lists.gnu.org/archive/html/freetype/2009-09/msg00000.html
 	* src/cff/cffgload.c: Convert the pointers to FT_Fixed explicitly.
@@ -671,7 +671,7 @@
 	* src/raster/rules.mk: Don't handle ftmisc.h.  It is needed for
 	stand-alone mode only.
-	* src/raster/ftmisc.h (FT_MemoryRec , FT_Alloc_Func, FT_Free_Func,
+	* src/raster/ftmisc.h (FT_MemoryRec, FT_Alloc_Func, FT_Free_Func,
 	FT_Realloc_Func): Copy declarations from ftsystem.h.
 2009-09-02  Bram Tassyns  <bramt@enfocus.be>
@@ -864,7 +864,7 @@
 		LP64 systems: Higher bits are not used.
 		16-bit systems: Drop can occur.
 	See
-	http://lists.gnu.org/archive/html/freetype-devel/2008-12/msg00065.html
+	https://lists.gnu.org/archive/html/freetype-devel/2008-12/msg00065.html
 	These functions will be refined to take FT_ULong flags in
 	next bump with incompatible API change.
@@ -929,7 +929,7 @@
 	type1: Fix a data type mismatching with its source.
 	* include/freetype/internal/t1types.h: The type of
-	T1_Face->buildchar is matched with T1_Decorder->top.
+	T1_Face->buildchar is matched with T1_Decoder->top.
 2009-07-31  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
@@ -944,7 +944,7 @@
 	pfr: Fix a data type mismatching with its source.
-	* src/pfr/pfrtypes.h: The type of PFR_PhysFont->chars_offset
+	* src/pfr/pfrtypes.h: The type of PFR_PhyFont->chars_offset
 	is extended from FT_UInt32 to FT_Offset, because it is
 	calculated with the pointer difference in pfr_phy_font_load().
@@ -975,8 +975,8 @@
 	psaux: Fix a data type mismatching with its source.
 	* include/freetype/internal/psaux.h: The type of
-	T1_DecorderRec.buildchar is matched with
+	T1_DecoderRec.buildchar is matched with
-	T1_DecorderRec.top.
+	T1_DecoderRec.top.
 2009-07-31  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
@@ -1765,7 +1765,7 @@
 	ftgzip.c by FT2 are enabled by default.  To use
 	zlib zcalloc() & zfree(), define USE_ZLIB_ZCALLOC.
 	See discussion:
-	http://lists.gnu.org/archive/html/freetype-devel/2009-02/msg00000.html
+	https://lists.gnu.org/archive/html/freetype-devel/2009-02/msg00000.html
 2009-07-31  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
@@ -1904,7 +1904,7 @@
 2009-07-15  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 	Borland C++ compiler patch proposed by Mirco Babin.
-	http://lists.gnu.org/archive/html/freetype/2009-07/msg00016.html.
+	https://lists.gnu.org/archive/html/freetype/2009-07/msg00016.html.
 	* builds/exports.mk: Delete unused flags, CCexe_{CFLAGS,LDFLAGS}.
 	Fix APINAMES_C and APINAMES_EXE pathnames to reflect the platform
@@ -1929,7 +1929,7 @@
 	* src/tools/chktrcmp.py: A script to check trace_XXXX macros
 	that are used in C source but undefined in fttrace.h, or
 	defined in fttrace.h but unused in C sources.  See
-	http://lists.gnu.org/archive/html/freetype-devel/2009-07/msg00013.html.
+	https://lists.gnu.org/archive/html/freetype-devel/2009-07/msg00013.html.
 	* docs/DEBUG: Mention on chktrcmp.py.
 	* docs/release: Ditto.
@@ -1961,7 +1961,7 @@
 	* include/freetype/internal/fttrace.h: Add FT_TRACE_DEF( t1afm )
 	and FT_TRACE_DEF( ttbdf ).  See
-	http://lists.gnu.org/archive/html/freetype-devel/2009-07/msg00013.html
+	https://lists.gnu.org/archive/html/freetype-devel/2009-07/msg00013.html
 2009-07-09  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
@@ -1975,8 +1975,8 @@
 	Prevent the overflows by a glyph with too many points or contours.
 	The bug is reported by Boris Letocha <b.letocha@gmc.net>.  See
-	http://lists.gnu.org/archive/html/freetype-devel/2009-06/msg00031.html
+	https://lists.gnu.org/archive/html/freetype-devel/2009-06/msg00031.html
-	http://lists.gnu.org/archive/html/freetype-devel/2009-07/msg00002.html	
+	https://lists.gnu.org/archive/html/freetype-devel/2009-07/msg00002.html	
 	* include/freetype/ftimage.h (FT_OUTLINE_CONTOURS_MAX,
 	FT_OUTLINE_POINTS_MAX): New macros to declare the maximum
@@ -2001,7 +2001,7 @@
 2009-06-28  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 	ftpatent: Fix a bug by wrong usage of service->table_info().
-	http://lists.gnu.org/archive/html/freetype-devel/2008-12/msg00039.html
+	https://lists.gnu.org/archive/html/freetype-devel/2008-12/msg00039.html
 	* include/freetype/internal/services/svsfnt.h: Extend
 	FT_SFNT_TableInfoFunc() to take new argument to obtain the offset
@@ -2069,7 +2069,7 @@
 	* builds/unix/configure.raw: Fix a bug in sed script to extract
 	native suffix for binary executables, patch by Peter Breitenlohner.
-	http://lists.gnu.org/archive/html/freetype-devel/2009-04/msg00036.html
+	https://lists.gnu.org/archive/html/freetype-devel/2009-04/msg00036.html
 2009-06-26  Werner Lemberg  <wl@gnu.org>
@@ -2125,7 +2125,7 @@
 	code unconditionally.
 	Add support for random numbers and update remaining code
 	accordingly; this should work now.
-	(t1_operator_seac): Updated.
+	(t1operator_seac): Updated.
 	* src/psaux/pshrec.c: Include FT_INTERNAL_CALC_H.
 	(ps_hints_t1stem3, t1_hints_stem): Updated.
@@ -2594,14 +2594,14 @@
 	Position Independent Code (PIC) support in smooth renderer.
 	* src/smooth/ftsmooth.h declare ft_smooth_renderer_class,
-	ft_smooth_lcd_renderer_class and ft_smooth_lcd_v_renderer_class
+	ft_smooth_lcd_renderer_class and ft_smooth_lcdv_renderer_class
 	using macros from ftrender.h,
 	when FT_CONFIG_OPTION_PIC is defined create and destroy
 	functions will be declared.
 	* src/smooth/ftsmooth.c when FT_CONFIG_OPTION_PIC is defined
 	the following structs:
 	ft_smooth_renderer_class, ft_smooth_lcd_renderer_class
-	and ft_smooth_lcd_v_renderer_class
+	and ft_smooth_lcdv_renderer_class
 	will have functions to init or create and destroy them
 	instead of being allocated in the global scope.
 	And macros will be used from ftspic.h in order to access
@@ -3469,8 +3469,8 @@
 	faces includes broken face which FT_Done_Face() cannot free,
 	FT_Done_Library() retries FT_Done_Face() and it can fall into
 	an endless loop. See the discussion:
-	http://lists.gnu.org/archive/html/freetype-devel/2008-09/msg00047.html
+	https://lists.gnu.org/archive/html/freetype-devel/2008-09/msg00047.html
-	http://lists.gnu.org/archive/html/freetype-devel/2008-10/msg00000.html
+	https://lists.gnu.org/archive/html/freetype-devel/2008-10/msg00000.html
 2009-01-07  Werner Lemberg  <wl@gnu.org>
@@ -3492,7 +3492,7 @@
 	* builds/unix/configure.raw: Don't call AC_CANONICAL_BUILD and
 	AC_CANONICAL_TARGET and use $host_os only.  A nice explanation for
 	this change can be found at
-	http://blog.flameeyes.eu/s/canonical-target.
+	https://blog.flameeyes.eu/s/canonical-target.
 	From Savannah patch #6712.
@@ -4156,7 +4156,7 @@
 2008-09-05  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 	* builds/unix/configure.raw: Clear FT2_EXTRA_LIBS when Carbon or
-	ApplicationService framework is missing.  Although this value is not
+	ApplicationServices framework is missing.  Although this value is not
 	used in building of FreeType2, it is written in `freetype2.pc' and
 	`freetype-config'.
@@ -4516,7 +4516,7 @@
 	recommends to add the option only to CFLAGS, LDFLAGS should include
 	it because libfreetype.la is built with -no-undefined.  This fixes a
 	bug reported by Ryan Schmidt in MacPorts,
-	http://trac.macports.org/ticket/15331.
+	https://trac.macports.org/ticket/15331.
 2008-06-21  Werner Lemberg  <wl@gnu.org>
@@ -4861,7 +4861,7 @@
 2008-04-14  Werner Lemberg  <wl@gnu.org>
 	* src/pcf/pcfdrivr.c (PCF_Face_Init): Protect call to
-	`FT_Stream_OpenLZW' with `FT_CONFIG_OPTION_USE_LZ'.  From Savannah
+	`FT_Stream_OpenLZW' with `FT_CONFIG_OPTION_USE_LZW'.  From Savannah
 	bug #22909.
 2008-04-13  Werner Lemberg  <wl@gnu.org>
@@ -5243,7 +5243,7 @@
 	functions related to cmap type 14 support to the
 	`FT_Object_ActionName' scheme:
-	  FT_Get_Char_Variant_index     -> FT_Face_GetCharVariantIndex
+	  FT_Get_Char_Variant_Index     -> FT_Face_GetCharVariantIndex
 	  FT_Get_Char_Variant_IsDefault -> FT_Face_GetCharVariantIsDefault
 	  FT_Get_Variant_Selectors      -> FT_Face_GetVariantSelectors
 	  FT_Get_Variants_Of_Char       -> FT_Face_GetVariantsOfChar
@@ -5383,7 +5383,7 @@
 	* include/freetype/ftotval.h (FT_VALIDATE_MATH): New macro.
 	(FT_VALIDATE_OT): Updated.
-	* src/otvalid/otmath.c: New file.
+	* src/otvalid/otvmath.c: New file.
 	* src/otvalid/otvalid.c: Include otvmath.c.
 	* src/otvalid/otvmod.c (otv_validate): Handle `MATH' table.
@@ -5530,7 +5530,7 @@
 	* src/truetype/ttinterp.c (Ins_IUP): Add missing variable
 	initialization.
-	* src/autofit/aflatin.c (af_latin_metric_init_blues): Get rid of an
+	* src/autofit/aflatin.c (af_latin_metrics_init_blues): Get rid of an
 	infinite loop in the case of degenerate fonts.
 2007-06-26  Rahul Bhalerao  <b.rahul.pm@gmail.com>
@@ -5965,7 +5965,7 @@
 	* include/freetype/config/ftstdlib.h,
 	include/freetype/internal/ftobjs.h: As suggested by Graham Asher,
 	ensure that ft_isalnum, ft_isdigit, etc., use hard-coded values
-	instead on relying on the locale-dependent functions provided by
+	instead of relying on the locale-dependent functions provided by
 	<ctypes.h>.
 2007-05-15  Graham Asher  <graham.asher@btinternet.com>
@@ -6187,13 +6187,13 @@
 	* builds/unix/ftsystem.c (FT_Stream_Open): Temporary fix to prevent
 	32bit unsigned long overflow by 64bit filesize on LP64 platform, as
 	proposed by Sean McBride:
-	http://lists.gnu.org/archive/html/freetype-devel/2007-03/msg00032.html
+	https://lists.gnu.org/archive/html/freetype-devel/2007-03/msg00032.html
 2007-03-22  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 	* builds/unix/ftconfig.in: Suppress SGI compiler's warning against
 	setjmp, proposed by Sean McBride:
-	http://lists.gnu.org/archive/html/freetype-devel/2007-03/msg00032.html
+	https://lists.gnu.org/archive/html/freetype-devel/2007-03/msg00032.html
 2007-03-19  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
@@ -6852,7 +6852,7 @@
 	* include/freetype/internal/services/svotval.h: Add `volatile' to
 	sync with the modification by Jens Claudius on 2006-08-22; cf.
-	  http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/otvalid/otvmod.c?r1=1.4&r2=1.5
+	  https://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/otvalid/otvmod.c?r1=1.4&r2=1.5
 2006-12-15  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
@@ -6876,7 +6876,7 @@
 	* src/base/ftobjs.c: Improvement of resource fork handler for
 	POSIX, cf.
-	  http://lists.gnu.org/archive/html/freetype-devel/2006-10/msg00025.html
+	  https://lists.gnu.org/archive/html/freetype-devel/2006-10/msg00025.html
 	(Mac_Read_sfnt_Resource): Count only `sfnt' resource of suitcase font
 	format or .dfont, to simulate the face index number counted by ftmac.c.
 	(IsMacResource): Return the number of scalable faces correctly.
@@ -7023,7 +7023,7 @@
 	(_ft_lcd_filter_fir): This.
 	Update parameters.
 	(_ft_lcd_filter_legacy) [USE_LEGACY]: New filter function.
-	(FT_Library_Set_LcdFilter): Update parameters.
+	(FT_Library_SetLcdFilter): Update parameters.
 	Handle new filter modes.
 	* include/internal/ftobjs.h: Include FT_LCD_FILTER_H.
@@ -7366,7 +7366,7 @@
 	to recognize a few fonts that require the automatic unpatented
 	loader.
-	* src/smooth/ftgrays.c: Optmize the performance of the anti-aliased
+	* src/smooth/ftgrays.c: Optimize the performance of the anti-aliased
 	rasterizer.  The speed improvement is between 15% and 25%, depending
 	on the font data.
@@ -7524,7 +7524,7 @@
 	`ft_validator_run' wrapping `setjmp' can cause a crash, as found by
 	Jens:
-	http://lists.gnu.org/archive/html/freetype-devel/2006-08/msg00004.htm.
+	https://lists.gnu.org/archive/html/freetype-devel/2006-08/msg00004.htm.
 	* src/otvalid/otvmod.c: Replace `ft_validator_run' by `ft_setjmp'.
 	It reverts the change introduced on 2005-08-20.
@@ -7721,7 +7721,7 @@
 2006-06-24  Eugeniy Meshcheryakov  <eugen@univ.kiev.ua>
 	Fix two hinting bugs as reported in
-	http://lists.gnu.org/archive/html/freetype-devel/2006-06/msg00057.html.
+	https://lists.gnu.org/archive/html/freetype-devel/2006-06/msg00057.html.
 	* include/freetype/internal/tttypes.h (TT_GlyphZoneRec): Add
 	`first_point' member.
@@ -7761,7 +7761,7 @@
 	should return `FT_Err_Unimplemented_Feature' if validation service
 	is unavailable (disabled in `modules.cfg').  It is originally
 	suggested by David Turner, cf.
-	http://lists.gnu.org/archive/html/freetype-devel/2005-11/msg00078.html
+	https://lists.gnu.org/archive/html/freetype-devel/2005-11/msg00078.html
 	* src/base/ftgxval.c (FT_TrueTypeGX_Validate): Return
 	FT_Err_Unimplemented_Feature if TrueTypeGX validation service is
@@ -7857,7 +7857,7 @@
 2006-05-18  Werner Lemberg  <wl@gnu.org>
 	* src/truetype/ttgload.c (TT_Load_Composite_Glyph)
-	[FT_CONFIG_OPTION_BYTECODE_INTERPRETER]: Make it compilable again.
+	[TT_CONFIG_OPTION_BYTECODE_INTERPRETER]: Make it compilable again.
 2006-05-17  David Turner  <david@freetype.org>
@@ -7932,7 +7932,7 @@
 ----------------------------------------------------------------------------
-Copyright 2006-2016 by
+Copyright 2006-2018 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 This file is part of the FreeType project, and may only be used, modified,
@@ -335,7 +335,7 @@
 	* include/freetype/ftmoderr.h: Fix commit from 2013-03-11.
-	The previous version was not backwards compatible.  Reported by
+	The previous version was not backward compatible.  Reported by
 	Behdad.
 2013-03-14  Werner Lemberg  <wl@gnu.org>
@@ -744,7 +744,7 @@
 2013-01-16  David 'Digit' Turner  <digit@google.com>
-	[truetype] Improve sub-pixel code.
+	[truetype] Improve subpixel code.
 	This patches fixes many issues with the ttsubpix implementation.
@@ -784,7 +784,7 @@
 	and `const' where appropriate.
 	(X_SCALING_Rules, X_SCALING_RULES_SIZE): Renamed to...
-	(spu_X_SCALING_Rules, SPH_X_SCALING_RULES_SIZE): This.
+	(sph_X_SCALING_Rules, SPH_X_SCALING_RULES_SIZE): This.
 	Update all users.
 2013-01-12  Alexei Podtelezhnikov  <apodtele@gmail.com>
@@ -1860,10 +1860,10 @@
 	Fix `checking if gcc static flag -static works' test.
 	On my linux build tree, I receive yes answer in every package I
-	build except freetype for this test checking if gcc static flag
+	build except FreeType for this test checking if gcc static flag
 	`-static' works
-	On freetype, no is received, unless bzip2 and zlib are disabled using
+	In FreeType, no is received, unless bzip2 and zlib are disabled using
 	  ./configure --without-bzip2 --without-zlib
@@ -1977,7 +1977,7 @@
 	Most of the code is based on the ClearType whitepaper written by
 	Greg Hitchcock
-	  http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
+	  https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
 	which gives a detailed overview of the necessary changes to the
 	Microsoft rasterizer so that older fonts are supported.  However, a
@@ -2103,7 +2103,7 @@
 	NEC FA family dated in 1996 have different checksum.
 	Reported by Johnson Y. Yan <yinsen_yan@foxitsoftware.com>; see
-	  http://lists.gnu.org/archive/html/freetype-devel/2012-06/msg00023.html
+	  https://lists.gnu.org/archive/html/freetype-devel/2012-06/msg00023.html
 	* src/truetype/ttobjs.c (tt_check_trickyness_sfnt_ids): 4 sets
 	of fpgm & prep table checksums for FA-Gothic, FA-Minchou,
@@ -2117,7 +2117,7 @@
 	Problem reported by jola <hans-jochen.lau@lhsystems.com>; see
-	  http://lists.gnu.org/archive/html/freetype-devel/2012-05/msg00036.html
+	  https://lists.gnu.org/archive/html/freetype-devel/2012-05/msg00036.html
 	* src/raster/ftraster.c (SMulDiv_No_Round): New macro.
 	(Line_Up): Use it.
@@ -2141,7 +2141,7 @@
 	* include/freetype/ftoutln.h (FT_Outline_EmboldenXY): Define it.
 	* src/base/ftoutln.c (FT_Outline_EmboldenXY): Implement it, using a
-	simplified embolding algorithm.
+	simplified emboldening algorithm.
 	(FT_Outline_Embolden): Make it a special case of
 	`FT_Outline_EmboldenXY'
@@ -2603,7 +2603,7 @@
 	See discussion starting at
-	  http://lists.gnu.org/archive/html/freetype-devel/2012-01/msg00037.html
+	  https://lists.gnu.org/archive/html/freetype-devel/2012-01/msg00037.html
 	* src/smooth/ftgrays.c: s/TBand/gray_TBand/.
 	* src/raster/ftraster.c: s/TBand/black_TBand/.
@@ -2616,7 +2616,7 @@
 	`outline.flags' so that this information is preserved.  See
 	discussion starting at
-	  http://lists.gnu.org/archive/html/freetype-devel/2012-02/msg00046.html
+	  https://lists.gnu.org/archive/html/freetype-devel/2012-02/msg00046.html
 2012-02-11  Werner Lemberg  <wl@gnu.org>
@@ -2677,7 +2677,7 @@
 	[raccess] Modify for PIC build.
 	Based on the patch provided by Erik Dahlstrom <ed@opera.com>,
-	http://lists.gnu.org/archive/html/freetype-devel/2012-01/msg00010.html
+	https://lists.gnu.org/archive/html/freetype-devel/2012-01/msg00010.html
 	Also `raccess_guess_table[]' and `raccess_rule_by_darwin_vfs()'
 	are renamed with `ft_' suffixes.
@@ -2941,10 +2941,10 @@
 	[type42] Remove casts.
-	* src/type42/t42driver.c (t42_driver_class): Remove all casts and
+	* src/type42/t42drivr.c (t42_driver_class): Remove all casts and
 	update affected functions.
-	* src/type42/t42objs.c, src/type42/t42objs.h: Updated for t42driver
+	* src/type42/t42objs.c, src/type42/t42objs.h: Updated for t42 driver
 	changes.
 2011-11-30  Werner Lemberg  <wl@gnu.org>
@@ -3127,7 +3127,7 @@
 	According to
-	  http://www.gnu.org/prep/maintain/html_node/Copyright-Notices.html
+	  https://www.gnu.org/prep/maintain/html_node/Copyright-Notices.html
 	this should be mentioned explicitly.
@@ -3456,7 +3456,7 @@
 	See
-	  http://lists.gnu.org/archive/html/freetype-devel/2011-07/msg00049.html
+	  https://lists.gnu.org/archive/html/freetype-devel/2011-07/msg00049.html
 	for some comparison images.
@@ -3556,7 +3556,7 @@
 	See
-	  http://lists.gnu.org/archive/html/freetype-devel/2011-07/msg00001.html
+	  https://lists.gnu.org/archive/html/freetype-devel/2011-07/msg00001.html
 	for example documents.  The FreeType stroker now produces results
 	very similar to that produced by GhostScript and Distiller for these
@@ -3776,7 +3776,7 @@
 	[gxvalid] Fix gcc4.6 compiler warnings in gxvtrak.c.
 	* src/gxvalid/gxvtrak.c (gxv_trak_trackTable_validate):
-	Check different entries pointing same traking value.
+	Check different entries pointing same tracking value.
 	(gxv_trak_validate): Remove unused variable `table_size'.
 2011-06-14  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
@@ -3788,12 +3788,12 @@
 	(gxv_morx_chain_validate): Conditionalize unvalidated
 	variable `defaultFlags'.
-	* src/gxvalid/gxmorx0.c
+	* src/gxvalid/gxvmorx0.c
 	(gxv_morx_subtable_type0_entry_validate):
 	Conditionalize unvalidated variables; `markFirst',
 	`dontAdvance', `markLast', `verb'.
-	* src/gxvalid/gxmorx1.c
+	* src/gxvalid/gxvmorx1.c
 	(gxv_morx_subtable_type1_entry_validate): Conditionalize
 	unvalidated variables; `setMark', `dontAdvance'.
@@ -3826,11 +3826,11 @@
 	(gxv_mort_chain_validate): Conditionalize unvalidated
 	variable `defaultFlags'.
-	* src/gxvalid/gxmort0.c
+	* src/gxvalid/gxvmort0.c
 	(gxv_mort_subtable_type0_entry_validate): Check the
 	conflict of the marks for the glyphs.
-	* src/gxvalid/gxmort1.c
+	* src/gxvalid/gxvmort1.c
 	(gxv_mort_subtable_type1_offset_to_subst_validate):
 	Local variables `min_gid', `max_gid' are replaced by
 	variables in the validator.
@@ -4005,9 +4005,9 @@
 	aligned, bluezones for CJK Ideographs are calculated from
 	sample glyphs.  At present, vertical bluezones (bluezones
 	to align vertical stems) are disabled by default.  For detail, see
-	http://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00070.html
+	https://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00070.html
-	http://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00092.html
+	https://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00092.html
-	http://lists.gnu.org/archive/html/freetype-devel/2011-05/msg00001.html
+	https://lists.gnu.org/archive/html/freetype-devel/2011-05/msg00001.html
 	* include/freetype/internal/fttrace.h: New trace component `afcjk'.
 	* src/autofit/afcjk.h (AF_CJK{Blue,Axis,Metric}Rec): Add CJK version
@@ -4029,7 +4029,7 @@
 	af_latin_hints_compute_blue_edges.
 	(af_cjk_metrics_init_blues): New function, CJK version of
 	af_latin_metrics_init_blues.
-	(af_cjk_hints_edges): Add code to align the edge stems to blue zones.
+	(af_cjk_hint_edges): Add code to align the edge stems to blue zones.
 	* src/autofit/afindic.c (af_indic_metrics_init): Take AF_CJKMetric
 	instead of AF_LatinMetric, and initialize as af_cjk_metrics_init.
@@ -4075,8 +4075,8 @@
 	the TrueType font header.  Some bad PDF generators write
 	wrong values.  For details see examples and benchmark tests
 	of the latency by recalculation:
-	http://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00091.html
+	https://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00091.html
-	http://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00096.html
+	https://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00096.html
 2011-04-30  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
@@ -4109,7 +4109,7 @@
 	Because some PDF generators mangle the family name badly,
 	the trickyness check by the checksum should be invoked always.
 	For sample PDF, see
-	http://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00073.html
+	https://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00073.html
 	* src/truetype/ttobjs.c (tt_check_trickyness): Even when
 	tt_check_trickyness_family() finds no trickyness,
@@ -4146,8 +4146,8 @@
 	When there are too many stems to preserve their gaps in the
 	rasterization of CJK Ideographs at a low resolution, blur the
 	stems instead of showing clumped stems.  See
-	http://lists.gnu.org/archive/html/freetype-devel/2011-02/msg00011.html
+	https://lists.gnu.org/archive/html/freetype-devel/2011-02/msg00011.html
-	http://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00046.html
+	https://lists.gnu.org/archive/html/freetype-devel/2011-04/msg00046.html
 	for details.
 	* src/autofit/afcjk.c (af_cjk_hint_edges): Store the position of
@@ -4343,7 +4343,7 @@
 	[cache] Fix an off-by-one bug in `FTC_Manager_RemoveFaceID'.
 	Found by <ychen1392001@yahoo.com.cn>, see detail in
-	  http://lists.gnu.org/archive/html/freetype/2011-01/msg00023.html
+	  https://lists.gnu.org/archive/html/freetype/2011-01/msg00023.html
 	* src/cache/ftccache.c (FTC_Cache_RemoveFaceID): Check the node
 	buckets[cache->p + cache->mask] too.
@@ -4464,7 +4464,7 @@
 	Johnson Y. Yan.  The bug report by Qt developers is
 	considered too.
-	http://bugreports.qt.nokia.com/browse/QTBUG-6521
+	https://bugreports.qt.io/browse/QTBUG-6521
 2011-01-15  Werner Lemberg  <wl@gnu.org>
@@ -4923,7 +4923,7 @@
 	Partially undo change from 2010-10-15 by using ONE_PIXEL/4; this has
 	been tested with demo images sent to the mailing list.  See
-	  http://lists.gnu.org/archive/html/freetype-devel/2010-10/msg00055.html
+	  https://lists.gnu.org/archive/html/freetype-devel/2010-10/msg00055.html
 	and later mails in this thread.
@@ -4943,7 +4943,7 @@
 	Problem reported by Tom Bishop <wenlin@wenlin.com>; see
 	thread starting with
-	  http://lists.gnu.org/archive/html/freetype/2010-10/msg00049.html
+	  https://lists.gnu.org/archive/html/freetype/2010-10/msg00049.html
 	* src/raster/ftraster.c (Line_Up): Replace FMulDiv with SMulDiv
 	since the involved multiplication exceeds 32 bits.
@@ -5007,7 +5007,7 @@
 	normal clients.
 	For the history of these macros, see the investigation:
-	http://lists.gnu.org/archive/html/freetype/2010-10/msg00022.html
+	https://lists.gnu.org/archive/html/freetype/2010-10/msg00022.html
 2010-10-24  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
@@ -5054,7 +5054,7 @@
 	by Darwin VFS are skipped.  It reduces the warnings of the
 	deprecated resource fork access method by recent Darwin kernel.
 	Fix MacPorts ticket #18859:
-		http://trac.macports.org/ticket/18859
+		https://trac.macports.org/ticket/18859
 	* src/base/ftobjs.c (load_face_in_embedded_rfork):
 	When `FT_Stream_New' returns FT_Err_Cannot_Open_Stream, it
@@ -5182,7 +5182,7 @@
 	[smooth] Fix splitting of cubics for negative values.
 	Reported by Róbert Márki <gsmiko@gmail.com>; see
-	http://lists.gnu.org/archive/html/freetype/2010-09/msg00019.html.
+	https://lists.gnu.org/archive/html/freetype/2010-09/msg00019.html.
 	* src/smooth/ftgrays.c (gray_render_cubic): Fix thinko.
@@ -5349,7 +5349,7 @@
 	Ignore the environmental setting of LIBTOOL.
 	Patch is suggested by Adrian Bunk, to prevent unexpected
 	reflection of environmental LIBTOOL.  See:
-	http://savannah.nongnu.org/patch/?7290
+	https://savannah.nongnu.org/patch/?7290
 	* builds/unix/unix-cc.in: LIBTOOL is unconditionally set to
 	$(FT_LIBTOOL_DIR)/libtool.  FT_LIBTOOL_DIR is set to $(BUILD_DIR)
@@ -5406,8 +5406,8 @@
 	for nameless fonts is safer for PDFs including embedded Chinese
 	fonts.  Written by David Bevan, see:
-	http://lists.gnu.org/archive/html/freetype-devel/2010-08/msg00021.html
+	https://lists.gnu.org/archive/html/freetype-devel/2010-08/msg00021.html
-	http://lists.freedesktop.org/archives/poppler/2010-August/006310.html
+	https://lists.freedesktop.org/archives/poppler/2010-August/006310.html
 	* src/truetype/ttobjs.c (tt_check_trickyness): If a NULL pointer by
 	nameless font is given, TRUE is returned to enable hinting.
@@ -5669,7 +5669,7 @@
 	Use defined macros to set {platform,encoding}_id.
 	* src/bdf/bdfdrivr.c: Include ttnameid.h and use macros to
-	set charmap.{platfom,encoding}_id.
+	set charmap.{platform,encoding}_id.
 	* src/pcf/pcfdrivr.c: Ditto.
 	* src/winfonts/winfnt.c: Ditto.
 	* src/type1/t1objs.c: Ditto.
@@ -5792,8 +5792,8 @@
 	* src/cff/cffobjs.c (cff_face_init): Check error value by
 	`FT_CMap_New'.
 	* src/pfr/pfrobjs.c (pfr_face_init): Ditto.
-	* src/type1/t1jobjs.c (T1_Face_Init): Ditto.
+	* src/type1/t1objs.c (T1_Face_Init): Ditto.
-	* src/type42/t42jobjs.c (T42_Face_Init): Ditto.
+	* src/type42/t42objs.c (T42_Face_Init): Ditto.
 2010-07-03  Werner Lemberg  <wl@gnu.org>
@@ -5968,7 +5968,7 @@
 	* src/smooth/ftgrays.c (gray_render_cubic): Fix algorithm.
 	The previous version was too aggressive, as demonstrated in
-	http://lists.gnu.org/archive/html/freetype-devel/2010-06/msg00020.html.
+	https://lists.gnu.org/archive/html/freetype-devel/2010-06/msg00020.html.
 2010-06-24  Werner Lemberg  <wl@gnu.org>
@@ -6065,7 +6065,7 @@
 	simplified algorithm to find out whether the spline can be replaced
 	with two straight lines.  See this thread for more:
-	  http://lists.gnu.org/archive/html/freetype-devel/2010-06/msg00000.html
+	  https://lists.gnu.org/archive/html/freetype-devel/2010-06/msg00000.html
 2010-06-09  Werner Lemberg  <wl@gnu.org>
@@ -6220,7 +6220,7 @@
 	Add new function `FT_Library_SetLcdFilterWeights'.
 	This is based on code written by Lifter
-	<http://unixforum.org/index.php?showuser=11691>.  It fixes
+	<https://unixforum.org/index.php?showuser=11691>.  It fixes
 	FreeDesktop bug #27386.
 	* src/base/ftlcdfil.c (FT_Library_SetLcdFilterWeights): New
@@ -6344,7 +6344,7 @@
 ----------------------------------------------------------------------------
-Copyright 2010-2016 by
+Copyright 2010-2018 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 This file is part of the FreeType project, and may only be used, modified,
@@ -112,8 +112,8 @@
 	Original patch is designed by Werner Lemberg.  Extra part
 	for otvalid and gxvalid are added by suzuki toshiya, see
 	discussion:
-	http://lists.nongnu.org/archive/html/freetype-devel/2014-12/msg00002.html
+	https://lists.nongnu.org/archive/html/freetype-devel/2014-12/msg00002.html
-	http://lists.nongnu.org/archive/html/freetype-devel/2014-12/msg00007.html
+	https://lists.nongnu.org/archive/html/freetype-devel/2014-12/msg00007.html
 	* include/internal/ftvalid.h: Introduce FT_THROW() in FT_INVALID_().
 	* src/gxvalid/gxvcommn.h: Ditto.
@@ -144,7 +144,7 @@
 	for Borland's bug tracker entry.
 	Reported by Yuliana Zigangirova <zigangirova@inbox.ru>,
-	http://lists.gnu.org/archive/html/freetype-devel/2014-04/msg00001.html.
+	https://lists.gnu.org/archive/html/freetype-devel/2014-04/msg00001.html.
 	* include/internal/ftvalid.h (FT_ValidatorRec), src/smooth/ftgrays.c
 	(gray_TWorker_): Move `ft_jmp_buf' field to be the first element.
@@ -244,7 +244,7 @@
 	All public FreeType enumeration and flag values are uppercase...
-	* include/tttables.h (FT_Sfnt_Tag): Implement it.  For backwards
+	* include/tttables.h (FT_Sfnt_Tag): Implement it.  For backward
 	compatibility, retain the old values as macros.
 	* src/base/ftfstype.c (FT_Get_FSType_Flags), src/sfnt/sfdriver.c
@@ -1223,7 +1223,7 @@
 2014-10-14  Werner Lemberg  <wl@gnu.org>
-	[autofit] Adjust Devenagari character range.
+	[autofit] Adjust Devanagari character range.
 	* src/autofit/afranges.c (af_deva_uniranges): Omit characters that
 	are common to all other Indic scripts.
@@ -2116,7 +2116,7 @@
 	builds/unix/unix-def.in (freetype-config, freetype2.pc): Handle
 	HarfBuzz.
-	* docs/INSTALL.UNIX: Document interdependency of Freetype with
+	* docs/INSTALL.UNIX: Document interdependency of FreeType with
 	HarfBuzz.
 2014-02-28  Alexei Podtelezhnikov  <apodtele@gmail.com>
@@ -2669,8 +2669,8 @@
 	with Carbon framework is incompatible with that by FreeType 2
 	without Carbon framework.)  Found by Khaled Hosny and Hin-Tak Leung.
-	http://lists.gnu.org/archive/html/freetype-devel/2013-02/msg00035.html
+	https://lists.gnu.org/archive/html/freetype-devel/2013-02/msg00035.html
-	http://lists.gnu.org/archive/html/freetype-devel/2013-12/msg00027.html
+	https://lists.gnu.org/archive/html/freetype-devel/2013-12/msg00027.html
 	* src/base/ftrfork.c (FT_Raccess_Get_DataOffsets): Add a switch
 	`sort_by_res_id' to control the fragmented resource ordering.
@@ -3181,7 +3181,7 @@
 	Problem reported by Hin-Tak Leung <htl10@users.sourceforge.net>; see
-	  http://lists.nongnu.org/archive/html/freetype-devel/2013-08/msg00005.html
+	  https://lists.nongnu.org/archive/html/freetype-devel/2013-08/msg00005.html
 	for details.
@@ -3556,7 +3556,7 @@
 	Suggested by Akira Tagoh, see
-	  http://lists.gnu.org/archive/html/freetype/2013-09/msg00030.html
+	  https://lists.gnu.org/archive/html/freetype/2013-09/msg00030.html
 	* src/bdf/bdfdrivr.c (BDF_Face_Init): Return `Invalid_Argument'
 	error if the font could be opened but non-zero `face_index' is
@@ -4767,7 +4767,7 @@
 	* src/cache/ftcmanag.c (FTC_Manager_Check): Fix cast.
 	* src/cache/ftcmanag.h (FTC_ManagerRec): Ditto.
-	* src/cff/cf2arrst.c (cf2_arrstack_setNum_Elements): Use cast.
+	* src/cff/cf2arrst.c (cf2_arrstack_setNumElements): Use cast.
 	* src/cff/cf2ft.c (cf2_freeSeacComponent): Ditto.
 	* src/cff/cffobjs.c (remove_subset_prefix, remove_style): Ditto.
@@ -5145,7 +5145,7 @@
 ----------------------------------------------------------------------------
-Copyright 2013-2016 by
+Copyright 2013-2018 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 This file is part of the FreeType project, and may only be used, modified,
@@ -324,7 +324,7 @@
 2016-06-20  Alexei Podtelezhnikov  <apodtele@gmail.com>
-	[smooth] Sanitize memory managenent.
+	[smooth] Sanitize memory management.
 	* src/smooth/ftgrays.c (gray_convert_glyph): Cleaned up.
@@ -434,7 +434,7 @@
 	* src/truetype/ttinterp.c (Ins_SHPIX): Allow SHPIX to move points in
 	the twilight zone.  Otherwise, treat SHPIX the same as DELTAP.
 	Unbreaks various fonts such as older versions of Rokkitt and DTL
-	Argo T Light that would glitch severly after calling ALIGNRP after a
+	Argo T Light that would glitch severely after calling ALIGNRP after a
 	blocked SHPIX.
 2016-05-30  Werner Lemberg  <wl@gnu.org>
@@ -460,7 +460,7 @@
 	[smooth] Shrink bisection stack.
 	The convergence of Bézier flatteners is fast with the deviation
-	from straight line being assymptotically cut 4-fold on each bisection.
+	from straight line being asymptotically cut 4-fold on each bisection.
 	This justifies smaller bisection stack size.
 	* src/smooth/ftgrays.c (gray_TWorker): Remove common `bez_stack'.
@@ -563,26 +563,26 @@
 	* src/truetype/ttinterp.c (SUBPIXEL_HINTING): Replaced by...
 	(NO_SUBPIXEL_HINTING, SUBPIXEL_HINTING_INFINALITY,
 	SUBPIXEL_HINTING_MINIMAL): ...new macros.
-	(Direct_Move, Direct_Move_X, Direct_Move_Y): Handle backwards
+	(Direct_Move, Direct_Move_X, Direct_Move_Y): Handle backward
 	compatibility.
 	Updated.
 	(Ins_RS, Ins_FDEF, Ins_ENDF, Ins_CALL, Ins_LOOPCALL, Ins_MD):
 	Updated.
 	(Ins_INSTCTRL): Handle native ClearType mode flag.
 	Updated.
-	(Ins_FLIPPT, Ins_FLIPRGON, Ins_FLIPRGOFF): Handle backwards
+	(Ins_FLIPPT, Ins_FLIPRGON, Ins_FLIPRGOFF): Handle backward
 	compatibility.
 	(Move_Zp2_Point): Ditto.
 	(Ins_SHP): Updated.
-	(Ins_SHPIX): Handle backwards compatibility.
+	(Ins_SHPIX): Handle backward compatibility.
 	Updated.
 	(Ins_MSIRP, Ins_MDAP, Ins_MIAP, Ins_MDRP, Ins_MIRP): Updated.
 	(Ins_ALIGNRP): Updated.
-	(Ins_IUP, Ins_DELTAP): Handle backwards compatibility.
+	(Ins_IUP, Ins_DELTAP): Handle backward compatibility.
 	Updated.
 	(Ins_GETINFO): Handle v38 flags.
 	Updated.
-	(TT_RunIns): Handle backwards compatibility mode.
+	(TT_RunIns): Handle backward compatibility mode.
 	Updated.
 2016-05-17  Nikolaus Waxweiler  <madigens@gmail.com>
@@ -606,16 +606,16 @@
 	* src/truetype/ttinterp.h (TT_ExecContextRec): Define new fields
 	`subpixel_hinting_lean', `vertical_lcd_lean',
-	`backwards_compatibility', `iupx_called', iupy_called', and
+	`backward_compatibility', `iupx_called', iupy_called', and
 	`grayscale_cleartype' for new hinting mode.
 	* src/truetype/ttdriver.c (tt_property_set): Handle v38 and v40
 	interpreters conditionally.
 	* src/truetype/ttgload.c (TT_Hint_Glyph): Save phantom points unless
-	in v38 backwards compatibility mode.
+	in v38 backward compatibility mode.
 	Updated.
-	(compute_glyph_metrics): Add v38 backwards compatibility mode
+	(compute_glyph_metrics): Add v38 backward compatibility mode
 	constraint for adjusting advance widths.
 	Updated.
 	(tt_loader_init): Handle new flags `subpixel_hinting_lean',
@@ -663,7 +663,7 @@
 	The previous fix for #46372 misunderstood a composite glyph referring
 	same component twice as a recursive reference.  See the discussion
-	  http://lists.gnu.org/archive/html/freetype/2016-05/msg00000.html
+	  https://lists.gnu.org/archive/html/freetype/2016-05/msg00000.html
 	Thanks to Khaled Hosny for finding this issue.
@@ -788,7 +788,7 @@
 	proper blue zones can't be defined.  However, there is already a
 	proposal submitted to Unicode; see
-	  http://www.unicode.org/L2/L2016/16034-n4707-georgian.pdf
+	  https://www.unicode.org/L2/L2016/16034-n4707-georgian.pdf
 	Additionally, due to historical reasons, Unicode treats Khutsuri as
 	the same script as Mkhedruli, and so does OpenType.  However, since
@@ -979,7 +979,7 @@
 	* src/smooth/ftgrays.c (gray_render_conic, gray_render_cubic): Move
 	band clipping from here.
 	(gray_conic_to, gray_cubic_to): ... to here.
-	(gray_rander_line, gray_render_scanline): Initialize variables closer
+	(gray_render_line, gray_render_scanline): Initialize variables closer
 	to their use.
 2016-03-17  Alexei Podtelezhnikov  <apodtele@gmail.com>
@@ -1482,7 +1482,7 @@
 	Still handle `__FTERRORS_H__'.
-	We need this for backwards compatibility.
+	We need this for backward compatibility.
 	Problem reported by John Emmas <johne53@tiscali.co.uk>.
@@ -2478,7 +2478,7 @@
 	Problem reported by David Capello <davidcapello@gmail.com>; see
-	  http://lists.nongnu.org/archive/html/freetype-devel/2015-10/msg00108.html
+	  https://lists.nongnu.org/archive/html/freetype-devel/2015-10/msg00108.html
 	for details.
@@ -3408,7 +3408,7 @@
 	[raster,smooth] Microoptimizations.
 	* src/raster/ftraster.c (Insert_Y_Turn, Finalize_Profile_Table,
-	Bezier_Up, ): Use do-while loops.
+	Bezier_Up): Use do-while loops.
 	* src/smooth/ftgrays.c (gray_render_scanline, gray_render_line,
 	gray_convert_glyph): Ditto.
@@ -3813,7 +3813,7 @@
 	See
-	  http://lists.nongnu.org/archive/html/freetype-devel/2015-07/msg00008.html
+	  https://lists.nongnu.org/archive/html/freetype-devel/2015-07/msg00008.html
 	for a rationale.
@@ -3932,7 +3932,7 @@
 	This change is a result of a discussion thread on freetype-devel
-	  http://lists.nongnu.org/archive/html/freetype-devel/2015-06/msg00041.html
+	  https://lists.nongnu.org/archive/html/freetype-devel/2015-06/msg00041.html
 	Re-introduce the `freetype2' subdirectory for all FreeType header
 	files after installation, and rename the `freetype2' subdirectory in
@@ -4114,7 +4114,7 @@
 	Problem reported by Grissiom <chaos.proton@gmail.com>; in
-	  http://lists.nongnu.org/archive/html/freetype/2015-05/msg00013.html
+	  https://lists.nongnu.org/archive/html/freetype/2015-05/msg00013.html
 	there is an example code to trigger the bug.
@@ -4222,7 +4222,7 @@
 	[truetype] Support selector index 3 of the INSTCTRL instruction.
-	This flag activates `native ClearType hinting', disabling backwards
+	This flag activates `native ClearType hinting', disabling backward
 	compatibility mode as described in Greg Hitchcocks whitepaper.  In
 	other words, it enables unrestricted functionality of all TrueType
 	instructions in ClearType.
@@ -4292,7 +4292,7 @@
 	This follows the OpenType 1.7 specification.  See
-	  http://tug.org/pipermail/tex-live/2015-April/036634.html
+	  https://tug.org/pipermail/tex-live/2015-April/036634.html
 	for a discussion.
@@ -5447,7 +5447,7 @@
 	[raster] Remove 5-level gray AA mode from monochrome rasterizer.
 	It was off by default and couldn't be turned on at runtime.  And the
-	smooth rasterizer superceded it over ten years ago.  No point in
+	smooth rasterizer superseded it over ten years ago.  No point in
 	keeping.  Comments suggested that it was there for compatibility
 	with FreeType 1.
@@ -5695,7 +5695,7 @@
 ----------------------------------------------------------------------------
-Copyright 2015-2016 by
+Copyright 2015-2018 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 This file is part of the FreeType project, and may only be used, modified,
@@ -1,6 +1,6 @@
 # FreeType 2 top Jamfile.
 #
-# Copyright 2001-2016 by
+# Copyright 2001-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -210,7 +210,7 @@ actions RefDoc
 {
  python $(FT2_SRC)/tools/docmaker/docmaker.py
         --prefix=ft2
-         --title=FreeType-2.7.1
+         --title=FreeType-2.9.1
         --output=$(DOC_DIR)
         $(FT2_INCLUDE)/freetype/*.h
         $(FT2_INCLUDE)/freetype/config/*.h
@@ -1,6 +1,6 @@
 # FreeType 2 JamRules.
 #
-# Copyright 2001-2016 by
+# Copyright 2001-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -1,7 +1,7 @@
-  FreeType 2.7.1
+  FreeType 2.9.1
  ==============
-  Homepage: http://www.freetype.org
+  Homepage: https://www.freetype.org
  FreeType is a freely available software library to render fonts.
@@ -20,17 +20,17 @@
  documentation is available as a separate package from our sites.  Go
  to
-    http://download.savannah.gnu.org/releases/freetype/
+    https://download.savannah.gnu.org/releases/freetype/
  and download one of the following files.
-    freetype-doc-2.7.1.tar.bz2
+    freetype-doc-2.9.1.tar.bz2
-    freetype-doc-2.7.1.tar.gz
+    freetype-doc-2.9.1.tar.gz
-    ftdoc271.zip
+    ftdoc291.zip
  To view the documentation online, go to
-    http://www.freetype.org/freetype2/documentation.html
+    https://www.freetype.org/freetype2/documentation.html
  Mailing Lists
@@ -46,7 +46,7 @@
  The lists are moderated; see
-    http://www.freetype.org/contact.html
+    https://www.freetype.org/contact.html
  how to subscribe.
@@ -71,7 +71,7 @@
 ----------------------------------------------------------------------
-Copyright 2006-2016 by
+Copyright 2006-2018 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 This  file is  part of  the FreeType  project, and  may only  be used,
@@ -37,7 +37,7 @@ repository.
 ----------------------------------------------------------------------
-Copyright 2005-2016 by
+Copyright 2005-2018 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 This  file is  part of  the FreeType  project, and  may only  be used,
@@ -1,4 +1,4 @@
-This directory contains freetype2 v2.7 downloaded from
+This directory contains freetype2 v2.9.1 downloaded from
 http://savannah.nongnu.org/download/freetype/
 There are currently no local changes applied to the freetype tree,
@@ -1,6 +1,6 @@
 #!/bin/sh
-# Copyright 2005-2016 by
+# Copyright 2005-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -1,7 +1,7 @@
 README for the builds/amiga subdirectory.
-Copyright 2005-2016 by
+Copyright 2005-2018 by
 Werner Lemberg and Detlef Würkner.
 This file is part of the FreeType project, and may only be used, modified,
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific configuration file (specification only).              */
 /*                                                                         */
-/*  Copyright 2005-2016 by                                                 */
+/*  Copyright 2005-2018 by                                                 */
 /*  Werner Lemberg and Detlef Würkner.                                     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific FreeType module selection.                            */
 /*                                                                         */
-/*  Copyright 2005-2016 by                                                 */
+/*  Copyright 2005-2018 by                                                 */
 /*  Werner Lemberg and Detlef Würkner.                                     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -5,7 +5,7 @@
 #
-# Copyright 2005-2016 by
+# Copyright 2005-2018 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -96,9 +96,6 @@ ftbitmap.ppc.o: $(FTSRC)/base/ftbitmap.c
 ftcid.ppc.o: $(FTSRC)/base/ftcid.c
 	$(CC) -c $(CFLAGS) -o $@ $<
 ftfntfmt.ppc.o: $(FTSRC)/base/ftfntfmt.c
 	$(CC) -c $(CFLAGS) -o $@ $<
 ftfstype.ppc.o: $(FTSRC)/base/ftfstype.c
 	$(CC) -c $(CFLAGS) -o $@ $<
@@ -111,9 +108,6 @@ ftglyph.ppc.o: $(FTSRC)/base/ftglyph.c
 ftgxval.ppc.o: $(FTSRC)/base/ftgxval.c
 	$(CC) -c $(CFLAGS) -o $@ $<
 ftlcdfil.ppc.o: $(FTSRC)/base/ftlcdfil.c
 	$(CC) -c $(CFLAGS) -o $@ $<
 ftmm.ppc.o: $(FTSRC)/base/ftmm.c
 	$(CC) -c $(CFLAGS) -o $@ $<
@@ -270,8 +264,8 @@ otvalid.ppc.o: $(FTSRC)/otvalid/otvalid.c
 	$(CC) -c $(CFLAGS) -o $@ $<
 BASEPPC = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o ftcid.ppc.o \
-	  ftfntfmt.ppc.oftfstype.ppc.o ftgasp.ppc.o ftglyph.ppc.o          \
+	  oftfstype.ppc.o ftgasp.ppc.o ftglyph.ppc.o                       \
-	  ftgxval.ppc.o ftlcdfil.ppc.o ftmm.ppc.o ftotval.ppc.o            \
+	  ftgxval.ppc.o ftmm.ppc.o ftotval.ppc.o                           \
 	  ftpatent.ppc.o ftpfr.ppc.o ftstroke.ppc.o ftsynth.ppc.o          \
 	  fttype1.ppc.o ftwinfnt.ppc.o
@@ -4,7 +4,7 @@
 #
-# Copyright 2005-2016 by
+# Copyright 2005-2018 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -99,9 +99,6 @@ ftdebug.ppc.o: FT:src/base/ftdebug.c
 ftdebugpure.ppc.o: src/base/ftdebug.c
 	$(CC) -c $(CFLAGS) -o $@ src/base/ftdebug.c
 ftfntfmt.ppc.o: FT:src/base/ftfntfmt.c
 	$(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftfntfmt.c
 ftfstype.ppc.o: FT:src/base/ftfstype.c
 	$(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftfstype.c
@@ -114,9 +111,6 @@ ftglyph.ppc.o: FT:src/base/ftglyph.c
 ftgxval.ppc.o: FT:src/base/ftgxval.c
 	$(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftgxval.c
 ftlcdfil.ppc.o: FT:src/base/ftlcdfil.c
 	$(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftlcdfil.c
 ftmm.ppc.o: FT:src/base/ftmm.c
 	$(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftmm.c
@@ -274,8 +268,8 @@ otvalid.ppc.o: FT:src/otvalid/otvalid.c
 	$(CC) -c $(CFLAGS) -o $@ /FT/src/otvalid/otvalid.c
 BASE = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o ftcid.ppc.o \
-       ftfntfmt.ppc.o ftfstype.ppc.o ftgasp.ppc.o ftglyph.ppc.o         \
+       ftfstype.ppc.o ftgasp.ppc.o ftglyph.ppc.o                        \
-       ftgxval.ppc.o ftlcdfil.ppc.o ftmm.ppc.o ftotval.ppc.o            \
+       ftgxval.ppc.o ftmm.ppc.o ftotval.ppc.o                           \
       ftpatent.ppc.o ftpfr.ppc.o ftstroke.ppc.o ftsynth.ppc.o          \
       fttype1.ppc.o ftwinfnt.ppc.o
@@ -3,7 +3,7 @@
 #
-# Copyright 2005-2016 by
+# Copyright 2005-2018 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -42,8 +42,8 @@
 # (and either ftdebug.o or ftdebugpure.o if you enabled FT_DEBUG_LEVEL_ERROR or
 # FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h).
-OBJBASE = ftbase.o ftbbox.o ftbdf.o ftbitmap.o ftcid.o ftfntfmt.o ftfstype.o \
+OBJBASE = ftbase.o ftbbox.o ftbdf.o ftbitmap.o ftcid.o ftfstype.o      \
-	  ftgasp.o ftglyph.o ftgxval.o ftlcdfil.o ftmm.o ftotval.o           \
+	  ftgasp.o ftglyph.o ftgxval.o ftmm.o ftotval.o                \
 	  ftpatent.o ftpfr.o ftstroke.o ftsynth.o fttype1.o ftwinfnt.o
 OBJSYSTEM = ftsystem.o ftsystempure.o
@@ -133,8 +133,6 @@ ftbitmap.o: $(CORE)base/ftbitmap.c
 	sc $(SCFLAGS) objname=$@ $<
 ftcid.o: $(CORE)base/ftcid.c
 	sc $(SCFLAGS) objname=$@ $<
 ftfntfmt.o: $(CORE)base/ftfntfmt.c
 	sc $(SCFLAGS) objname=$@ $<
 ftfstype.o: $(CORE)base/ftfstype.c
 	sc $(SCFLAGS) objname=$@ $<
 ftgasp.o: $(CORE)base/ftgasp.c
@@ -143,8 +141,6 @@ ftglyph.o: $(CORE)base/ftglyph.c
 	sc $(SCFLAGS) objname=$@ $<
 ftgxval.o: $(CORE)base/ftgxval.c
 	sc $(SCFLAGS) objname=$@ $<
 ftlcdfil.o: $(CORE)base/ftlcdfil.c
 	sc $(SCFLAGS) objname=$@ $<
 ftmm.o: $(CORE)base/ftmm.c
 	sc $(SCFLAGS) objname=$@ $<
 ftotval.o: $(CORE)base/ftotval.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Debugging and logging component for amiga (body).                    */
 /*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
+/*  Copyright 1996-2018 by                                                 */
 /*  David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner.       */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific FreeType low-level system interface (body).           */
 /*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
+/*  Copyright 1996-2018 by                                                 */
 /*  David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner.       */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -5,7 +5,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -2,7 +2,7 @@
 # FreeType 2 configuration rules for a BeOS system
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -31,42 +31,51 @@
 # HARFBUZZ_LIBRARIES - containg the HarfBuzz library
 include(FindPkgConfig)
 pkg_check_modules(PC_HARFBUZZ QUIET harfbuzz)
-pkg_check_modules(PC_HARFBUZZ harfbuzz>=0.9.7)
+find_path(HARFBUZZ_INCLUDE_DIRS
-
+    NAMES hb.h
-find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h
+    HINTS ${PC_HARFBUZZ_INCLUDEDIR}
-    HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
+          ${PC_HARFBUZZ_INCLUDE_DIRS}
    PATH_SUFFIXES harfbuzz
 )
 find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz
-    HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
+    HINTS ${PC_HARFBUZZ_LIBDIR}
          ${PC_HARFBUZZ_LIBRARY_DIRS}
 )
-# HarfBuzz 0.9.18 split ICU support into a separate harfbuzz-icu library.
+if (HARFBUZZ_INCLUDE_DIRS)
-if ("${PC_HARFBUZZ_VERSION}" VERSION_GREATER "0.9.17")
+    if (EXISTS "${HARFBUZZ_INCLUDE_DIRS}/hb-version.h")
-    if (HarfBuzz_FIND_REQUIRED)
+        file(READ "${HARFBUZZ_INCLUDE_DIRS}/hb-version.h" _harfbuzz_version_content)
-        set(_HARFBUZZ_REQUIRED REQUIRED)
+
-    else ()
+        string(REGEX MATCH "#define +HB_VERSION_STRING +\"([0-9]+\\.[0-9]+\\.[0-9]+)\"" _dummy "${_harfbuzz_version_content}")
-        set(_HARFBUZZ_REQUIRED "")
+        set(HARFBUZZ_VERSION "${CMAKE_MATCH_1}")
    endif ()
-    pkg_check_modules(PC_HARFBUZZ_ICU harfbuzz-icu>=0.9.18 ${_HARFBUZZ_REQUIRED})
+endif ()
-    find_library(HARFBUZZ_ICU_LIBRARIES NAMES harfbuzz-icu
+
-        HINTS ${PC_HARFBUZZ_ICU_LIBRARY_DIRS} ${PC_HARFBUZZ_ICU_LIBDIR}
+if ("${harfbuzz_FIND_VERSION}" VERSION_GREATER "${HARFBUZZ_VERSION}")
-    )
+    message(FATAL_ERROR "Required version (" ${harfbuzz_FIND_VERSION} ") is higher than found version (" ${HARFBUZZ_VERSION} ")")
    if (HARFBUZZ_ICU_LIBRARIES)
        list(APPEND HARFBUZZ_LIBRARIES "${HARFBUZZ_ICU_LIBRARIES}")
    endif ()
    set(_HARFBUZZ_EXTRA_REQUIRED_VAR "HARFBUZZ_ICU_LIBRARIES")
 else ()
    set(_HARFBUZZ_EXTRA_REQUIRED_VAR "")
 endif ()
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(HarfBuzz DEFAULT_MSG HARFBUZZ_INCLUDE_DIRS
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
-    HARFBUZZ_LIBRARIES ${_HARFBUZZ_EXTRA_REQUIRED_VAR})
+    harfbuzz 
        REQUIRED_VARS HARFBUZZ_INCLUDE_DIRS HARFBUZZ_LIBRARIES
        VERSION_VAR HARFBUZZ_VERSION)
 mark_as_advanced(
    HARFBUZZ_ICU_LIBRARIES
    HARFBUZZ_INCLUDE_DIRS
    HARFBUZZ_LIBRARIES
 )
 # Allows easy linking as in 
 #   target_link_libraries(freetype PRIVATE Harfbuzz::Harfbuzz)
 if (NOT CMAKE_VERSION VERSION_LESS 3.1)
    if (HARFBUZZ_FOUND AND NOT TARGET Harfbuzz::Harfbuzz)
        add_library(Harfbuzz::Harfbuzz INTERFACE IMPORTED)
        set_target_properties(
            Harfbuzz::Harfbuzz PROPERTIES
                INTERFACE_INCLUDE_DIRECTORIES "${HARFBUZZ_INCLUDE_DIRS}")
    endif ()
 endif ()
@@ -1,6 +1,6 @@
 # iOS.cmake
 #
-# Copyright 2014-2016 by
+# Copyright 2014-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # Written by David Wimsey <david@wimsey.us>
@@ -1,6 +1,6 @@
 #!/bin/sh -e
-# Copyright 2015-2016 by
+# Copyright 2015-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 2003-2016 by
+# Copyright 2003-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -101,54 +101,28 @@ ifndef CONFIG_FILE
  .PHONY: setup
 endif
-# The following targets are equivalent, with the exception that they use
+# Flash out and copy rules.
 # a slightly different syntax for the `echo' command.
 #
-# std_setup: defined for most (i.e. Unix-like) platforms
+.PHONY: std_setup
 # dos_setup: defined for Dos-ish platforms like Dos, Windows & OS/2
 #
 .PHONY: std_setup dos_setup
 std_setup:
-	@echo ""
+	$(info )
-	@echo "$(PROJECT_TITLE) build system -- automatic system detection"
+	$(info $(PROJECT_TITLE) build system -- automatic system detection)
-	@echo ""
+	$(info )
-	@echo "The following settings are used:"
+	$(info The following settings are used:)
-	@echo ""
+	$(info )
-	@echo "  platform                    $(PLATFORM)"
+	$(info $(empty)  platform                    $(PLATFORM))
-	@echo "  compiler                    $(CC)"
+	$(info $(empty)  compiler                    $(CC))
-	@echo "  configuration directory     $(BUILD_DIR)"
+	$(info $(empty)  configuration directory     $(subst /,$(SEP),$(BUILD_DIR)))
-	@echo "  configuration rules         $(CONFIG_RULES)"
+	$(info $(empty)  configuration rules         $(subst /,$(SEP),$(CONFIG_RULES)))
-	@echo ""
+	$(info )
-	@echo "If this does not correspond to your system or settings please remove the file"
+	$(info If this does not correspond to your system or settings please remove the file)
-	@echo "\`$(CONFIG_MK)' from this directory then read the INSTALL file for help."
+	$(info `$(CONFIG_MK)' from this directory then read the INSTALL file for help.)
-	@echo ""
+	$(info )
-	@echo "Otherwise, simply type \`$(MAKE)' again to build the library,"
+	$(info Otherwise, simply type `$(MAKE)' again to build the library,)
-	@echo "or \`$(MAKE) refdoc' to build the API reference (this needs python >= 2.6)."
+	$(info or `$(MAKE) refdoc' to build the API reference (this needs python >= 2.6).)
-	@echo ""
+	$(info )
-	@$(COPY) $(CONFIG_RULES) $(CONFIG_MK)
+	@$(COPY) $(subst /,$(SEP),$(CONFIG_RULES) $(CONFIG_MK))
 # Special case for Dos, Windows, OS/2, where echo "" doesn't work correctly!
 #
 dos_setup:
 	@type builds$(SEP)newline
 	@echo $(PROJECT_TITLE) build system -- automatic system detection
 	@type builds$(SEP)newline
 	@echo The following settings are used:
 	@type builds$(SEP)newline
 	@echo   platformÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ$(PLATFORM)
 	@echo   compilerÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ$(CC)
 	@echo   configuration directoryÿÿÿÿÿÿ$(subst /,$(SEP),$(BUILD_DIR))
 	@echo   configuration rulesÿÿÿÿÿÿÿÿÿÿ$(subst /,$(SEP),$(CONFIG_RULES))
 	@type builds$(SEP)newline
 	@echo If this does not correspond to your system or settings please remove the file
 	@echo '$(CONFIG_MK)' from this directory then read the INSTALL file for help.
 	@type builds$(SEP)newline
 	@echo Otherwise, simply type 'make' again to build the library.
 	@echo or 'make refdoc' to build the API reference (this needs python >= 2.6).
 	@type builds$(SEP)newline
 	@$(COPY) $(subst /,$(SEP),$(CONFIG_RULES) $(CONFIG_MK)) > nul
 # EOF
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -133,7 +133,7 @@ ifeq ($(PLATFORM),dos)
      COPY := copy
    endif  # test NT
-    setup: dos_setup
+    setup: std_setup
  endif
 endif     # test PLATFORM dos
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 2003-2016 by
+# Copyright 2003-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 2003-2016 by
+# Copyright 2003-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 2005-2016 by
+# Copyright 2005-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -153,6 +153,9 @@ endif
 ifneq ($(wildcard $(OBJ_DIR)/ftoption.h),)
  FTOPTION_H    := $(OBJ_DIR)/ftoption.h
  FTOPTION_FLAG := $DFT_CONFIG_OPTIONS_H="<ftoption.h>"
 else ifneq ($(wildcard $(BUILD_DIR)/ftoption.h),)
  FTOPTION_H    := $(BUILD_DIR)/ftoption.h
  FTOPTION_FLAG := $DFT_CONFIG_OPTIONS_H="<ftoption.h>"
 endif
 # `CPPFLAGS' might be specified by the user in the environment.
@@ -245,6 +248,22 @@ $(FTINIT_OBJ): $(FTINIT_SRC) $(FREETYPE_H)
 	$(FT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
 # ftver component
 #
 #  The VERSIONINFO resource `ftver.rc' contains version and copyright
 #  to be compiled by windres and tagged into DLL usually.
 #
 ifneq ($(RC),)
  FTVER_SRC := $(BASE_DIR)/ftver.rc
  FTVER_OBJ := $(OBJ_DIR)/ftver.$O
  OBJECTS_LIST += $(FTVER_OBJ)
  $(FTVER_OBJ): $(FTVER_SRC)
 	$(RC) -o $@ $<
 endif
 # All FreeType library objects.
 #
 OBJ_M := $(BASE_OBJ_M) $(BASE_EXT_OBJ) $(DRV_OBJS_M)
@@ -326,10 +345,9 @@ remove_ftmodule_h:
 .PHONY: clean distclean
-# The `config.mk' file must define `clean_freetype' and
+# The `config.mk' file must define `clean_project' and `distclean_project'.
-# `distclean_freetype'.  Implementations may use to relay these to either
+# Implementations may use to relay these to either the `std' or `dos'
-# the `std' or `dos' versions from above, or simply provide their own
+# versions from above, or simply provide their own implementation.
 # implementation.
 #
 clean: clean_project
 distclean: distclean_project remove_config_mk remove_ftmodule_h
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -38,7 +38,6 @@ SrcFiles        =  \xB6
 				  :src:base:ftbdf.c \xB6
 				  :src:base:ftbitmap.c \xB6
 				  :src:base:ftdebug.c \xB6
 				  :src:base:ftfntfmt.c \xB6
 				  :src:base:ftfstype.c \xB6
 				  :src:base:ftglyph.c \xB6
 				  :src:base:ftgxval.c \xB6
@@ -83,7 +82,6 @@ ObjFiles-68K    =  \xB6
 				  "{ObjDir}ftbdf.c.o" \xB6
 				  "{ObjDir}ftbitmap.c.o" \xB6
 				  "{ObjDir}ftdebug.c.o" \xB6
 				  "{ObjDir}ftfntfmt.c.o" \xB6
 				  "{ObjDir}ftfstype.c.o" \xB6
 				  "{ObjDir}ftglyph.c.o" \xB6
 				  "{ObjDir}ftgxval.c.o" \xB6
@@ -161,7 +159,6 @@ FreeType.m68k_cfm.o  \xC4\xC4  {ObjFiles-68K} {LibFiles-68K} {\xA5MondoBuild\xA5
 "{ObjDir}ftbdf.c.o" \xC4 :src:base:ftbdf.c
 "{ObjDir}ftbitmap.c.o" \xC4 :src:base:ftbitmap.c
 "{ObjDir}ftdebug.c.o" \xC4 :src:base:ftdebug.c
 "{ObjDir}ftfntfmt.c.o" \xC4 :src:base:ftfntfmt.c
 "{ObjDir}ftfstype.c.o" \xC4 :src:base:ftfstype.c
 "{ObjDir}ftglyph.c.o" \xC4 :src:base:ftglyph.c
 "{ObjDir}ftgxval.c.o" \xC4 :src:base:ftgxval.c
@@ -37,7 +37,6 @@ SrcFiles        =  \xB6
 				  :src:base:ftbdf.c \xB6
 				  :src:base:ftbitmap.c \xB6
 				  :src:base:ftdebug.c \xB6
 				  :src:base:ftfntfmt.c \xB6
 				  :src:base:ftfstype.c \xB6
 				  :src:base:ftglyph.c \xB6
 				  :src:base:ftgxval.c \xB6
@@ -82,7 +81,6 @@ ObjFiles-68K    =  \xB6
 				  "{ObjDir}ftbdf.c.o" \xB6
 				  "{ObjDir}ftbitmap.c.o" \xB6
 				  "{ObjDir}ftdebug.c.o" \xB6
 				  "{ObjDir}ftfntfmt.c.o" \xB6
 				  "{ObjDir}ftfstype.c.o" \xB6
 				  "{ObjDir}ftglyph.c.o" \xB6
 				  "{ObjDir}ftgxval.c.o" \xB6
@@ -160,7 +158,6 @@ FreeType.m68k_far.o  \xC4\xC4  {ObjFiles-68K} {LibFiles-68K} {\xA5MondoBuild\xA5
 "{ObjDir}ftbdf.c.o" \xC4 :src:base:ftbdf.c
 "{ObjDir}ftbitmap.c.o" \xC4 :src:base:ftbitmap.c
 "{ObjDir}ftdebug.c.o" \xC4 :src:base:ftdebug.c
 "{ObjDir}ftfntfmt.c.o" \xC4 :src:base:ftfntfmt.c
 "{ObjDir}ftfstype.c.o" \xC4 :src:base:ftfstype.c
 "{ObjDir}ftglyph.c.o" \xC4 :src:base:ftglyph.c
 "{ObjDir}ftgxval.c.o" \xC4 :src:base:ftgxval.c
@@ -38,7 +38,6 @@ SrcFiles        =  \xB6
 				  :src:base:ftbdf.c \xB6
 				  :src:base:ftbitmap.c \xB6
 				  :src:base:ftdebug.c \xB6
 				  :src:base:ftfntfmt.c \xB6
 				  :src:base:ftfstype.c \xB6
 				  :src:base:ftglyph.c \xB6
 				  :src:base:ftgxval.c \xB6
@@ -83,7 +82,6 @@ ObjFiles-PPC    =  \xB6
 				  "{ObjDir}ftbdf.c.x" \xB6
 				  "{ObjDir}ftbitmap.c.x" \xB6
 				  "{ObjDir}ftdebug.c.x" \xB6
 				  "{ObjDir}ftfntfmt.c.x" \xB6
 				  "{ObjDir}ftfstype.c.x" \xB6
 				  "{ObjDir}ftglyph.c.x" \xB6
 				  "{ObjDir}ftgxval.c.x" \xB6
@@ -164,7 +162,6 @@ FreeType.ppc_carbon.o  \xC4\xC4  {ObjFiles-PPC} {LibFiles-PPC} {\xA5MondoBuild\x
 "{ObjDir}ftbdf.c.x" \xC4 :src:base:ftbdf.c
 "{ObjDir}ftbitmap.c.x" \xC4 :src:base:ftbitmap.c
 "{ObjDir}ftdebug.c.x" \xC4 :src:base:ftdebug.c
 "{ObjDir}ftfntfmt.c.x" \xC4 :src:base:ftfntfmt.c
 "{ObjDir}ftfstype.c.x" \xC4 :src:base:ftfstype.c
 "{ObjDir}ftglyph.c.x" \xC4 :src:base:ftglyph.c
 "{ObjDir}ftgxval.c.x" \xC4 :src:base:ftgxval.c
@@ -38,7 +38,6 @@ SrcFiles        =  \xB6
 				  :src:base:ftbdf.c \xB6
 				  :src:base:ftbitmap.c \xB6
 				  :src:base:ftdebug.c \xB6
 				  :src:base:ftfntfmt.c \xB6
 				  :src:base:ftfstype.c \xB6
 				  :src:base:ftglyph.c \xB6
 				  :src:base:ftgxval.c \xB6
@@ -83,7 +82,6 @@ ObjFiles-PPC    =  \xB6
 				  "{ObjDir}ftbdf.c.x" \xB6
 				  "{ObjDir}ftbitmap.c.x" \xB6
 				  "{ObjDir}ftdebug.c.x" \xB6
 				  "{ObjDir}ftfntfmt.c.x" \xB6
 				  "{ObjDir}ftfstype.c.x" \xB6
 				  "{ObjDir}ftglyph.c.x" \xB6
 				  "{ObjDir}ftgxval.c.x" \xB6
@@ -164,7 +162,6 @@ FreeType.ppc_classic.o  \xC4\xC4  {ObjFiles-PPC} {LibFiles-PPC} {\xA5MondoBuild\
 "{ObjDir}ftbdf.c.x" \xC4 :src:base:ftbdf.c
 "{ObjDir}ftbitmap.c.x" \xC4 :src:base:ftbitmap.c
 "{ObjDir}ftdebug.c.x" \xC4 :src:base:ftdebug.c
 "{ObjDir}ftfntfmt.c.x" \xC4 :src:base:ftfntfmt.c
 "{ObjDir}ftfstype.c.x" \xC4 :src:base:ftfstype.c
 "{ObjDir}ftglyph.c.x" \xC4 :src:base:ftglyph.c
 "{ObjDir}ftgxval.c.x" \xC4 :src:base:ftgxval.c
@@ -5,7 +5,7 @@
 /*    Mac FOND support.  Written by just@letterror.com.                    */
 /*  Heavily Fixed by mpsuzuki, George Williams and Sean McBride            */
 /*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
+/*  Copyright 1996-2018 by                                                 */
 /*  Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -1423,7 +1423,7 @@ typedef short ResourceIndex;
  /*    accepts an FSRef instead of a path.                                */
  /*                                                                       */
  /* This function is deprecated because Carbon data types (FSRef)         */
-  /* are not cross-platform, and thus not suitable for the freetype API.   */
+  /* are not cross-platform, and thus not suitable for the FreeType API.   */
  FT_EXPORT_DEF( FT_Error )
  FT_New_Face_From_FSRef( FT_Library    library,
                          const FSRef*  ref,
@@ -1481,7 +1481,7 @@ typedef short ResourceIndex;
  /*    accepts an FSSpec instead of a path.                               */
  /*                                                                       */
  /* This function is deprecated because Carbon data types (FSSpec)        */
-  /* are not cross-platform, and thus not suitable for the freetype API.   */
+  /* are not cross-platform, and thus not suitable for the FreeType API.   */
  FT_EXPORT_DEF( FT_Error )
  FT_New_Face_From_FSSpec( FT_Library     library,
                           const FSSpec*  spec,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -41,7 +41,7 @@ endif
 define FTMODULE_H_INIT
 $(REMOVE_MODULE)
-@-echo Generating modules list in $(FTMODULE_H)...
+$(info Generating modules list in $(FTMODULE_H)...)
 $(OPEN_MODULE)/* This is a generated file. */$(CLOSE_MODULE)
 endef
@@ -56,7 +56,7 @@ endef
 define FTMODULE_H_DONE
 $(OPEN_MODULE)/* EOF */$(CLOSE_MODULE)
-@echo done.
+$(info done.)
 endef
@@ -1 +0,0 @@
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -65,7 +65,7 @@ ifeq ($(PLATFORM),os2)
    .PHONY: devel
  endif
-  setup: dos_setup
+  setup: std_setup
 endif   # test PLATFORM os2
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -5,7 +5,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -2,7 +2,7 @@
 // FreeType 2 project for the symbian platform
 //
-// Copyright 2008-2016 by
+// Copyright 2008-2018 by
 // David Turner, Robert Wilhelm, and Werner Lemberg.
 //
 // This file is part of the FreeType project, and may only be used, modified,
@@ -25,10 +25,14 @@ PRJ_EXPORTS
 ../../include/freetype/config/ftoption.h	config/ftoption.h
 ../../include/freetype/config/ftstdlib.h	config/ftstdlib.h
 ../../include/freetype/freetype.h		freetype.h
 ../../include/freetype/ftadvanc.h		ftadvanc.h
 ../../include/freetype/ftautoh.h		ftautoh.h
 ../../include/freetype/ftbbox.h			ftbbox.h
 ../../include/freetype/ftbdf.h			ftbdf.h
 ../../include/freetype/ftbitmap.h		ftbitmap.h
 ../../include/freetype/ftbzip2.h		ftbzip2.h
 ../../include/freetype/ftcache.h		ftcache.h
 ../../include/freetype/ftcffdrv.h		ftcffdrv.h
 ../../include/freetype/ftcid.h			ftcid.h
 ../../include/freetype/fterrdef.h		fterrdef.h
 ../../include/freetype/fterrors.h		fterrors.h
@@ -37,7 +41,6 @@ PRJ_EXPORTS
 ../../include/freetype/ftglyph.h		ftglyph.h
 ../../include/freetype/ftgxval.h		ftgxval.h
 ../../include/freetype/ftgzip.h			ftgzip.h
 ../../include/freetype/ftbzip2.h		ftbzip2.h
 ../../include/freetype/ftimage.h		ftimage.h
 ../../include/freetype/ftincrem.h		ftincrem.h
 ../../include/freetype/ftlcdfil.h		ftlcdfil.h
@@ -49,6 +52,8 @@ PRJ_EXPORTS
 ../../include/freetype/ftmoderr.h		ftmoderr.h
 ../../include/freetype/ftotval.h		ftotval.h
 ../../include/freetype/ftoutln.h		ftoutln.h
 ../../include/freetype/ftparams.h		ftparams.h
 ../../include/freetype/ftpcfdrv.h		ftpcfdrv.h
 ../../include/freetype/ftpfr.h			ftpfr.h
 ../../include/freetype/ftrender.h		ftrender.h
 ../../include/freetype/ftsizes.h		ftsizes.h
@@ -56,11 +61,12 @@ PRJ_EXPORTS
 ../../include/freetype/ftstroke.h		ftstroke.h
 ../../include/freetype/ftsynth.h		ftsynth.h
 ../../include/freetype/ftsystem.h		ftsystem.h
 ../../include/freetype/ftt1drv.h		ftt1drv.h
 ../../include/freetype/fttrigon.h		fttrigon.h
 ../../include/freetype/ftttdrv.h		ftttdrv.h
 ../../include/freetype/fttypes.h		fttypes.h
 ../../include/freetype/ftwinfnt.h		ftwinfnt.h
 ../../include/freetype/t1tables.h		t1tables.h
 ../../include/freetype/ttnameid.h		ttnameid.h
 ../../include/freetype/tttables.h		tttables.h
 ../../include/freetype/tttags.h			tttags.h
 ../../include/freetype/ttunpat.h		ttunpat.h
@@ -2,7 +2,7 @@
 // FreeType 2 makefile for the symbian platform
 //
-// Copyright 2008-2016 by
+// Copyright 2008-2018 by
 // David Turner, Robert Wilhelm, and Werner Lemberg.
 //
 // This file is part of the FreeType project, and may only be used, modified,
@@ -28,13 +28,11 @@ source ftbbox.c
 source ftbdf.c
 source ftbitmap.c
 source ftcid.c
 source ftfntfmt.c
 source ftfstype.c
 source ftgasp.c
 source ftglyph.c
 source ftgxval.c
 source ftinit.c
 source ftlcdfil.c
 source ftmm.c
 source ftotval.c
 source ftpatent.c
@@ -49,6 +47,10 @@ sourcepath ..\..\src\bdf
 source bdf.c
 sourcepath ..\..\src\bzip2
 source ftbzip2.c
 sourcepath ..\..\src\cache
 source ftcache.c
@@ -65,10 +67,6 @@ sourcepath ..\..\src\gzip
 source ftgzip.c
 sourcepath ..\..\src\bzip2
 source ftbzip2.c
 sourcepath ..\..\src\lzw
 source ftlzw.c
@@ -126,12 +124,12 @@ systeminclude		..\..\include
 systeminclude		\epoc32\include\stdapis
 userinclude		..\..\src\autofit
 userinclude		..\..\src\bdf
 userinclude		..\..\src\bzip2
 userinclude		..\..\src\cache
 userinclude		..\..\src\cff
 userinclude		..\..\src\cid
 userinclude		..\..\src\gxvalid
 userinclude		..\..\src\gzip
 userinclude		..\..\src\bzip2
 userinclude		..\..\src\lzw
 userinclude		..\..\src\otvalid
 userinclude		..\..\src\pcf
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -172,7 +172,8 @@ include $(TOP_DIR)/builds/modules.mk
 # get FreeType version string, using a
 # poor man's `sed' emulation with make's built-in string functions
 #
-work := $(strip $(shell $(CAT) $(TOP_DIR)/include/freetype/freetype.h))
+work := $(strip $(shell $(CAT) \
                  $(subst /,$(SEP),$(TOP_DIR)/include/freetype/freetype.h)))
 work := $(subst |,x,$(work))
 work := $(subst $(space),|,$(work))
 work := $(subst \#define|FREETYPE_MAJOR|,$(space),$(work))
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
+#   Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2016-11-19'
+timestamp='2018-04-24'
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2016-11-19'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -33,7 +33,7 @@ timestamp='2016-11-19'
 # Otherwise, we print the canonical config type on stdout and succeed.
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 Canonicalize a configuration name.
-Operation modes:
+Options:
  -h, --help         print this help, then exit
  -t, --time-stamp   print date of last modification, then exit
  -v, --version      print version number, then exit
@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -94,7 +94,7 @@ while test $# -gt 0 ; do
    *local*)
       # First pass through any local machine types.
-       echo $1
+       echo "$1"
       exit ;;
    * )
@@ -112,7 +112,7 @@ esac
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
@@ -120,16 +120,16 @@ case $maybe_os in
  kopensolaris*-gnu* | cloudabi*-eabi* | \
  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
  android-linux)
    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
    ;;
  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
+    if [ "$basic_machine" != "$1" ]
-    then os=`echo $1 | sed 's/.*-/-/'`
+    then os=`echo "$1" | sed 's/.*-/-/'`
    else os=; fi
    ;;
 esac
@@ -178,44 +178,44 @@ case $os in
 		;;
 	-sco6)
 		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco5)
 		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco4)
 		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2.[4-9]*)
 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2v[4-9]*)
 		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco5v6*)
 		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco*)
 		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-isc)
 		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-clix*)
 		basic_machine=clipper-intergraph
 		;;
 	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-lynx*178)
 		os=-lynxos178
@@ -227,10 +227,7 @@ case $os in
 		os=-lynxos
 		;;
 	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
 		;;
 	-windowsnt*)
 		os=`echo $os | sed -e 's/windowsnt/winnt/'`
 		;;
 	-psos*)
 		os=-psos
@@ -252,18 +249,18 @@ case $basic_machine in
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv6m | armv[78][arm] \
 	| avr | avr32 \
 	| ba \
 	| be32 | be64 \
 	| bfin \
-	| c4x | c8051 | clipper \
+	| c4x | c8051 | clipper | csky \
 	| d10v | d30v | dlx | dsp16xx \
 	| e2k | epiphany \
 	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
-	| i370 | i860 | i960 | ia64 \
+	| i370 | i860 | i960 | ia16 | ia64 \
 	| ip2k | iq2000 \
 	| k1om \
 	| le32 | le64 \
@@ -299,7 +296,7 @@ case $basic_machine in
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
 	| open8 | or1k | or1knd | or32 \
-	| pdp10 | pdp11 | pj | pjl \
+	| pdp10 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pru \
 	| pyramid \
@@ -315,7 +312,7 @@ case $basic_machine in
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| visium \
-	| we32k \
+	| wasm32 \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
@@ -336,7 +333,11 @@ case $basic_machine in
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
 		;;
 	m9s12z | m68hcs12z | hcs12z | s12z)
 		basic_machine=s12z-unknown
 		os=-none
 		;;
 	ms1)
 		basic_machine=mt-unknown
@@ -365,7 +366,7 @@ case $basic_machine in
 	  ;;
 	# Object if more than one company name word.
 	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
@@ -381,14 +382,14 @@ case $basic_machine in
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | csky-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| e2k-* | elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
+	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
 	| ip2k-* | iq2000-* \
 	| k1om-* \
 	| le32-* | le64-* \
@@ -446,6 +447,7 @@ case $basic_machine in
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
 	| visium-* \
 	| wasm32-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -459,7 +461,7 @@ case $basic_machine in
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
-		basic_machine=i386-unknown
+		basic_machine=i386-pc
 		os=-bsd
 		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
@@ -493,7 +495,7 @@ case $basic_machine in
 		basic_machine=x86_64-pc
 		;;
 	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	amdahl)
 		basic_machine=580-amdahl
@@ -538,7 +540,7 @@ case $basic_machine in
 		os=-linux
 		;;
 	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	bluegene*)
@@ -546,13 +548,13 @@ case $basic_machine in
 		os=-cnk
 		;;
 	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	c90)
 		basic_machine=c90-cray
@@ -641,7 +643,7 @@ case $basic_machine in
 		basic_machine=rs6000-bull
 		os=-bosx
 		;;
-	dpx2* | dpx2*-bull)
+	dpx2*)
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
@@ -650,7 +652,7 @@ case $basic_machine in
 		os=$os"spe"
 		;;
 	e500v[12]-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=$os"spe"
 		;;
 	ebmon29k)
@@ -742,9 +744,6 @@ case $basic_machine in
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
 	hppa-next)
 		os=-nextstep3
 		;;
 	hppaosf)
 		basic_machine=hppa1.1-hp
 		os=-osf
@@ -757,26 +756,26 @@ case $basic_machine in
 		basic_machine=i370-ibm
 		;;
 	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
 	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
 	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
 	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
 	i386mach)
 		basic_machine=i386-mach
 		os=-mach
 		;;
-	i386-vsta | vsta)
+	vsta)
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
@@ -795,19 +794,16 @@ case $basic_machine in
 		os=-sysv
 		;;
 	leon-*|leon[3-9]-*)
-		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
 		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
 		;;
 	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
 	magnum | m3230)
 		basic_machine=mips-mips
 		os=-sysv
@@ -839,10 +835,10 @@ case $basic_machine in
 		os=-mint
 		;;
 	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
 		;;
 	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
 		;;
 	monitor)
 		basic_machine=m68k-rom68k
@@ -861,7 +857,7 @@ case $basic_machine in
 		os=-msdos
 		;;
 	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
 		basic_machine=i686-pc
@@ -903,7 +899,7 @@ case $basic_machine in
 		basic_machine=v70-nec
 		os=-sysv
 		;;
-	next | m*-next )
+	next | m*-next)
 		basic_machine=m68k-next
 		case $os in
 		    -nextstep* )
@@ -948,6 +944,12 @@ case $basic_machine in
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
 	nsv-tandem)
 		basic_machine=nsv-tandem
 		;;
 	nsx-tandem)
 		basic_machine=nsx-tandem
 		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
@@ -980,7 +982,7 @@ case $basic_machine in
 		os=-linux
 		;;
 	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	pbd)
@@ -996,7 +998,7 @@ case $basic_machine in
 		basic_machine=i386-pc
 		;;
 	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
@@ -1011,16 +1013,16 @@ case $basic_machine in
 		basic_machine=i786-pc
 		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
@@ -1030,23 +1032,23 @@ case $basic_machine in
 	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
 	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle)
 		basic_machine=powerpcle-unknown
 		;;
 	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
 		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little)
 		basic_machine=powerpc64le-unknown
 		;;
 	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	ps2)
 		basic_machine=i386-ibm
@@ -1100,17 +1102,10 @@ case $basic_machine in
 	sequent)
 		basic_machine=i386-sequent
 		;;
 	sh)
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
 	sh5el)
 		basic_machine=sh5le-unknown
 		;;
-	sh64)
+	simso-wrs)
 		basic_machine=sh64-unknown
 		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -1129,7 +1124,7 @@ case $basic_machine in
 		os=-sysv4
 		;;
 	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	sun2)
 		basic_machine=m68000-sun
@@ -1251,6 +1246,9 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
 	x64)
 		basic_machine=x86_64-pc
 		;;
 	xbox)
 		basic_machine=i686-pc
 		os=-mingw32
@@ -1259,20 +1257,12 @@ case $basic_machine in
 		basic_machine=xps100-honeywell
 		;;
 	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
 		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
 		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
 	z80-*-coff)
 		basic_machine=z80-unknown
 		os=-sim
 		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1301,10 +1291,6 @@ case $basic_machine in
 	vax)
 		basic_machine=vax-dec
 		;;
 	pdp10)
 		# there are many clones, so DEC is not a safe bet
 		basic_machine=pdp10-unknown
 		;;
 	pdp11)
 		basic_machine=pdp11-dec
 		;;
@@ -1314,9 +1300,6 @@ case $basic_machine in
 	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
 		basic_machine=cydra-cydrome
 		;;
@@ -1336,7 +1319,7 @@ case $basic_machine in
 		# Make sure to match an already-canonicalized machine name.
 		;;
 	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
 		exit 1
 		;;
 esac
@@ -1344,10 +1327,10 @@ esac
 # Here we canonicalize certain aliases for manufacturers.
 case $basic_machine in
 	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
 		;;
 	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
 		;;
 	*)
 		;;
@@ -1358,8 +1341,8 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-	# First match some system type aliases
+	# First match some system type aliases that might get confused
-	# that might get confused with valid system types.
+	# with valid system types.
 	# -solaris* is a basic system type, with this one exception.
 	-auroraux)
 		os=-auroraux
@@ -1370,18 +1353,19 @@ case $os in
 	-solaris)
 		os=-solaris2
 		;;
 	-svr4*)
 		os=-sysv4
 		;;
 	-unixware*)
 		os=-sysv4.2uw
 		;;
 	-gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
-	# First accept the basic system types.
+	# es1800 is here to avoid being matched by es* (a different OS)
 	-es1800*)
 		os=-ose
 		;;
 	# Now accept the basic system types.
 	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
+	# Each alternative MUST end in a * to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
@@ -1391,25 +1375,26 @@ case $os in
 	      | -aos* | -aros* | -cloudabi* | -sortix* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
 	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \
 	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -morphos* | -superux* | -rtmk* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos* | -phoenix* | -fuchsia*)
+	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
 	      | -midnightbsd*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1426,12 +1411,12 @@ case $os in
 	-nto*)
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	-sim | -xray | -os68k* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -windows* | -osx | -abug | -netware* | -os9* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
+		os=`echo "$os" | sed -e 's|mac|macos|'`
 		;;
 	-linux-dietlibc)
 		os=-linux-dietlibc
@@ -1440,10 +1425,10 @@ case $os in
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
 	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
 		;;
 	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
 		;;
 	-opened*)
 		os=-openedition
@@ -1454,12 +1439,6 @@ case $os in
 	-wince*)
 		os=-wince
 		;;
 	-osfrose*)
 		os=-osfrose
 		;;
 	-osf*)
 		os=-osf
 		;;
 	-utek*)
 		os=-bsd
 		;;
@@ -1484,7 +1463,7 @@ case $os in
 	-nova*)
 		os=-rtmk-nova
 		;;
-	-ns2 )
+	-ns2)
 		os=-nextstep2
 		;;
 	-nsk*)
@@ -1506,7 +1485,7 @@ case $os in
 	-oss*)
 		os=-sysv3
 		;;
-	-svr4)
+	-svr4*)
 		os=-sysv4
 		;;
 	-svr3)
@@ -1521,24 +1500,28 @@ case $os in
 	-ose*)
 		os=-ose
 		;;
 	-es1800*)
 		os=-ose
 		;;
 	-xenix)
 		os=-xenix
 		;;
 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 		os=-mint
 		;;
 	-aros*)
 		os=-aros
 		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
 	-dicos*)
 		os=-dicos
 		;;
 	-pikeos*)
 		# Until real need of OS specific support for
 		# particular features comes up, bare metal
 		# configurations are quite functional.
 		case $basic_machine in
 		    arm*)
 			os=-eabi
 			;;
 		    *)
 			os=-elf
 			;;
 		esac
 		;;
 	-nacl*)
 		;;
 	-ios)
@@ -1548,7 +1531,7 @@ case $os in
 	*)
 		# Get rid of the `-' at the beginning of $os.
 		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
 		exit 1
 		;;
 esac
@@ -1644,9 +1627,6 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
 	*-haiku)
 		os=-haiku
 		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -1686,7 +1666,7 @@ case $basic_machine in
 	m88k-omron*)
 		os=-luna
 		;;
-	*-next )
+	*-next)
 		os=-nextstep
 		;;
 	*-sequent)
@@ -1701,9 +1681,6 @@ case $basic_machine in
 	i370-*)
 		os=-mvs
 		;;
 	*-next)
 		os=-nextstep3
 		;;
 	*-gould)
 		os=-sysv
 		;;
@@ -1813,15 +1790,15 @@ case $basic_machine in
 				vendor=stratus
 				;;
 		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
 		;;
 esac
-echo $basic_machine$os
+echo "$basic_machine$os"
 exit
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for FreeType 2.7.1.
+# Generated by GNU Autoconf 2.69 for FreeType 2.9.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.7.1'
+PACKAGE_VERSION='2.9.1'
-PACKAGE_STRING='FreeType 2.7.1'
+PACKAGE_STRING='FreeType 2.9.1'
 PACKAGE_BUGREPORT='freetype@nongnu.org'
 PACKAGE_URL=''
@@ -642,6 +642,7 @@ LIBSSTATIC_CONFIG
 LIBS_PRIVATE
 REQUIRES_PRIVATE
 ftmac_c
 LIB_CLOCK_GETTIME
 HARFBUZZ_LIBS
 HARFBUZZ_CFLAGS
 LIBPNG_LIBS
@@ -653,12 +654,14 @@ ZLIB_CFLAGS
 XX_ANSIFLAGS
 XX_CFLAGS
 FTSYS_SRC
 INSTALL_FT2_CONFIG
 MKDIR_P
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
 EXEEXT_BUILD
 CC_BUILD
 RC
 LT_SYS_LIBRARY_PATH
 OTOOL64
 OTOOL
@@ -755,6 +758,7 @@ with_gnu_ld
 with_sysroot
 enable_libtool_lock
 enable_biarch_config
 enable_freetype_config
 enable_largefile
 enable_mmap
 with_zlib
@@ -1329,7 +1333,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.7.1 to adapt to many kinds of systems.
+\`configure' configures FreeType 2.9.1 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1394,7 +1398,7 @@ fi
 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of FreeType 2.7.1:";;
+     short | recursive ) echo "Configuration of FreeType 2.9.1:";;
   esac
  cat <<\_ACEOF
@@ -1409,6 +1413,8 @@ Optional Features:
  --disable-libtool-lock  avoid locking (might break parallel builds)
  --enable-biarch-config  install biarch ftconfig.h to support multiple
                          architectures by single file
  --enable-freetype-config
                          install freetype-config
  --disable-largefile     omit support for large files
  --disable-mmap          do not check mmap() and do not use
@@ -1541,7 +1547,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-FreeType configure 2.7.1
+FreeType configure 2.9.1
 generated by GNU Autoconf 2.69
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2139,7 +2145,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.7.1, which was
+It was created by FreeType $as_me 2.9.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
  $ $0 $@
@@ -2495,7 +2501,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # Don't forget to update `docs/VERSIONS.TXT'!
-version_info='19:0:13'
+version_info='22:1:16'
 ft_version=`echo $version_info | tr : .`
@@ -11847,6 +11853,175 @@ CC=$lt_save_CC
 # Only expand once:
 if test -n "$ac_tool_prefix"; then
  # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_RC+:} false; then :
  $as_echo_n "(cached) " >&6
 else
  if test -n "$RC"; then
  ac_cv_prog_RC="$RC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
  IFS=$as_save_IFS
  test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    ac_cv_prog_RC="${ac_tool_prefix}windres"
    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    break 2
  fi
 done
  done
 IFS=$as_save_IFS
 fi
 fi
 RC=$ac_cv_prog_RC
 if test -n "$RC"; then
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
 $as_echo "$RC" >&6; }
 else
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 fi
 if test -z "$ac_cv_prog_RC"; then
  ac_ct_RC=$RC
  # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_RC+:} false; then :
  $as_echo_n "(cached) " >&6
 else
  if test -n "$ac_ct_RC"; then
  ac_cv_prog_ac_ct_RC="$ac_ct_RC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
  IFS=$as_save_IFS
  test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    ac_cv_prog_ac_ct_RC="windres"
    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    break 2
  fi
 done
  done
 IFS=$as_save_IFS
 fi
 fi
 ac_ct_RC=$ac_cv_prog_ac_ct_RC
 if test -n "$ac_ct_RC"; then
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5
 $as_echo "$ac_ct_RC" >&6; }
 else
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
  if test "x$ac_ct_RC" = x; then
    RC=""
  else
    case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
    RC=$ac_ct_RC
  fi
 else
  RC="$ac_cv_prog_RC"
 fi
 # Source file extension for RC test sources.
 ac_ext=rc
 # Object file extension for compiled RC test sources.
 objext=o
 objext_RC=$objext
 # Code to be used in simple compile tests
 lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 # Code to be used in simple link tests
 lt_simple_link_test_code=$lt_simple_compile_test_code
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 # If no C compiler flags were specified, use CFLAGS.
 LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 # Allow CC to be a program name with arguments.
 compiler=$CC
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
 echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $RM conftest*
 ac_outfile=conftest.$ac_objext
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $RM -r conftest*
 # Allow CC to be a program name with arguments.
 lt_save_CC=$CC
 lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=
 CC=${RC-"windres"}
 CFLAGS=
 compiler=$CC
 compiler_RC=$CC
 func_cc_basename $compiler
 cc_basename=$func_cc_basename_result
 lt_cv_prog_compiler_c_o_RC=yes
 if test -n "$compiler"; then
  :
 fi
 GCC=$lt_save_GCC
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 CC=$lt_save_CC
 CFLAGS=$lt_save_CFLAGS
 # checks for native programs to generate building tool
@@ -12566,15 +12741,13 @@ $as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cpp computation of bit length in ftconfig.in works" >&5
 $as_echo_n "checking whether cpp computation of bit length in ftconfig.in works... " >&6; }
 orig_CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS="-I${srcdir} -I. ${CPPFLAGS}"
+CPPFLAGS="-I${srcdir} -I. -I${srcdir}/../../include/freetype/config ${CPPFLAGS}"
 ac_clean_files=
-for f in ft2build.h ftoption.h ftstdlib.h; do
+if test ! -f ft2build.h; then
-  if test ! -f $f; then
+  ac_clean_files=ft2build.h
-    ac_clean_files="$ac_clean_files $f"
+  touch ft2build.h
-    touch $f
+fi
  fi
 done
 cat > conftest.c <<\_ACEOF
 #include <limits.h>
@@ -12639,6 +12812,20 @@ fi
 CPPFLAGS="${orig_CPPFLAGS}"
 # Check whether --enable-freetype-config was given.
 if test "${enable_freetype_config+set}" = set; then :
  enableval=$enable_freetype_config; case "${enableval}" in
    yes) enable_freetype_config="TRUE" ;;
    no)  enable_freetype_config="FALSE" ;;
    *)   as_fn_error $? "unknown value '${enableval}' passed with --enable-freetype-config" "$LINENO" 5 ;;
   esac
 else
  enable_freetype_config="FALSE"
 fi
 INSTALL_FT2_CONFIG=$enable_freetype_config
 # checks for library functions
@@ -13193,8 +13380,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 "$as_me:${as_lineno-$LINENO}: result: ok, adding to XX_ANSIFLAGS" >&5
-$as_echo "ok, add it to XX_ANSIFLAGS" >&6; }
+$as_echo "ok, adding to XX_ANSIFLAGS" >&6; }
         XX_ANSIFLAGS="${XX_ANSIFLAGS} ${a}"
 else
@@ -13223,6 +13410,35 @@ fi
 # It is recommended that shared libraries hide symbols except those with
 # explicit __attribute__((visibility("default"))).
 #
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag" >&5
 $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
 orig_CFLAGS="${CFLAGS}"
 CFLAGS="${CFLAGS} -fvisibility=hidden"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int
 main ()
 {
  ;
  return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
  CFLAGS="${orig_CFLAGS}"
                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # All library tests below try `pkg-config' first.  If that fails, a function
 # from the library is tested in the traditional autoconf way (zlib, bzip2),
 # or a config script is called (libpng).
@@ -13728,7 +13944,7 @@ fi
 have_harfbuzz=no
 if test x"$with_harfbuzz" = xyes -o x"$with_harfbuzz" = xauto; then
-  harfbuzz_pkg="harfbuzz >= 0.9.21"
+  harfbuzz_pkg="harfbuzz >= 1.3.0"
  have_harfbuzz_pkg=no
  if test x"$HARFBUZZ_CFLAGS" = x -a x"$HARFBUZZ_LIBS" = x; then
@@ -13839,6 +14055,74 @@ if test x"$with_harfbuzz" = xyes -a "$have_harfbuzz" = no; then
 fi
 # check for librt
 #
 # We need `clock_gettime' for the `ftbench' demo program.
 #
 # The code is modeled after gnulib's file `clock_time.m4', ignoring
 # very old Solaris systems.
 LIB_CLOCK_GETTIME=
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
 $as_echo_n "checking for library containing clock_gettime... " >&6; }
 if ${ac_cv_search_clock_gettime+:} false; then :
  $as_echo_n "(cached) " >&6
 else
  ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Override any GCC internal prototype to avoid an error.
   Use char because int might match the return type of a GCC
   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char clock_gettime ();
 int
 main ()
 {
 return clock_gettime ();
  ;
  return 0;
 }
 _ACEOF
 for ac_lib in '' rt; do
  if test -z "$ac_lib"; then
    ac_res="none required"
  else
    ac_res=-l$ac_lib
    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
  fi
  if ac_fn_c_try_link "$LINENO"; then :
  ac_cv_search_clock_gettime=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
    conftest$ac_exeext
  if ${ac_cv_search_clock_gettime+:} false; then :
  break
 fi
 done
 if ${ac_cv_search_clock_gettime+:} false; then :
 else
  ac_cv_search_clock_gettime=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5
 $as_echo "$ac_cv_search_clock_gettime" >&6; }
 ac_res=$ac_cv_search_clock_gettime
 if test "$ac_res" != no; then :
  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  test "$ac_cv_search_clock_gettime" = "none required" \
                || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime
 fi
 # Some options handling SDKs/archs in CFLAGS should be copied
 # to LDFLAGS. Apple TechNote 2137 recommends to include these
 # options in CFLAGS but not in LDFLAGS.
@@ -14472,27 +14756,60 @@ LIBSSTATIC_CONFIG=`echo "$LIBSSTATIC_CONFIG"          \
 # changing LDFLAGS value should only be done after
 # lt_cv_prog_compiler_static_works test
-if test "$have_zlib" != no; then
+ftoption_set()
-  CFLAGS="$CFLAGS $ZLIB_CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB"
+{
-  LDFLAGS="$LDFLAGS $ZLIB_LIBS"
+  regexp="-e \\\"s|.*#.*def.*$1.*|#define $1|\\\""
-fi
+  FTOPTION_H_SED="$FTOPTION_H_SED $regexp"
 }
 ftoption_unset()
 {
  regexp="-e \\\"s|.*#.*def.*$1.*|/* #undef $1 */|\\\""
  FTOPTION_H_SED="$FTOPTION_H_SED $regexp"
 }
 if test "$have_zlib" != no; then
  CFLAGS="$CFLAGS $ZLIB_CFLAGS"
  LDFLAGS="$LDFLAGS $ZLIB_LIBS"
  ftoption_set FT_CONFIG_OPTION_SYSTEM_ZLIB
 else
  ftoption_unset FT_CONFIG_OPTION_SYSTEM_ZLIB
 fi
 if test "$have_bzip2" != no; then
-  CFLAGS="$CFLAGS $BZIP2_CFLAGS -DFT_CONFIG_OPTION_USE_BZIP2"
+  CFLAGS="$CFLAGS $BZIP2_CFLAGS"
  LDFLAGS="$LDFLAGS $BZIP2_LIBS"
  ftoption_set FT_CONFIG_OPTION_USE_BZIP2
 else
  ftoption_unset FT_CONFIG_OPTION_USE_BZIP2
 fi
 if test "$have_libpng" != no; then
-  CFLAGS="$CFLAGS $LIBPNG_CFLAGS -DFT_CONFIG_OPTION_USE_PNG"
+  CFLAGS="$CFLAGS $LIBPNG_CFLAGS"
  LDFLAGS="$LDFLAGS $LIBPNG_LIBS"
  ftoption_set FT_CONFIG_OPTION_USE_PNG
 else
  ftoption_unset FT_CONFIG_OPTION_USE_PNG
 fi
 if test "$have_harfbuzz" != no; then
-  CFLAGS="$CFLAGS $HARFBUZZ_CFLAGS -DFT_CONFIG_OPTION_USE_HARFBUZZ"
+  CFLAGS="$CFLAGS $HARFBUZZ_CFLAGS"
  LDFLAGS="$LDFLAGS $HARFBUZZ_LIBS"
  ftoption_set FT_CONFIG_OPTION_USE_HARFBUZZ
 else
  ftoption_unset FT_CONFIG_OPTION_USE_HARFBUZZ
 fi
 # We don't want to use a template file for `ftoption.h', since compilation
 # should work without calling a configure script also.  For this reason, we
 # copy the `include/freetype/config/ftoption.h' file to the `unix/builds'
 # directory (using a dummy `AC_CONFIG_FILES' call) and apply the just
 # constructed $FTOPTION_H_SED regexp (using the post-action of
 # `AC_CONFIG_FILES'); this is also the version that gets installed later on.
 #
 ac_config_files="$ac_config_files ftoption.h:${srcdir}/../../include/freetype/config/ftoption.h"
 # configuration file -- stay in 8.3 limit
 #
 # since #undef doesn't survive in configuration header files we replace
@@ -15017,7 +15334,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.7.1, which was
+This file was extended by FreeType $as_me 2.9.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
  CONFIG_FILES    = $CONFIG_FILES
@@ -15083,7 +15400,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.7.1
+FreeType config.status 2.9.1
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"
@@ -15347,6 +15664,48 @@ enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_sub
 enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
 old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
 striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
 LD_RC='`$ECHO "$LD_RC" | $SED "$delay_single_quote_subst"`'
 reload_flag_RC='`$ECHO "$reload_flag_RC" | $SED "$delay_single_quote_subst"`'
 reload_cmds_RC='`$ECHO "$reload_cmds_RC" | $SED "$delay_single_quote_subst"`'
 old_archive_cmds_RC='`$ECHO "$old_archive_cmds_RC" | $SED "$delay_single_quote_subst"`'
 compiler_RC='`$ECHO "$compiler_RC" | $SED "$delay_single_quote_subst"`'
 GCC_RC='`$ECHO "$GCC_RC" | $SED "$delay_single_quote_subst"`'
 lt_prog_compiler_no_builtin_flag_RC='`$ECHO "$lt_prog_compiler_no_builtin_flag_RC" | $SED "$delay_single_quote_subst"`'
 lt_prog_compiler_pic_RC='`$ECHO "$lt_prog_compiler_pic_RC" | $SED "$delay_single_quote_subst"`'
 lt_prog_compiler_wl_RC='`$ECHO "$lt_prog_compiler_wl_RC" | $SED "$delay_single_quote_subst"`'
 lt_prog_compiler_static_RC='`$ECHO "$lt_prog_compiler_static_RC" | $SED "$delay_single_quote_subst"`'
 lt_cv_prog_compiler_c_o_RC='`$ECHO "$lt_cv_prog_compiler_c_o_RC" | $SED "$delay_single_quote_subst"`'
 archive_cmds_need_lc_RC='`$ECHO "$archive_cmds_need_lc_RC" | $SED "$delay_single_quote_subst"`'
 enable_shared_with_static_runtimes_RC='`$ECHO "$enable_shared_with_static_runtimes_RC" | $SED "$delay_single_quote_subst"`'
 export_dynamic_flag_spec_RC='`$ECHO "$export_dynamic_flag_spec_RC" | $SED "$delay_single_quote_subst"`'
 whole_archive_flag_spec_RC='`$ECHO "$whole_archive_flag_spec_RC" | $SED "$delay_single_quote_subst"`'
 compiler_needs_object_RC='`$ECHO "$compiler_needs_object_RC" | $SED "$delay_single_quote_subst"`'
 old_archive_from_new_cmds_RC='`$ECHO "$old_archive_from_new_cmds_RC" | $SED "$delay_single_quote_subst"`'
 old_archive_from_expsyms_cmds_RC='`$ECHO "$old_archive_from_expsyms_cmds_RC" | $SED "$delay_single_quote_subst"`'
 archive_cmds_RC='`$ECHO "$archive_cmds_RC" | $SED "$delay_single_quote_subst"`'
 archive_expsym_cmds_RC='`$ECHO "$archive_expsym_cmds_RC" | $SED "$delay_single_quote_subst"`'
 module_cmds_RC='`$ECHO "$module_cmds_RC" | $SED "$delay_single_quote_subst"`'
 module_expsym_cmds_RC='`$ECHO "$module_expsym_cmds_RC" | $SED "$delay_single_quote_subst"`'
 with_gnu_ld_RC='`$ECHO "$with_gnu_ld_RC" | $SED "$delay_single_quote_subst"`'
 allow_undefined_flag_RC='`$ECHO "$allow_undefined_flag_RC" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag_RC='`$ECHO "$no_undefined_flag_RC" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec_RC='`$ECHO "$hardcode_libdir_flag_spec_RC" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator_RC='`$ECHO "$hardcode_libdir_separator_RC" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_RC='`$ECHO "$hardcode_direct_RC" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute_RC='`$ECHO "$hardcode_direct_absolute_RC" | $SED "$delay_single_quote_subst"`'
 hardcode_minus_L_RC='`$ECHO "$hardcode_minus_L_RC" | $SED "$delay_single_quote_subst"`'
 hardcode_shlibpath_var_RC='`$ECHO "$hardcode_shlibpath_var_RC" | $SED "$delay_single_quote_subst"`'
 hardcode_automatic_RC='`$ECHO "$hardcode_automatic_RC" | $SED "$delay_single_quote_subst"`'
 inherit_rpath_RC='`$ECHO "$inherit_rpath_RC" | $SED "$delay_single_quote_subst"`'
 link_all_deplibs_RC='`$ECHO "$link_all_deplibs_RC" | $SED "$delay_single_quote_subst"`'
 always_export_symbols_RC='`$ECHO "$always_export_symbols_RC" | $SED "$delay_single_quote_subst"`'
 export_symbols_cmds_RC='`$ECHO "$export_symbols_cmds_RC" | $SED "$delay_single_quote_subst"`'
 exclude_expsyms_RC='`$ECHO "$exclude_expsyms_RC" | $SED "$delay_single_quote_subst"`'
 include_expsyms_RC='`$ECHO "$include_expsyms_RC" | $SED "$delay_single_quote_subst"`'
 prelink_cmds_RC='`$ECHO "$prelink_cmds_RC" | $SED "$delay_single_quote_subst"`'
 postlink_cmds_RC='`$ECHO "$postlink_cmds_RC" | $SED "$delay_single_quote_subst"`'
 file_list_spec_RC='`$ECHO "$file_list_spec_RC" | $SED "$delay_single_quote_subst"`'
 hardcode_action_RC='`$ECHO "$hardcode_action_RC" | $SED "$delay_single_quote_subst"`'
 LTCC='$LTCC'
 LTCFLAGS='$LTCFLAGS'
@@ -15429,7 +15788,26 @@ soname_spec \
 install_override_mode \
 finish_eval \
 old_striplib \
-striplib; do
+striplib \
 LD_RC \
 reload_flag_RC \
 compiler_RC \
 lt_prog_compiler_no_builtin_flag_RC \
 lt_prog_compiler_pic_RC \
 lt_prog_compiler_wl_RC \
 lt_prog_compiler_static_RC \
 lt_cv_prog_compiler_c_o_RC \
 export_dynamic_flag_spec_RC \
 whole_archive_flag_spec_RC \
 compiler_needs_object_RC \
 with_gnu_ld_RC \
 allow_undefined_flag_RC \
 no_undefined_flag_RC \
 hardcode_libdir_flag_spec_RC \
 hardcode_libdir_separator_RC \
 exclude_expsyms_RC \
 include_expsyms_RC \
 file_list_spec_RC; do
    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
    *[\\\\\\\`\\"\\\$]*)
      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
@@ -15460,7 +15838,18 @@ postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
 configure_time_dlsearch_path \
-configure_time_lt_sys_library_path; do
+configure_time_lt_sys_library_path \
 reload_cmds_RC \
 old_archive_cmds_RC \
 old_archive_from_new_cmds_RC \
 old_archive_from_expsyms_cmds_RC \
 archive_cmds_RC \
 archive_expsym_cmds_RC \
 module_cmds_RC \
 module_expsym_cmds_RC \
 export_symbols_cmds_RC \
 prelink_cmds_RC \
 postlink_cmds_RC; do
    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
    *[\\\\\\\`\\"\\\$]*)
      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
@@ -15488,6 +15877,9 @@ fi
 FTOPTION_H_SED="$FTOPTION_H_SED"
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -15497,6 +15889,7 @@ for ac_config_target in $ac_config_targets
 do
  case $ac_config_target in
    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
    "ftoption.h") CONFIG_FILES="$CONFIG_FILES ftoption.h:${srcdir}/../../include/freetype/config/ftoption.h" ;;
    "ftconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS ftconfig.h:ftconfig.in" ;;
    "unix-cc.mk") CONFIG_FILES="$CONFIG_FILES unix-cc.mk:unix-cc.in" ;;
    "unix-def.mk") CONFIG_FILES="$CONFIG_FILES unix-def.mk:unix-def.in" ;;
@@ -16106,7 +16499,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 # The names of the tagged configurations supported by this script.
-available_tags=''
+available_tags='RC '
 # Configured defaults for sys_lib_dlsearch_path munging.
 : \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
@@ -16606,7 +16999,149 @@ ltmain=$ac_aux_dir/ltmain.sh
    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  chmod +x "$ofile"
    cat <<_LT_EOF >> "$ofile"
 # ### BEGIN LIBTOOL TAG CONFIG: RC
 # The linker used to build libraries.
 LD=$lt_LD_RC
 # How to create reloadable object files.
 reload_flag=$lt_reload_flag_RC
 reload_cmds=$lt_reload_cmds_RC
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds_RC
 # A language specific compiler.
 CC=$lt_compiler_RC
 # Is the compiler the GNU compiler?
 with_gcc=$GCC_RC
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
 # Additional compiler flags for building library objects.
 pic_flag=$lt_lt_prog_compiler_pic_RC
 # How to pass a linker flag through the compiler.
 wl=$lt_lt_prog_compiler_wl_RC
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static_RC
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
 # Whether or not to add -lc for building shared libraries.
 build_libtool_need_lc=$archive_cmds_need_lc_RC
 # Whether or not to disallow shared libs when runtime libs are static.
 allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
 # Compiler flag to allow reflexive dlopens.
 export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
 # Compiler flag to generate shared objects directly from archives.
 whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
 # Whether the compiler copes with passing no objects directly.
 compiler_needs_object=$lt_compiler_needs_object_RC
 # Create an old-style archive from a shared archive.
 old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
 # Create a temporary old-style archive to link instead of a shared archive.
 old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
 # Commands used to build a shared archive.
 archive_cmds=$lt_archive_cmds_RC
 archive_expsym_cmds=$lt_archive_expsym_cmds_RC
 # Commands used to build a loadable module if different from building
 # a shared archive.
 module_cmds=$lt_module_cmds_RC
 module_expsym_cmds=$lt_module_expsym_cmds_RC
 # Whether we are building with GNU ld or not.
 with_gnu_ld=$lt_with_gnu_ld_RC
 # Flag that allows shared libraries with undefined symbols to be built.
 allow_undefined_flag=$lt_allow_undefined_flag_RC
 # Flag that enforces no undefined symbols.
 no_undefined_flag=$lt_no_undefined_flag_RC
 # Flag to hardcode \$libdir into a binary during linking.
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
 # Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary.
 hardcode_direct=$hardcode_direct_RC
 # Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary and the resulting library dependency is
 # "absolute",i.e impossible to change by setting \$shlibpath_var if the
 # library is relocated.
 hardcode_direct_absolute=$hardcode_direct_absolute_RC
 # Set to "yes" if using the -LDIR flag during linking hardcodes DIR
 # into the resulting binary.
 hardcode_minus_L=$hardcode_minus_L_RC
 # Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
 # into the resulting binary.
 hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
 # Set to "yes" if building a shared library automatically hardcodes DIR
 # into the library and all subsequent libraries and executables linked
 # against it.
 hardcode_automatic=$hardcode_automatic_RC
 # Set to yes if linker adds runtime paths of dependent libraries
 # to runtime path list.
 inherit_rpath=$inherit_rpath_RC
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs_RC
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols_RC
 # The commands to list exported symbols.
 export_symbols_cmds=$lt_export_symbols_cmds_RC
 # Symbols that should not be listed in the preloaded symbols.
 exclude_expsyms=$lt_exclude_expsyms_RC
 # Symbols that must always be exported.
 include_expsyms=$lt_include_expsyms_RC
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds_RC
 # Commands necessary for finishing linking programs.
 postlink_cmds=$lt_postlink_cmds_RC
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec_RC
 # How to hardcode a shared library path into an executable.
 hardcode_action=$hardcode_action_RC
 # ### END LIBTOOL TAG CONFIG: RC
 _LT_EOF
 ;;
    "ftoption.h":F) mv ftoption.h ftoption.tmp
   eval "sed $FTOPTION_H_SED < ftoption.tmp > ftoption.h"
   rm ftoption.tmp ;;
    "ftconfig.h":H) mv ftconfig.h ftconfig.tmp
   sed 's|/undef|#undef|' < ftconfig.tmp > ftconfig.h
   rm ftconfig.tmp ;;
@@ -2,7 +2,7 @@
 #
 # Process this file with autoconf to produce a configure script.
 #
-# Copyright 2001-2016 by
+# Copyright 2001-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -11,13 +11,13 @@
 # indicate that you have read the license and understand and accept it
 # fully.
-AC_INIT([FreeType], [2.7.1], [freetype@nongnu.org], [freetype])
+AC_INIT([FreeType], [2.9.1], [freetype@nongnu.org], [freetype])
 AC_CONFIG_SRCDIR([ftconfig.in])
 # Don't forget to update `docs/VERSIONS.TXT'!
-version_info='19:0:13'
+version_info='22:1:16'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
@@ -37,6 +37,7 @@ AC_SUBST(EXEEXT)
 PKG_PROG_PKG_CONFIG([0.24])
 LT_INIT(win32-dll)
 LT_PROG_RC
 # checks for native programs to generate building tool
@@ -112,15 +113,13 @@ AC_TYPE_LONG_LONG_INT
 AC_MSG_CHECKING([whether cpp computation of bit length in ftconfig.in works])
 orig_CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS="-I${srcdir} -I. ${CPPFLAGS}"
+CPPFLAGS="-I${srcdir} -I. -I${srcdir}/../../include/freetype/config ${CPPFLAGS}"
 ac_clean_files=
-for f in ft2build.h ftoption.h ftstdlib.h; do
+if test ! -f ft2build.h; then
-  if test ! -f $f; then
+  ac_clean_files=ft2build.h
-    ac_clean_files="$ac_clean_files $f"
+  touch ft2build.h
-    touch $f
+fi
  fi
 done
 cat > conftest.c <<\_ACEOF
 #include <limits.h>
@@ -178,6 +177,15 @@ fi
 CPPFLAGS="${orig_CPPFLAGS}"
 AC_ARG_ENABLE([freetype-config],
  AS_HELP_STRING([--enable-freetype-config], [install freetype-config]),
  [case "${enableval}" in
    yes) enable_freetype_config="TRUE" ;;
    no)  enable_freetype_config="FALSE" ;;
    *)   AC_MSG_ERROR([unknown value '${enableval}' passed with --enable-freetype-config]) ;;
   esac], [enable_freetype_config="FALSE"])
 AC_SUBST(INSTALL_FT2_CONFIG, [$enable_freetype_config])
 # checks for library functions
@@ -275,7 +283,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])])
@@ -300,6 +308,18 @@ AC_SUBST([XX_CFLAGS])
 AC_SUBST([XX_ANSIFLAGS])
 # It is recommended that shared libraries hide symbols except those with
 # explicit __attribute__((visibility("default"))).
 #
 AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
 orig_CFLAGS="${CFLAGS}"
 CFLAGS="${CFLAGS} -fvisibility=hidden"
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
                  AC_MSG_RESULT(yes),
                  CFLAGS="${orig_CFLAGS}"
                  AC_MSG_RESULT(no))
 # All library tests below try `pkg-config' first.  If that fails, a function
 # from the library is tested in the traditional autoconf way (zlib, bzip2),
 # or a config script is called (libpng).
@@ -476,7 +496,7 @@ AC_ARG_WITH([harfbuzz],
 have_harfbuzz=no
 if test x"$with_harfbuzz" = xyes -o x"$with_harfbuzz" = xauto; then
-  harfbuzz_pkg="harfbuzz >= 0.9.21"
+  harfbuzz_pkg="harfbuzz >= 1.3.0"
  have_harfbuzz_pkg=no
  if test x"$HARFBUZZ_CFLAGS" = x -a x"$HARFBUZZ_LIBS" = x; then
@@ -511,6 +531,21 @@ if test x"$with_harfbuzz" = xyes -a "$have_harfbuzz" = no; then
 fi
 # check for librt
 #
 # We need `clock_gettime' for the `ftbench' demo program.
 #
 # The code is modeled after gnulib's file `clock_time.m4', ignoring
 # very old Solaris systems.
 LIB_CLOCK_GETTIME=
 AC_SEARCH_LIBS([clock_gettime],
               [rt],
               [test "$ac_cv_search_clock_gettime" = "none required" \
                || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
 AC_SUBST([LIB_CLOCK_GETTIME])
 # Some options handling SDKs/archs in CFLAGS should be copied
 # to LDFLAGS. Apple TechNote 2137 recommends to include these
 # options in CFLAGS but not in LDFLAGS.
@@ -977,27 +1012,63 @@ AC_SUBST([build_libtool_libs])
 # changing LDFLAGS value should only be done after
 # lt_cv_prog_compiler_static_works test
-if test "$have_zlib" != no; then
+ftoption_set()
-  CFLAGS="$CFLAGS $ZLIB_CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB"
+{
-  LDFLAGS="$LDFLAGS $ZLIB_LIBS"
+  regexp="-e \\\"s|.*#.*def.*$1.*|#define $1|\\\""
-fi
+  FTOPTION_H_SED="$FTOPTION_H_SED $regexp"
 }
 ftoption_unset()
 {
  regexp="-e \\\"s|.*#.*def.*$1.*|/* #undef $1 */|\\\""
  FTOPTION_H_SED="$FTOPTION_H_SED $regexp"
 }
 if test "$have_zlib" != no; then
  CFLAGS="$CFLAGS $ZLIB_CFLAGS"
  LDFLAGS="$LDFLAGS $ZLIB_LIBS"
  ftoption_set FT_CONFIG_OPTION_SYSTEM_ZLIB
 else
  ftoption_unset FT_CONFIG_OPTION_SYSTEM_ZLIB
 fi
 if test "$have_bzip2" != no; then
-  CFLAGS="$CFLAGS $BZIP2_CFLAGS -DFT_CONFIG_OPTION_USE_BZIP2"
+  CFLAGS="$CFLAGS $BZIP2_CFLAGS"
  LDFLAGS="$LDFLAGS $BZIP2_LIBS"
  ftoption_set FT_CONFIG_OPTION_USE_BZIP2
 else
  ftoption_unset FT_CONFIG_OPTION_USE_BZIP2
 fi
 if test "$have_libpng" != no; then
-  CFLAGS="$CFLAGS $LIBPNG_CFLAGS -DFT_CONFIG_OPTION_USE_PNG"
+  CFLAGS="$CFLAGS $LIBPNG_CFLAGS"
  LDFLAGS="$LDFLAGS $LIBPNG_LIBS"
  ftoption_set FT_CONFIG_OPTION_USE_PNG
 else
  ftoption_unset FT_CONFIG_OPTION_USE_PNG
 fi
 if test "$have_harfbuzz" != no; then
-  CFLAGS="$CFLAGS $HARFBUZZ_CFLAGS -DFT_CONFIG_OPTION_USE_HARFBUZZ"
+  CFLAGS="$CFLAGS $HARFBUZZ_CFLAGS"
  LDFLAGS="$LDFLAGS $HARFBUZZ_LIBS"
  ftoption_set FT_CONFIG_OPTION_USE_HARFBUZZ
 else
  ftoption_unset FT_CONFIG_OPTION_USE_HARFBUZZ
 fi
 AC_SUBST([CFLAGS])
 AC_SUBST([LDFLAGS])
 # We don't want to use a template file for `ftoption.h', since compilation
 # should work without calling a configure script also.  For this reason, we
 # copy the `include/freetype/config/ftoption.h' file to the `unix/builds'
 # directory (using a dummy `AC_CONFIG_FILES' call) and apply the just
 # constructed $FTOPTION_H_SED regexp (using the post-action of
 # `AC_CONFIG_FILES'); this is also the version that gets installed later on.
 #
 AC_CONFIG_FILES([ftoption.h:${srcdir}/../../include/freetype/config/ftoption.h],
  [mv ftoption.h ftoption.tmp
   eval "sed $FTOPTION_H_SED < ftoption.tmp > ftoption.h"
   rm ftoption.tmp],
  [FTOPTION_H_SED="$FTOPTION_H_SED"])
 # configuration file -- stay in 8.3 limit
 #
 # since #undef doesn't survive in configuration header files we replace
@@ -2,7 +2,7 @@
 #
 # Process this file with autoconf to produce a configure script.
 #
-# Copyright 2001-2016 by
+# Copyright 2001-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])
 # Don't forget to update `docs/VERSIONS.TXT'!
-version_info='19:0:13'
+version_info='22:1:16'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
@@ -37,6 +37,7 @@ AC_SUBST(EXEEXT)
 PKG_PROG_PKG_CONFIG([0.24])
 LT_INIT(win32-dll)
 LT_PROG_RC
 # checks for native programs to generate building tool
@@ -112,15 +113,13 @@ AC_TYPE_LONG_LONG_INT
 AC_MSG_CHECKING([whether cpp computation of bit length in ftconfig.in works])
 orig_CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS="-I${srcdir} -I. ${CPPFLAGS}"
+CPPFLAGS="-I${srcdir} -I. -I${srcdir}/../../include/freetype/config ${CPPFLAGS}"
 ac_clean_files=
-for f in ft2build.h ftoption.h ftstdlib.h; do
+if test ! -f ft2build.h; then
-  if test ! -f $f; then
+  ac_clean_files=ft2build.h
-    ac_clean_files="$ac_clean_files $f"
+  touch ft2build.h
-    touch $f
+fi
  fi
 done
 cat > conftest.c <<\_ACEOF
 #include <limits.h>
@@ -178,6 +177,15 @@ fi
 CPPFLAGS="${orig_CPPFLAGS}"
 AC_ARG_ENABLE([freetype-config],
  AS_HELP_STRING([--enable-freetype-config], [install freetype-config]),
  [case "${enableval}" in
    yes) enable_freetype_config="TRUE" ;;
    no)  enable_freetype_config="FALSE" ;;
    *)   AC_MSG_ERROR([unknown value '${enableval}' passed with --enable-freetype-config]) ;;
   esac], [enable_freetype_config="FALSE"])
 AC_SUBST(INSTALL_FT2_CONFIG, [$enable_freetype_config])
 # checks for library functions
@@ -275,7 +283,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])])
@@ -300,6 +308,18 @@ AC_SUBST([XX_CFLAGS])
 AC_SUBST([XX_ANSIFLAGS])
 # It is recommended that shared libraries hide symbols except those with
 # explicit __attribute__((visibility("default"))).
 #
 AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
 orig_CFLAGS="${CFLAGS}"
 CFLAGS="${CFLAGS} -fvisibility=hidden"
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
                  AC_MSG_RESULT(yes),
                  CFLAGS="${orig_CFLAGS}"
                  AC_MSG_RESULT(no))
 # All library tests below try `pkg-config' first.  If that fails, a function
 # from the library is tested in the traditional autoconf way (zlib, bzip2),
 # or a config script is called (libpng).
@@ -476,7 +496,7 @@ AC_ARG_WITH([harfbuzz],
 have_harfbuzz=no
 if test x"$with_harfbuzz" = xyes -o x"$with_harfbuzz" = xauto; then
-  harfbuzz_pkg="harfbuzz >= 0.9.21"
+  harfbuzz_pkg="harfbuzz >= 1.3.0"
  have_harfbuzz_pkg=no
  if test x"$HARFBUZZ_CFLAGS" = x -a x"$HARFBUZZ_LIBS" = x; then
@@ -511,6 +531,21 @@ if test x"$with_harfbuzz" = xyes -a "$have_harfbuzz" = no; then
 fi
 # check for librt
 #
 # We need `clock_gettime' for the `ftbench' demo program.
 #
 # The code is modeled after gnulib's file `clock_time.m4', ignoring
 # very old Solaris systems.
 LIB_CLOCK_GETTIME=
 AC_SEARCH_LIBS([clock_gettime],
               [rt],
               [test "$ac_cv_search_clock_gettime" = "none required" \
                || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
 AC_SUBST([LIB_CLOCK_GETTIME])
 # Some options handling SDKs/archs in CFLAGS should be copied
 # to LDFLAGS. Apple TechNote 2137 recommends to include these
 # options in CFLAGS but not in LDFLAGS.
@@ -977,27 +1012,63 @@ AC_SUBST([build_libtool_libs])
 # changing LDFLAGS value should only be done after
 # lt_cv_prog_compiler_static_works test
-if test "$have_zlib" != no; then
+ftoption_set()
-  CFLAGS="$CFLAGS $ZLIB_CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB"
+{
-  LDFLAGS="$LDFLAGS $ZLIB_LIBS"
+  regexp="-e \\\"s|.*#.*def.*$1.*|#define $1|\\\""
-fi
+  FTOPTION_H_SED="$FTOPTION_H_SED $regexp"
 }
 ftoption_unset()
 {
  regexp="-e \\\"s|.*#.*def.*$1.*|/* #undef $1 */|\\\""
  FTOPTION_H_SED="$FTOPTION_H_SED $regexp"
 }
 if test "$have_zlib" != no; then
  CFLAGS="$CFLAGS $ZLIB_CFLAGS"
  LDFLAGS="$LDFLAGS $ZLIB_LIBS"
  ftoption_set FT_CONFIG_OPTION_SYSTEM_ZLIB
 else
  ftoption_unset FT_CONFIG_OPTION_SYSTEM_ZLIB
 fi
 if test "$have_bzip2" != no; then
-  CFLAGS="$CFLAGS $BZIP2_CFLAGS -DFT_CONFIG_OPTION_USE_BZIP2"
+  CFLAGS="$CFLAGS $BZIP2_CFLAGS"
  LDFLAGS="$LDFLAGS $BZIP2_LIBS"
  ftoption_set FT_CONFIG_OPTION_USE_BZIP2
 else
  ftoption_unset FT_CONFIG_OPTION_USE_BZIP2
 fi
 if test "$have_libpng" != no; then
-  CFLAGS="$CFLAGS $LIBPNG_CFLAGS -DFT_CONFIG_OPTION_USE_PNG"
+  CFLAGS="$CFLAGS $LIBPNG_CFLAGS"
  LDFLAGS="$LDFLAGS $LIBPNG_LIBS"
  ftoption_set FT_CONFIG_OPTION_USE_PNG
 else
  ftoption_unset FT_CONFIG_OPTION_USE_PNG
 fi
 if test "$have_harfbuzz" != no; then
-  CFLAGS="$CFLAGS $HARFBUZZ_CFLAGS -DFT_CONFIG_OPTION_USE_HARFBUZZ"
+  CFLAGS="$CFLAGS $HARFBUZZ_CFLAGS"
  LDFLAGS="$LDFLAGS $HARFBUZZ_LIBS"
  ftoption_set FT_CONFIG_OPTION_USE_HARFBUZZ
 else
  ftoption_unset FT_CONFIG_OPTION_USE_HARFBUZZ
 fi
 AC_SUBST([CFLAGS])
 AC_SUBST([LDFLAGS])
 # We don't want to use a template file for `ftoption.h', since compilation
 # should work without calling a configure script also.  For this reason, we
 # copy the `include/freetype/config/ftoption.h' file to the `unix/builds'
 # directory (using a dummy `AC_CONFIG_FILES' call) and apply the just
 # constructed $FTOPTION_H_SED regexp (using the post-action of
 # `AC_CONFIG_FILES'); this is also the version that gets installed later on.
 #
 AC_CONFIG_FILES([ftoption.h:${srcdir}/../../include/freetype/config/ftoption.h],
  [mv ftoption.h ftoption.tmp
   eval "sed $FTOPTION_H_SED < ftoption.tmp > ftoption.h"
   rm ftoption.tmp],
  [FTOPTION_H_SED="$FTOPTION_H_SED"])
 # configuration file -- stay in 8.3 limit
 #
 # since #undef doesn't survive in configuration header files we replace
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright 2000-2016 by
+# Copyright 2000-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -12,11 +12,55 @@
 LC_ALL=C
 export LC_ALL
-prefix="%prefix%"
+
-exec_prefix="%exec_prefix%"
+# if `pkg-config' is available, use values from `freetype2.pc'
-exec_prefix_set="no"
+%PKG_CONFIG% --atleast-pkgconfig-version 0.24 >/dev/null 2>&1
-includedir="%includedir%"
+if test $? -eq 0 ; then
-libdir="%libdir%"
+  # note that option `--variable' is not affected by the
  # PKG_CONFIG_SYSROOT_DIR environment variable
  if test "x$SYSROOT" != "x" ; then
    PKG_CONFIG_SYSROOT_DIR="$SYSROOT"
    export PKG_CONFIG_SYSROOT_DIR
  fi
  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`
  version=`%PKG_CONFIG% --modversion 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%"
  includedir="%includedir%"
  libdir="%libdir%"
  version=%ft_version%
  cflags="-I${SYSROOT}$includedir/freetype2"
  dynamic_libs="-lfreetype"
  static_libs="%LIBSSTATIC_CONFIG%"
  if test "${SYSROOT}$libdir" != "/usr/lib"   &&
     test "${SYSROOT}$libdir" != "/usr/lib64" ; then
    libs_L="-L${SYSROOT}$libdir"
  fi
 fi
 orig_prefix=$prefix
 orig_exec_prefix=$exec_prefix
 orig_includedir=$includedir
 orig_libdir=$libdir
 include_suffix=`echo $includedir | sed "s|$prefix||"`
 lib_suffix=`echo $libdir | sed "s|$exec_prefix||"`
 usage()
 {
@@ -39,14 +83,17 @@ Options:
                         library
  --static               make command line options display flags
                         for static linking
  --help                 display this help and exit
 EOF
  exit $1
 }
 if test $# -eq 0 ; then
  usage 1 1>&2
 fi
 while test $# -gt 0 ; do
  case "$1" in
  -*=*)
@@ -74,8 +121,8 @@ while test $# -gt 0 ; do
    echo_exec_prefix=yes
    ;;
  --version)
-    echo %ft_version%
+    echo_version=yes
-    exit 0
+    break
    ;;
  --ftversion)
    echo_ft_version=yes
@@ -92,6 +139,9 @@ while test $# -gt 0 ; do
  --static)
    show_static=yes
    ;;
  --help)
    usage 0
    ;;
  *)
    usage 1 1>&2
    ;;
@@ -99,12 +149,27 @@ while test $# -gt 0 ; do
  shift
 done
 if test "$local_prefix" = "yes" ; then
  if test "$exec_prefix_set" != "yes" ; then
    exec_prefix=$prefix
  fi
 fi
 if test "$local_prefix" = "yes" ; then
  includedir=${prefix}${include_suffix}
  if test "$exec_prefix_set" = "yes" ; then
    libdir=${exec_prefix}${lib_suffix}
  else
    libdir=${prefix}${lib_suffix}
  fi
 fi
 if test "$echo_version" = "yes" ; then
  echo $version
 fi
 if test "$echo_prefix" = "yes" ; then
  echo ${SYSROOT}$prefix
 fi
@@ -113,15 +178,6 @@ if test "$echo_exec_prefix" = "yes" ; then
  echo ${SYSROOT}$exec_prefix
 fi
 if test "$exec_prefix_set" = "yes" ; then
  libdir=$exec_prefix/lib
 else
  if test "$local_prefix" = "yes" ; then
    includedir=$prefix/include
    libdir=$prefix/lib
  fi
 fi
 if test "$echo_ft_version" = "yes" ; then
  major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
         | grep FREETYPE_MAJOR \
@@ -136,26 +192,20 @@ if test "$echo_ft_version" = "yes" ; then
 fi
 if test "$echo_cflags" = "yes" ; then
-  echo -I${SYSROOT}$includedir/freetype2
+  echo $cflags | sed "s|$orig_includedir/freetype2|$includedir/freetype2|"
 fi
 if test "$echo_libs" = "yes" ; then
  libs="-lfreetype"
  staticlibs="%LIBSSTATIC_CONFIG%"
  if test "$show_static" = "yes" ; then
-    libs="$staticlibs"
+    libs="$libs_L $static_libs"
  fi
  if test "${SYSROOT}$libdir" != "/usr/lib"  &&
     test "${SYSROOT}$libdir" != "/usr/lib64"; then
    echo -L${SYSROOT}$libdir $libs
  else
-    echo $libs
+    libs="$libs_L $dynamic_libs"
  fi
  echo $libs | sed "s|$orig_libdir|$libdir|"
 fi
 if test "$echo_libtool" = "yes" ; then
-  convlib="libfreetype.la"
+  echo ${SYSROOT}$libdir/libfreetype.la
  echo ${SYSROOT}$libdir/$convlib
 fi
 # EOF
@@ -4,7 +4,7 @@ libdir=%libdir%
 includedir=%includedir%
 Name: FreeType 2
-URL: http://freetype.org
+URL: https://freetype.org
 Description: A free, high-quality, and portable font engine.
 Version: %ft_version%
 Requires:
@@ -1,7 +1,7 @@
 # Configure paths for FreeType2
 # Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
 #
-# Copyright 2001-2016 by
+# Copyright 2001-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -1,6 +1,6 @@
 ## FreeType specific autoconf tests
 #
-# Copyright 2002-2016 by
+# Copyright 2002-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    UNIX-specific configuration file (specification only).               */
 /*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
+/*  Copyright 1996-2018 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -365,6 +365,15 @@ FT_BEGIN_HEADER
 #endif
 #ifdef _WIN64
  /* only 64bit Windows uses the LLP64 data model, i.e., */
  /* 32bit integers, 64bit pointers                      */
 #define FT_UINT_TO_POINTER( x ) (void*)(unsigned __int64)(x)
 #else
 #define FT_UINT_TO_POINTER( x ) (void*)(unsigned long)(x)
 #endif
  /*************************************************************************/
  /*                                                                       */
  /* miscellaneous                                                         */
@@ -388,6 +397,14 @@ FT_BEGIN_HEADER
 #endif
  /* Use FT_LOCAL and FT_LOCAL_DEF to declare and define, respectively, */
  /* a function that gets used only within the scope of a module.       */
  /* Normally, both the header and source code files for such a         */
  /* function are within a single module directory.                     */
  /*                                                                    */
  /* Intra-module arrays should be tagged with FT_LOCAL_ARRAY and       */
  /* FT_LOCAL_ARRAY_DEF.                                                */
  /*                                                                    */
 #ifdef FT_MAKE_OPTION_SINGLE_OBJECT
 #define FT_LOCAL( x )      static  x
@@ -409,6 +426,12 @@ FT_BEGIN_HEADER
 #define FT_LOCAL_ARRAY_DEF( x )  const  x
  /* Use FT_BASE and FT_BASE_DEF to declare and define, respectively, */
  /* functions that are used in more than a single module.  In the    */
  /* current setup this implies that the declaration is in a header   */
  /* file in the `include/freetype/internal' directory, and the       */
  /* function body is in a file in `src/base'.                        */
  /*                                                                  */
 #ifndef FT_BASE
 #ifdef __cplusplus
@@ -431,14 +454,63 @@ FT_BEGIN_HEADER
 #endif /* !FT_BASE_DEF */
  /*   When compiling FreeType as a DLL or DSO with hidden visibility      */
  /*   some systems/compilers need a special attribute in front OR after   */
  /*   the return type of function declarations.                           */
  /*                                                                       */
  /*   Two macros are used within the FreeType source code to define       */
  /*   exported library functions: FT_EXPORT and FT_EXPORT_DEF.            */
  /*                                                                       */
  /*     FT_EXPORT( return_type )                                          */
  /*                                                                       */
  /*       is used in a function declaration, as in                        */
  /*                                                                       */
  /*         FT_EXPORT( FT_Error )                                         */
  /*         FT_Init_FreeType( FT_Library*  alibrary );                    */
  /*                                                                       */
  /*                                                                       */
  /*     FT_EXPORT_DEF( return_type )                                      */
  /*                                                                       */
  /*       is used in a function definition, as in                         */
  /*                                                                       */
  /*         FT_EXPORT_DEF( FT_Error )                                     */
  /*         FT_Init_FreeType( FT_Library*  alibrary )                     */
  /*         {                                                             */
  /*           ... some code ...                                           */
  /*           return FT_Err_Ok;                                           */
  /*         }                                                             */
  /*                                                                       */
  /*   You can provide your own implementation of FT_EXPORT and            */
  /*   FT_EXPORT_DEF here if you want.                                     */
  /*                                                                       */
  /*   To export a variable, use FT_EXPORT_VAR.                            */
  /*                                                                       */
 #ifndef FT_EXPORT
-#ifdef __cplusplus
+#ifdef FT2_BUILD_LIBRARY
 #if defined( _WIN32 ) && ( defined( _DLL ) || defined( DLL_EXPORT ) )
 #define FT_EXPORT( x )  __declspec( dllexport )  x
 #elif defined( __GNUC__ ) && __GNUC__ >= 4
 #define FT_EXPORT( x )  __attribute__(( visibility( "default" ) ))  x
 #elif defined( __cplusplus )
 #define FT_EXPORT( x )  extern "C"  x
 #else
 #define FT_EXPORT( x )  extern  x
 #endif
 #else
 #if defined( FT2_DLLIMPORT )
 #define FT_EXPORT( x )  __declspec( dllimport )  x
 #elif defined( __cplusplus )
 #define FT_EXPORT( x )  extern "C"  x
 #else
 #define FT_EXPORT( x )  extern  x
 #endif
 #endif
 #endif /* !FT_EXPORT */
@@ -474,7 +546,13 @@ FT_BEGIN_HEADER
  /* functions which are accessed by (global) function pointers.     */
  /*                                                                 */
  /*                                                                 */
-  /* FT_CALLBACK_DEF is used to _define_ a callback function.        */
+  /* FT_CALLBACK_DEF is used to _define_ a callback function,        */
  /* located in the same source code file as the structure that uses */
  /* it.                                                             */
  /*                                                                 */
  /* FT_BASE_CALLBACK and FT_BASE_CALLBACK_DEF are used to declare   */
  /* and define a callback function, respectively, in a similar way  */
  /* as FT_BASE and FT_BASE_DEF work.                                */
  /*                                                                 */
  /* FT_CALLBACK_TABLE is used to _declare_ a constant variable that */
  /* contains pointers to callback functions.                        */
@@ -494,6 +572,16 @@ FT_BEGIN_HEADER
 #endif
 #endif /* FT_CALLBACK_DEF */
 #ifndef FT_BASE_CALLBACK
 #ifdef __cplusplus
 #define FT_BASE_CALLBACK( x )      extern "C"  x
 #define FT_BASE_CALLBACK_DEF( x )  extern "C"  x
 #else
 #define FT_BASE_CALLBACK( x )      extern  x
 #define FT_BASE_CALLBACK_DEF( x )  x
 #endif
 #endif /* FT_BASE_CALLBACK */
 #ifndef FT_CALLBACK_TABLE
 #ifdef __cplusplus
 #define FT_CALLBACK_TABLE      extern "C"
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Unix-specific FreeType low-level system interface (body).            */
 /*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
+/*  Copyright 1996-2018 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -30,15 +30,20 @@
 #
 # We also remove `$(includedir)/ft2build.h' for the same reason.
 #
 # Note that some header files get handled twice for simplicity; a special,
 # configured version overwrites the generic one.
 #
 install: $(PROJECT_LIBRARY)
 	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2
 	-$(DELETE) $(DESTDIR)$(includedir)/ft2build.h
 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)                               \
                         $(DESTDIR)$(libdir)/pkgconfig                     \
                         $(DESTDIR)$(includedir)/freetype2/freetype/config \
-                         $(DESTDIR)$(bindir)                               \
+                         $(DESTDIR)$(datadir)/aclocal
-                         $(DESTDIR)$(datadir)/aclocal                      \
+ifeq ($(INSTALL_FT2_CONFIG),TRUE)
 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)                               \
                         $(DESTDIR)$(mandir)/man1
 endif
 	$(LIBTOOL) --mode=install $(INSTALL)                             \
                                  $(PROJECT_LIBRARY) $(DESTDIR)$(libdir)
 	-for P in $(PUBLIC_H) ; do                           \
@@ -49,20 +54,24 @@ install: $(PROJECT_LIBRARY)
          $(INSTALL_DATA)                                           \
            $$P $(DESTDIR)$(includedir)/freetype2/freetype/config ; \
        done
-	$(INSTALL_DATA) $(TOP_DIR)/include/ft2build.h  \
+	$(INSTALL_DATA) $(TOP_DIR)/include/ft2build.h                  \
          $(DESTDIR)$(includedir)/freetype2/ft2build.h
 	$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h                        \
          $(DESTDIR)$(includedir)/freetype2/freetype/config/ftconfig.h
 	$(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h                          \
          $(DESTDIR)$(includedir)/freetype2/freetype/config/ftmodule.h
-	$(INSTALL_SCRIPT) -m 755 $(OBJ_BUILD)/freetype-config \
+	$(INSTALL_DATA) $(OBJ_BUILD)/ftoption.h                        \
-          $(DESTDIR)$(bindir)/freetype-config
+          $(DESTDIR)$(includedir)/freetype2/freetype/config/ftoption.h
-	$(INSTALL_SCRIPT) -m 644 $(BUILD_DIR)/freetype2.m4 \
+	$(INSTALL_SCRIPT) -m 644 $(BUILD_DIR)/freetype2.m4             \
          $(DESTDIR)$(datadir)/aclocal/freetype2.m4
-	$(INSTALL_SCRIPT) -m 644 $(OBJ_BUILD)/freetype2.pc \
+	$(INSTALL_SCRIPT) -m 644 $(OBJ_BUILD)/freetype2.pc             \
          $(DESTDIR)$(libdir)/pkgconfig/freetype2.pc
-	$(INSTALL_DATA) $(TOP_DIR)/docs/freetype-config.1 \
+ifeq ($(INSTALL_FT2_CONFIG),TRUE)
 	$(INSTALL_SCRIPT) -m 755 $(OBJ_BUILD)/freetype-config          \
          $(DESTDIR)$(bindir)/freetype-config
 	$(INSTALL_DATA) $(TOP_DIR)/docs/freetype-config.1              \
          $(DESTDIR)$(mandir)/man1/freetype-config.1
 endif
 uninstall:
@@ -75,7 +84,7 @@ uninstall:
 check:
-	@echo There is no validation suite for this package.
+	$(info There is no validation suite for this package.)
 .PHONY: clean_project_unix distclean_project_unix
@@ -83,13 +92,11 @@ check:
 # Unix cleaning and distclean rules.
 #
 clean_project_unix:
-	-$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)
+	-$(LIBTOOL) --mode=clean $(RM) $(OBJECTS_LIST)
-	-$(DELETE) $(patsubst %.$O,%.$(SO),$(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)) \
+	-$(DELETE) $(CLEAN)
                   $(CLEAN)
 distclean_project_unix: clean_project_unix
-	-$(DELETE) $(PROJECT_LIBRARY)
+	-$(LIBTOOL) --mode=clean $(RM) $(PROJECT_LIBRARY)
 	-$(DELDIR) $(OBJ_DIR)/.libs
 	-$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
 # EOF
@@ -53,7 +53,7 @@ fi[]dnl
 # to PKG_CHECK_MODULES(), but does not set variables or print errors.
 #
 # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
+# only at the first occurrence in configure.ac, so if the first place
 # it's called might be skipped (such as if it is within an "if", you
 # have to call PKG_CHECK_EXISTS manually
 # --------------------------------------------------------------
@@ -2,7 +2,7 @@
 # FreeType 2 template for Unix-specific compiler definitions
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -87,19 +87,26 @@ ANSIFLAGS := @XX_ANSIFLAGS@
 # C compiler to use -- we use libtool!
 #
 #
 CCraw := $(CC)
 CC    := $(LIBTOOL) --mode=compile $(CCraw)
 # Resource compiler to use on Cygwin/MinGW, usually windres.
 #
 RCraw := @RC@
 ifneq ($(RCraw),)
  RC := $(LIBTOOL) --tag=RC --mode=compile $(RCraw)
 endif
 # Linker flags.
 #
-LDFLAGS := @LDFLAGS@
+LDFLAGS           := @LDFLAGS@
 LIB_CLOCK_GETTIME := @LIB_CLOCK_GETTIME@  # for ftbench
 # export symbols
 #
 CCraw_build  := @CC_BUILD@	# native CC of building system
-E_BUILD      := @EXEEXT_BUILD@	# extension for exexutable on building system
+E_BUILD      := @EXEEXT_BUILD@	# extension for executable on building system
 EXPORTS_LIST := $(OBJ_DIR)/ftexport.sym
 CCexe        := $(CCraw_build)	# used to compile `apinames' only
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -43,6 +43,7 @@ DISTCLEAN += $(OBJ_BUILD)/config.cache  \
             $(OBJ_BUILD)/unix-def.mk   \
             $(OBJ_BUILD)/unix-cc.mk    \
             $(OBJ_BUILD)/ftconfig.h    \
             $(OBJ_BUILD)/ftoption.h    \
             $(LIBTOOL)                 \
             $(OBJ_BUILD)/Makefile
@@ -62,6 +63,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 +104,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)|'                 \
@@ -111,7 +114,7 @@ $(OBJ_BUILD)/freetype-config: $(TOP_DIR)/builds/unix/freetype-config.in
 	    $<                                                 \
 	    > $@.tmp
 	chmod +x $@.tmp
-	chmod a-w $@.tmp
+	chmod go-w $@.tmp
 	mv $@.tmp $@
 # To support directory names with spaces (as might easily happen on Windows
@@ -142,6 +145,9 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
 	chmod a-w $@.tmp
 	mv $@.tmp $@
 # defines whether we should install `freetype-config' or not
 INSTALL_FT2_CONFIG = @INSTALL_FT2_CONFIG@
 all install: $(OBJ_BUILD)/freetype-config \
     $(OBJ_BUILD)/freetype2.pc
@@ -6,7 +6,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -6,7 +6,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -4,7 +4,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    VMS-specific configuration file (specification only).                */
 /*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
+/*  Copyright 1996-2018 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -33,6 +33,7 @@
  /*                                                                       */
  /*************************************************************************/
 #ifndef FTCONFIG_H_
 #define FTCONFIG_H_
@@ -209,12 +210,12 @@ FT_BEGIN_HEADER
 #endif
-#if FT_SIZEOF_INT == (32 / FT_CHAR_BIT)
+#if FT_SIZEOF_INT == 4
  typedef signed int      FT_Int32;
  typedef unsigned int    FT_UInt32;
-#elif FT_SIZEOF_LONG == (32 / FT_CHAR_BIT)
+#elif FT_SIZEOF_LONG == 4
  typedef signed long     FT_Int32;
  typedef unsigned long   FT_UInt32;
@@ -225,12 +226,12 @@ FT_BEGIN_HEADER
  /* look up an integer type that is at least 32 bits */
-#if FT_SIZEOF_INT >= (32 / FT_CHAR_BIT)
+#if FT_SIZEOF_INT >= 4
  typedef int            FT_Fast;
  typedef unsigned int   FT_UFast;
-#elif FT_SIZEOF_LONG >= (32 / FT_CHAR_BIT)
+#elif FT_SIZEOF_LONG >= 4
  typedef long           FT_Fast;
  typedef unsigned long  FT_UFast;
@@ -238,15 +239,25 @@ FT_BEGIN_HEADER
 #endif
-  /* determine whether we have a 64-bit int type for platforms without */
+  /* determine whether we have a 64-bit int type  */
-  /* Autoconf                                                          */
+  /* (mostly for environments without `autoconf') */
-#if FT_SIZEOF_LONG == (64 / FT_CHAR_BIT)
+#if FT_SIZEOF_LONG == 8
  /* FT_LONG64 must be defined if a 64-bit type is available */
 #define FT_LONG64
 #define FT_INT64   long
 #define FT_UINT64  unsigned long
  /* we handle the LLP64 scheme separately for GCC and clang, */
  /* suppressing the `long long' warning                      */
 #elif ( FT_SIZEOF_LONG == 4 )       && \
      defined( HAVE_LONG_LONG_INT ) && \
      defined( __GNUC__ )
 #pragma GCC diagnostic ignored "-Wlong-long"
 #define FT_LONG64
 #define FT_INT64   long long int
 #define FT_UINT64  unsigned long long int
  /*************************************************************************/
  /*                                                                       */
  /* A 64-bit data type may create compilation problems if you compile     */
@@ -298,7 +309,7 @@ FT_BEGIN_HEADER
 #endif /* __STDC_VERSION__ >= 199901L */
-#endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */
+#endif /* FT_SIZEOF_LONG == 8 */
 #ifdef FT_LONG64
  typedef FT_INT64   FT_Int64;
@@ -306,6 +317,15 @@ FT_BEGIN_HEADER
 #endif
 #ifdef _WIN64
  /* only 64bit Windows uses the LLP64 data model, i.e., */
  /* 32bit integers, 64bit pointers                      */
 #define FT_UINT_TO_POINTER( x ) (void*)(unsigned __int64)(x)
 #else
 #define FT_UINT_TO_POINTER( x ) (void*)(unsigned long)(x)
 #endif
  /*************************************************************************/
  /*                                                                       */
  /* miscellaneous                                                         */
@@ -329,6 +349,14 @@ FT_BEGIN_HEADER
 #endif
  /* Use FT_LOCAL and FT_LOCAL_DEF to declare and define, respectively, */
  /* a function that gets used only within the scope of a module.       */
  /* Normally, both the header and source code files for such a         */
  /* function are within a single module directory.                     */
  /*                                                                    */
  /* Intra-module arrays should be tagged with FT_LOCAL_ARRAY and       */
  /* FT_LOCAL_ARRAY_DEF.                                                */
  /*                                                                    */
 #ifdef FT_MAKE_OPTION_SINGLE_OBJECT
 #define FT_LOCAL( x )      static  x
@@ -350,6 +378,12 @@ FT_BEGIN_HEADER
 #define FT_LOCAL_ARRAY_DEF( x )  const  x
  /* Use FT_BASE and FT_BASE_DEF to declare and define, respectively, */
  /* functions that are used in more than a single module.  In the    */
  /* current setup this implies that the declaration is in a header   */
  /* file in the `include/freetype/internal' directory, and the       */
  /* function body is in a file in `src/base'.                        */
  /*                                                                  */
 #ifndef FT_BASE
 #ifdef __cplusplus
@@ -372,14 +406,63 @@ FT_BEGIN_HEADER
 #endif /* !FT_BASE_DEF */
  /*   When compiling FreeType as a DLL or DSO with hidden visibility      */
  /*   some systems/compilers need a special attribute in front OR after   */
  /*   the return type of function declarations.                           */
  /*                                                                       */
  /*   Two macros are used within the FreeType source code to define       */
  /*   exported library functions: FT_EXPORT and FT_EXPORT_DEF.            */
  /*                                                                       */
  /*     FT_EXPORT( return_type )                                          */
  /*                                                                       */
  /*       is used in a function declaration, as in                        */
  /*                                                                       */
  /*         FT_EXPORT( FT_Error )                                         */
  /*         FT_Init_FreeType( FT_Library*  alibrary );                    */
  /*                                                                       */
  /*                                                                       */
  /*     FT_EXPORT_DEF( return_type )                                      */
  /*                                                                       */
  /*       is used in a function definition, as in                         */
  /*                                                                       */
  /*         FT_EXPORT_DEF( FT_Error )                                     */
  /*         FT_Init_FreeType( FT_Library*  alibrary )                     */
  /*         {                                                             */
  /*           ... some code ...                                           */
  /*           return FT_Err_Ok;                                           */
  /*         }                                                             */
  /*                                                                       */
  /*   You can provide your own implementation of FT_EXPORT and            */
  /*   FT_EXPORT_DEF here if you want.                                     */
  /*                                                                       */
  /*   To export a variable, use FT_EXPORT_VAR.                            */
  /*                                                                       */
 #ifndef FT_EXPORT
-#ifdef __cplusplus
+#ifdef FT2_BUILD_LIBRARY
 #if defined( _WIN32 ) && ( defined( _DLL ) || defined( DLL_EXPORT ) )
 #define FT_EXPORT( x )  __declspec( dllexport )  x
 #elif defined( __GNUC__ ) && __GNUC__ >= 4
 #define FT_EXPORT( x )  __attribute__(( visibility( "default" ) ))  x
 #elif defined( __cplusplus )
 #define FT_EXPORT( x )  extern "C"  x
 #else
 #define FT_EXPORT( x )  extern  x
 #endif
 #else
 #if defined( FT2_DLLIMPORT )
 #define FT_EXPORT( x )  __declspec( dllimport )  x
 #elif defined( __cplusplus )
 #define FT_EXPORT( x )  extern "C"  x
 #else
 #define FT_EXPORT( x )  extern  x
 #endif
 #endif
 #endif /* !FT_EXPORT */
@@ -415,7 +498,13 @@ FT_BEGIN_HEADER
  /* functions which are accessed by (global) function pointers.     */
  /*                                                                 */
  /*                                                                 */
-  /* FT_CALLBACK_DEF is used to _define_ a callback function.        */
+  /* FT_CALLBACK_DEF is used to _define_ a callback function,        */
  /* located in the same source code file as the structure that uses */
  /* it.                                                             */
  /*                                                                 */
  /* FT_BASE_CALLBACK and FT_BASE_CALLBACK_DEF are used to declare   */
  /* and define a callback function, respectively, in a similar way  */
  /* as FT_BASE and FT_BASE_DEF work.                                */
  /*                                                                 */
  /* FT_CALLBACK_TABLE is used to _declare_ a constant variable that */
  /* contains pointers to callback functions.                        */
@@ -435,6 +524,16 @@ FT_BEGIN_HEADER
 #endif
 #endif /* FT_CALLBACK_DEF */
 #ifndef FT_BASE_CALLBACK
 #ifdef __cplusplus
 #define FT_BASE_CALLBACK( x )      extern "C"  x
 #define FT_BASE_CALLBACK_DEF( x )  extern "C"  x
 #else
 #define FT_BASE_CALLBACK( x )      extern  x
 #define FT_BASE_CALLBACK_DEF( x )  x
 #endif
 #endif /* FT_BASE_CALLBACK */
 #ifndef FT_CALLBACK_TABLE
 #ifdef __cplusplus
 #define FT_CALLBACK_TABLE      extern "C"
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    VMS-specific FreeType low-level system interface (body).             */
 /*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
+/*  Copyright 1996-2018 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Debugging and logging component for WinCE (body).                    */
 /*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
+/*  Copyright 1996-2018 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -79,7 +79,7 @@
    va_start( ap, fmt );
-    vprintf( fmt, ap );
+    vfprintf( stderr, fmt, ap );
    /* send the string to the debugger as well */
    vsprintf( buf, fmt, ap );
    OutputDebugStringEx( buf );
@@ -21,14 +21,14 @@ the following targets:
  <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>
-It compiles the following libraries from the FreeType 2.7.1 sources:</p>
+It compiles the following libraries from the FreeType 2.9.1 sources:</p>
 <ul>
  <pre>
-    freetype271.lib     - release build; single threaded
+    freetype291.lib     - release build; single threaded
-    freetype271_D.lib   - debug build;   single threaded
+    freetype291_D.lib   - debug build;   single threaded
-    freetype271MT.lib   - release build; multi-threaded
+    freetype291MT.lib   - release build; multi-threaded
-    freetype271MT_D.lib - debug build;   multi-threaded</pre>
+    freetype291MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
@@ -21,14 +21,14 @@ the following targets:
  <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>
-It compiles the following libraries from the FreeType 2.7.1 sources:</p>
+It compiles the following libraries from the FreeType 2.9.1 sources:</p>
 <ul>
  <pre>
-    freetype271.lib     - release build; single threaded
+    freetype291.lib     - release build; single threaded
-    freetype271_D.lib   - debug build;   single threaded
+    freetype291_D.lib   - debug build;   single threaded
-    freetype271MT.lib   - release build; multi-threaded
+    freetype291MT.lib   - release build; multi-threaded
-    freetype271MT_D.lib - debug build;   multi-threaded</pre>
+    freetype291MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
@@ -3,7 +3,7 @@
 #
-# Copyright 1996-2016 by
+# Copyright 1996-2018 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -77,7 +77,7 @@ ifeq ($(PLATFORM),windows)
  # So we need to hack.
  #
  # Kudos to Eli Zaretskii (DJGPP guru) that helped debug it.
-  # Details are available in threads of the freetype mailing list
+  # Details are available in threads of the FreeType mailing list
  # (2004-11-11), and then in the devel mailing list (2004-11-20 to -23).
  #
  ifeq ($(OS),Windows_NT)
@@ -95,22 +95,22 @@ ifeq ($(PLATFORM),windows)
  ifneq ($(findstring list,$(MAKECMDGOALS)),)  # test for the "list" target
    dump_target_list:
-	    @echo ÿ
+	    $(info )
-	    @echo $(PROJECT_TITLE) build system -- supported compilers
+	    $(info $(PROJECT_TITLE) build system -- supported compilers)
-	    @echo ÿ
+	    $(info )
-	    @echo Several command-line compilers are supported on Win32:
+	    $(info Several command-line compilers are supported on Win32:)
-	    @echo ÿ
+	    $(info )
-	    @echo ÿÿmake setupÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿgcc (with Mingw)
+	    $(info $(empty)  make setup                     gcc (with Mingw))
-	    @echo ÿÿmake setup visualcÿÿÿÿÿÿÿÿÿÿÿÿÿMicrosoft Visual C++
+	    $(info $(empty)  make setup visualc             Microsoft Visual C++)
-	    @echo ÿÿmake setup bcc32ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿBorland C/C++
+	    $(info $(empty)  make setup bcc32               Borland C/C++)
-	    @echo ÿÿmake setup lccÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿWin32-LCC
+	    $(info $(empty)  make setup lcc                 Win32-LCC)
-	    @echo ÿÿmake setup intelcÿÿÿÿÿÿÿÿÿÿÿÿÿÿIntel C/C++
+	    $(info $(empty)  make setup intelc              Intel C/C++)
-	    @echo ÿ
+	    $(info )
    setup: dump_target_list
    .PHONY: dump_target_list list
  else
-    setup: dos_setup
+    setup: std_setup
  endif
  # additionally, we provide hooks for various other compilers
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Debugging and logging component for Win32 (body).                    */
 /*                                                                         */
-/*  Copyright 1996-2016 by                                                 */
+/*  Copyright 1996-2018 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -65,7 +65,7 @@
    va_start( ap, fmt );
-    vprintf( fmt, ap );
+    vfprintf( stderr, fmt, ap );
    /* send the string to the debugger as well */
    vsprintf( buf, fmt, ap );
    OutputDebugStringA( buf );
@@ -16,7 +16,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype271.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype291.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@@ -33,7 +33,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype271MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype291MT.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@@ -50,7 +50,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype271ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype291ST.lib" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@@ -67,7 +67,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype271_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype291_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@@ -84,7 +84,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype271ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype291ST_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@@ -101,7 +101,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype271MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype291MT_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@@ -116,105 +116,18 @@
      <File RelativePath="..\..\..\src\autofit\autofit.c">
      </File>
      <File RelativePath="..\..\..\src\bdf\bdf.c">
        <FileConfiguration Name="Release|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Debug|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
      </File>
      <File RelativePath="..\..\..\src\cff\cff.c">
        <FileConfiguration Name="Release|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Debug|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
      </File>
      <File RelativePath="..\..\..\src\base\ftbase.c">
        <FileConfiguration Name="Release|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Debug|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
      </File>
      <File RelativePath="..\..\..\src\base\ftbitmap.c">
      </File>
      <File RelativePath="..\..\..\src\cache\ftcache.c">
        <FileConfiguration Name="Release|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Debug|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
      </File>
      <File RelativePath="..\ftdebug.c">
-        <FileConfiguration Name="Release|Win32">
+        <FileConfiguration>
-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" />
+          <Tool Name="VCCLCompilerTool" DisableLanguageExtensions="false" />
        </FileConfiguration>
        <FileConfiguration Name="Release Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" />
        </FileConfiguration>
        <FileConfiguration Name="Release Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" />
        </FileConfiguration>
        <FileConfiguration Name="Debug|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" DisableLanguageExtensions="false" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" DisableLanguageExtensions="false" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" DisableLanguageExtensions="false" />
        </FileConfiguration>
      </File>
      <File RelativePath="..\..\..\src\base\ftfstype.c">
@@ -222,151 +135,27 @@
      <File RelativePath="..\..\..\src\base\ftgasp.c">
      </File>
      <File RelativePath="..\..\..\src\base\ftglyph.c">
        <FileConfiguration Name="Release|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Debug|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
      </File>
      <File RelativePath="..\..\..\src\gzip\ftgzip.c">
        <FileConfiguration Name="Release|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Debug|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
      </File>
      <File RelativePath="..\..\..\src\base\ftinit.c">
        <FileConfiguration Name="Release|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Debug|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
      </File>
      <File RelativePath="..\..\..\src\lzw\ftlzw.c">
        <FileConfiguration Name="Release|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Debug|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
      </File>
      <File RelativePath="..\..\..\src\base\ftstroke.c">
      </File>
      <File RelativePath="..\..\..\src\base\ftsystem.c">
        <FileConfiguration Name="Release|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Debug|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
      </File>
      <File RelativePath="..\..\..\src\smooth\smooth.c">
        <FileConfiguration Name="Release|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Release Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
        </FileConfiguration>
        <FileConfiguration Name="Debug|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Singlethreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
        <FileConfiguration Name="Debug Multithreaded|Win32">
          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
        </FileConfiguration>
      </File>
      <Filter Name="FT_MODULES">
        <File RelativePath="..\..\..\src\base\ftbdf.c">
        </File>
        <File RelativePath="..\..\..\src\base\ftbbox.c">
        </File>
-        <File RelativePath="..\..\..\src\base\ftfntfmt.c">
+        <File RelativePath="..\..\..\src\base\ftcid.c">
        </File>
        <File RelativePath="..\..\..\src\base\ftmm.c">
          <FileConfiguration Name="Release|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Debug|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\..\src\base\ftpfr.c">
        </File>
@@ -376,8 +165,6 @@
        </File>
        <File RelativePath="..\..\..\src\base\ftwinfnt.c">
        </File>
        <File RelativePath="..\..\..\src\base\ftlcdfil.c">
        </File>
        <File RelativePath="..\..\..\src\base\ftgxval.c">
        </File>
        <File RelativePath="..\..\..\src\base\ftotval.c">
@@ -385,244 +172,28 @@
        <File RelativePath="..\..\..\src\base\ftpatent.c">
        </File>
        <File RelativePath="..\..\..\src\pcf\pcf.c">
          <FileConfiguration Name="Release|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Debug|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\..\src\pfr\pfr.c">
          <FileConfiguration Name="Release|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Debug|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\..\src\psaux\psaux.c">
          <FileConfiguration Name="Release|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Debug|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\..\src\pshinter\pshinter.c">
          <FileConfiguration Name="Release|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Debug|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\..\src\psnames\psmodule.c">
          <FileConfiguration Name="Release|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Debug|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\..\src\raster\raster.c">
          <FileConfiguration Name="Release|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Debug|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\..\src\sfnt\sfnt.c">
          <FileConfiguration Name="Release|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Debug|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\..\src\truetype\truetype.c">
          <FileConfiguration Name="Release|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Debug|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\..\src\type1\type1.c">
          <FileConfiguration Name="Release|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Debug|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\..\src\cid\type1cid.c">
          <FileConfiguration Name="Release|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Debug|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\..\src\type42\type42.c">
          <FileConfiguration Name="Release|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Debug|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\..\src\winfonts\winfnt.c">
          <FileConfiguration Name="Release|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Release Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
          </FileConfiguration>
          <FileConfiguration Name="Debug|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Singlethreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
          <FileConfiguration Name="Debug Multithreaded|Win32">
            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />
          </FileConfiguration>
        </File>
      </Filter>
    </Filter>
@@ -643,4 +214,4 @@
  </Files>
  <Globals>
  </Globals>
-</VisualStudioProject>
+</VisualStudioProject>
--- a/Show More
+++ b/Show More