| OLD | NEW |
|---|
| 1 AC_INIT([OTS], | 1 AC_INIT([OTS], |
| 2 [4.0.1], | 2 [5.0.0], |
| 3 [https://github.com/khaledhosny/ots/issues], | 3 [https://github.com/khaledhosny/ots/issues], |
| 4 [ots], | 4 [ots], |
| 5 [https://github.com/khaledhosny/ots]) | 5 [https://github.com/khaledhosny/ots]) |
| 6 | 6 |
| 7 AC_CANONICAL_SYSTEM |
| 7 AC_CONFIG_MACRO_DIR([m4]) | 8 AC_CONFIG_MACRO_DIR([m4]) |
| 8 AC_CONFIG_HEADERS([config.h]) | 9 AC_CONFIG_HEADERS([config.h]) |
| 9 | 10 |
| 10 AM_INIT_AUTOMAKE([foreign subdir-objects]) | 11 AM_INIT_AUTOMAKE([foreign subdir-objects]) |
| 11 AM_SILENT_RULES([yes]) | 12 AM_SILENT_RULES([yes]) |
| 12 | 13 |
| 14 AC_CYGWIN |
| 15 AC_EXEEXT |
| 16 AC_OBJEXT |
| 13 AC_PROG_CC | 17 AC_PROG_CC |
| 14 AC_PROG_CXX | 18 AC_PROG_CXX |
| 15 AC_PROG_RANLIB | 19 AC_PROG_RANLIB |
| 16 PKG_PROG_PKG_CONFIG([0.20]) | 20 PKG_PROG_PKG_CONFIG([0.20]) |
| 17 | 21 |
| 18 have_zlib=false | 22 have_zlib=true |
| 19 AX_CHECK_ZLIB(have_zlib=true, :) | 23 AX_CHECK_ZLIB([], [have_zlib=false]) |
| 20 if ! $have_zlib; then | 24 if ! $have_zlib; then |
| 21 AC_MSG_ERROR([zlib is required but not found]) | 25 AC_MSG_ERROR([zlib is required but not found]) |
| 22 fi | 26 fi |
| 23 | 27 |
| 24 have_freetype=false | 28 have_freetype=false |
| 25 PKG_CHECK_MODULES(FREETYPE, freetype2, have_freetype=true, :) | 29 PKG_CHECK_MODULES(FREETYPE, [freetype2], [have_freetype=true], :) |
| 26 if $have_freetype; then | 30 if $have_freetype; then |
| 27 AC_DEFINE(HAVE_FREETYPE, 1, [Have FreeType 2 library]) | 31 AC_DEFINE(HAVE_FREETYPE, 1, [Have FreeType 2 library]) |
| 28 fi | 32 fi |
| 29 AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype) | 33 AM_CONDITIONAL(HAVE_FREETYPE, [$have_freetype]) |
| 30 | 34 |
| 31 have_pthread=false | 35 have_pthread=false |
| 32 AX_PTHREAD([have_pthread=true]) | 36 AX_PTHREAD([have_pthread=true]) |
| 33 if $have_pthread; then | 37 if $have_pthread; then |
| 34 GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=1" | 38 GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=1" |
| 35 else | 39 else |
| 36 GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=0" | 40 GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=0" |
| 37 fi | 41 fi |
| 38 AC_SUBST([GTEST_CPPFLAGS]) | 42 AC_SUBST([GTEST_CPPFLAGS]) |
| 39 | 43 |
| 40 have_coretext=false | 44 have_coretext=false |
| 41 AC_CHECK_TYPE(CTFontRef, have_coretext=true,, [#include <ApplicationServices/App
licationServices.h>]) | 45 AC_CHECK_TYPE([CTFontRef], [have_coretext=true], [], [#include <ApplicationServi
ces/ApplicationServices.h>]) |
| 42 if $have_coretext; then | 46 if $have_coretext; then |
| 43 CORETEXT_CFLAGS= | 47 CORETEXT_CFLAGS= |
| 44 CORETEXT_LIBS="-framework ApplicationServices" | 48 CORETEXT_LIBS="-framework ApplicationServices" |
| 45 AC_DEFINE(HAVE_CORETEXT, 1, [Have Core Text framework]) | 49 AC_DEFINE(HAVE_CORETEXT, 1, [Have Core Text framework]) |
| 46 fi | 50 fi |
| 47 AC_SUBST(CORETEXT_CFLAGS) | 51 AC_SUBST(CORETEXT_CFLAGS) |
| 48 AC_SUBST(CORETEXT_LIBS) | 52 AC_SUBST(CORETEXT_LIBS) |
| 49 AM_CONDITIONAL(HAVE_CORETEXT, $have_coretext) | 53 AM_CONDITIONAL(HAVE_CORETEXT, [$have_coretext]) |
| 54 |
| 55 have_systime=false |
| 56 AC_CHECK_HEADER([sys/time.h], [have_systime=true]) |
| 57 AM_CONDITIONAL(HAVE_SYSTIME, [$have_systime]) |
| 50 | 58 |
| 51 AC_CONFIG_FILES([Makefile]) | 59 AC_CONFIG_FILES([Makefile]) |
| 52 | 60 |
| 53 AC_OUTPUT | 61 AC_OUTPUT |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1487543005:
Update OTS to revision 99a3b7f (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master