From d9f50b76c000db55ad87b220a8ff952bd5ff0d3d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 3 Sep 2009 19:00:12 +0000 Subject: AC_DEFINE(HAVE_KPATHSEA), else glyphlist.txt/texnansx.enc not found, etc.; tlbuild mail from John Owens, 31 Aug 2009 14:34:39 git-svn-id: svn://tug.org/texlive/trunk@15035 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/lcdf-typetools/ChangeLog.TL | 7 +++++++ Build/source/texk/lcdf-typetools/config.h.in | 3 +++ Build/source/texk/lcdf-typetools/configure | 7 ++++++- Build/source/texk/lcdf-typetools/configure.ac | 3 ++- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Build/source/texk/lcdf-typetools/ChangeLog.TL b/Build/source/texk/lcdf-typetools/ChangeLog.TL index 204108bf7c4..c5da67208fe 100644 --- a/Build/source/texk/lcdf-typetools/ChangeLog.TL +++ b/Build/source/texk/lcdf-typetools/ChangeLog.TL @@ -1,6 +1,13 @@ ChangeLog.TL: TeX Live (TL) changes for lcdf-typetools ====================================================== +2009-09-03 Karl Berry + + * configure.ac: AC_DEFINE(HAVE_KPATHSEA) if we have it, else + kpse stuff not really enabled, e.g., glyphlist.txt and + texnansx.enc not found + tlbuild mail from Jown Owens, 31 Aug 2009 14:34:39. + 2009-06-19 Peter Breitenlohner * configure.ac: enable compiler warnings (TeX Live style). diff --git a/Build/source/texk/lcdf-typetools/config.h.in b/Build/source/texk/lcdf-typetools/config.h.in index c379d614c17..65e35968d89 100644 --- a/Build/source/texk/lcdf-typetools/config.h.in +++ b/Build/source/texk/lcdf-typetools/config.h.in @@ -83,6 +83,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_IOSTREAM +/* Define if you want to use kpathsea. */ +#undef HAVE_KPATHSEA + /* Define to 1 if you have the `m' library (-lm). */ #undef HAVE_LIBM diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure index b3ad8ee8ff7..0cb3ca18a97 100755 --- a/Build/source/texk/lcdf-typetools/configure +++ b/Build/source/texk/lcdf-typetools/configure @@ -19899,7 +19899,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test "x$with_kpathsea" = xno; then - if test "x$enable_build" = xno; then + if test "x$enable_build" = xno; then { $as_echo "$as_me:$LINENO: WARNING: building lcdf-typetools has been disabled and would fail because ========================================= @@ -19944,6 +19944,11 @@ fi fi + +cat >>confdefs.h <<\_ACEOF +#define HAVE_KPATHSEA 1 +_ACEOF + fi if test "x$with_kpathsea" != xno; then have_kpathsea_TRUE= diff --git a/Build/source/texk/lcdf-typetools/configure.ac b/Build/source/texk/lcdf-typetools/configure.ac index e66ac466815..a81052d82d7 100644 --- a/Build/source/texk/lcdf-typetools/configure.ac +++ b/Build/source/texk/lcdf-typetools/configure.ac @@ -76,7 +76,7 @@ if test "x$with_kpathsea" != xno; then with_kpathsea=no]) if test "x$with_kpathsea" = xno; then - KPSE_MSG_ERROR([lcdf-typetools], [ + KPSE_MSG_ERROR([lcdf-typetools], [ ========================================= I can't find the kpathsea header and/or library files. Tell me where to look @@ -86,6 +86,7 @@ disable support using --without-kpathsea. =========================================]) fi + AC_DEFINE(HAVE_KPATHSEA, 1, [Define if you want to use kpathsea.]) fi AM_CONDITIONAL([have_kpathsea], [test "x$with_kpathsea" != xno]) -- cgit v1.2.3