diff options
| author | Karl Berry <karl@freefriends.org> | 2017-11-14 22:38:24 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-11-14 22:38:24 +0000 |
| commit | d1612dc09aef759c48f8988eb5b8c12af6185435 (patch) | |
| tree | 5c196fb57f6aaf175aff7f3b4998fa3bc9c7b70f /Build/source/libs/harfbuzz | |
| parent | 692e0ee16fdeefd289e5a0f7ae5c991bb4692c5f (diff) | |
pass no-define to Automake, to avoid clash with harfbuzz use of identifier "VERSION"
git-svn-id: svn://tug.org/texlive/trunk@45807 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/harfbuzz')
| -rw-r--r-- | Build/source/libs/harfbuzz/ChangeLog | 7 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/config.h.in | 6 | ||||
| -rwxr-xr-x | Build/source/libs/harfbuzz/configure | 9 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/configure.ac | 3 |
4 files changed, 9 insertions, 16 deletions
diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog index 2fcf75cac06..885ff480342 100644 --- a/Build/source/libs/harfbuzz/ChangeLog +++ b/Build/source/libs/harfbuzz/ChangeLog @@ -1,3 +1,10 @@ +2017-11-14 Karl Berry <karl@tug.org> + + * configure.ac (KPSE_BASIC): pass Automake option no-define + to stop the #define of VERSION (and PACKAGE), which harfbuzz + and/or C++ is apparently now using for its own incompatible purposes. + * config.h.in (PACKAGE, VERSION): hence auto-removed (by aclocal). + 2017-11-13 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Import harfbuzz-1.7.0. diff --git a/Build/source/libs/harfbuzz/config.h.in b/Build/source/libs/harfbuzz/config.h.in index d5e621194e8..402feede181 100644 --- a/Build/source/libs/harfbuzz/config.h.in +++ b/Build/source/libs/harfbuzz/config.h.in @@ -99,9 +99,6 @@ /* Define to 1 if you have the <xlocale.h> header file. */ #undef HAVE_XLOCALE_H -/* Name of package */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -122,6 +119,3 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS - -/* Version number of package */ -#undef VERSION diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure index 2a110e37c64..a6bfc686a6a 100755 --- a/Build/source/libs/harfbuzz/configure +++ b/Build/source/libs/harfbuzz/configure @@ -4008,15 +4008,6 @@ fi VERSION='1.7.0' -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - # Some tools Automake needs. ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} diff --git a/Build/source/libs/harfbuzz/configure.ac b/Build/source/libs/harfbuzz/configure.ac index a0f03b4bfb4..3e8be57c3b3 100644 --- a/Build/source/libs/harfbuzz/configure.ac +++ b/Build/source/libs/harfbuzz/configure.ac @@ -1,3 +1,4 @@ +dnl $Id$ dnl Process this file with autoconf to produce a configure script. dnl dnl Copyright 2016-2017 Karl Berry <tex-live@tug.org> @@ -14,7 +15,7 @@ AC_CONFIG_SRCDIR([harfbuzz-src/src/harfbuzz.pc.in]) AC_CONFIG_AUX_DIR([../../build-aux]) AC_CONFIG_MACRO_DIR([../../m4]) -KPSE_BASIC([harfbuzz]) +KPSE_BASIC([harfbuzz], no-define) KPSE_LIB_VERSION([harfbuzz])[]dnl AC_SUBST([HB_VERSION_MAJOR], [harfbuzz_major])[]dnl |