texlive[45807] pass no-define to Automake, to avoid clash with

[commits+karl at tug.org]

Revision: 45807
          http://tug.org/svn/texlive?view=revision&revision=45807
Author:   karl
Date:     2017-11-14 23:38:24 +0100 (Tue, 14 Nov 2017)
Log Message:
-----------
pass no-define to Automake, to avoid clash with harfbuzz use of identifier "VERSION"

Modified Paths:
--------------
    trunk/Build/source/libs/harfbuzz/ChangeLog
    trunk/Build/source/libs/harfbuzz/config.h.in
    trunk/Build/source/libs/harfbuzz/configure
    trunk/Build/source/libs/harfbuzz/configure.ac

Property Changed:
----------------
    trunk/Build/source/libs/harfbuzz/configure.ac

Modified: trunk/Build/source/libs/harfbuzz/ChangeLog
===================================================================
--- trunk/Build/source/libs/harfbuzz/ChangeLog	2017-11-14 21:16:47 UTC (rev 45806)
+++ trunk/Build/source/libs/harfbuzz/ChangeLog	2017-11-14 22:38:24 UTC (rev 45807)
@@ -1,3 +1,10 @@
+2017-11-14  Karl Berry  <karl at 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 at fuk.kindai.ac.jp>
 
 	Import harfbuzz-1.7.0.

Modified: trunk/Build/source/libs/harfbuzz/config.h.in
===================================================================
--- trunk/Build/source/libs/harfbuzz/config.h.in	2017-11-14 21:16:47 UTC (rev 45806)
+++ trunk/Build/source/libs/harfbuzz/config.h.in	2017-11-14 22:38:24 UTC (rev 45807)
@@ -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

Modified: trunk/Build/source/libs/harfbuzz/configure
===================================================================
--- trunk/Build/source/libs/harfbuzz/configure	2017-11-14 21:16:47 UTC (rev 45806)
+++ trunk/Build/source/libs/harfbuzz/configure	2017-11-14 22:38:24 UTC (rev 45807)
@@ -4008,15 +4008,6 @@
  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}"}

Modified: trunk/Build/source/libs/harfbuzz/configure.ac
===================================================================
--- trunk/Build/source/libs/harfbuzz/configure.ac	2017-11-14 21:16:47 UTC (rev 45806)
+++ trunk/Build/source/libs/harfbuzz/configure.ac	2017-11-14 22:38:24 UTC (rev 45807)
@@ -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 at tug.org>
@@ -14,7 +15,7 @@
 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


Property changes on: trunk/Build/source/libs/harfbuzz/configure.ac
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id
\ No newline at end of property