diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-03-15 09:17:35 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-03-15 09:17:35 +0000 |
commit | 95a8b31937a6d0c7d0b864a3e37b2a27e283c18e (patch) | |
tree | 3f931b333d872bcc67e83f61e1398849daaae395 /Build | |
parent | d619a29f629a91738e9a0a105471f70202c3ed6d (diff) |
lcdf-typetools: minor build system fix
git-svn-id: svn://tug.org/texlive/trunk@17459 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/texk/lcdf-typetools/ChangeLog.TL | 5 | ||||
-rw-r--r-- | Build/source/texk/lcdf-typetools/config.h.in | 6 | ||||
-rw-r--r-- | Build/source/texk/lcdf-typetools/configure.ac | 2 | ||||
-rw-r--r-- | Build/source/texk/lcdf-typetools/include/efont/otfdata.hh | 21 |
4 files changed, 18 insertions, 16 deletions
diff --git a/Build/source/texk/lcdf-typetools/ChangeLog.TL b/Build/source/texk/lcdf-typetools/ChangeLog.TL index 4cc8f856d8b..ab1b6dcaeb7 100644 --- a/Build/source/texk/lcdf-typetools/ChangeLog.TL +++ b/Build/source/texk/lcdf-typetools/ChangeLog.TL @@ -3,6 +3,11 @@ ChangeLog.TL: TeX Live (TL) changes for lcdf-typetools 2010-02-21 Peter Breitenlohner <peb@mppmu.mpg.de> + * include/efont/otfdata.hh [WIN32]: From lcdf-typetools-2.83pre. + * configure.ac: Fixed typo in generated AC_DEFINE descriptions. + +2010-02-21 Peter Breitenlohner <peb@mppmu.mpg.de> + Various MinGW32 (cross) build fixes. * configure.ac, include/efont/otfdata.hh: MinGW32 has <sys/param.h> but also needs <winsock2.h>. diff --git a/Build/source/texk/lcdf-typetools/config.h.in b/Build/source/texk/lcdf-typetools/config.h.in index fd076efe610..a4a2232235b 100644 --- a/Build/source/texk/lcdf-typetools/config.h.in +++ b/Build/source/texk/lcdf-typetools/config.h.in @@ -18,13 +18,13 @@ /* Define to 1 if you have the <assert.h> header file. */ #undef HAVE_ASSERT_H -/* Define to run cfftot1from otftotfm. */ +/* Define to run cfftot1 from otftotfm. */ #undef HAVE_AUTO_CFFTOT1 -/* Define to run t1dotlessjfrom otftotfm. */ +/* Define to run t1dotlessj from otftotfm. */ #undef HAVE_AUTO_T1DOTLESSJ -/* Define to run updmapfrom otftotfm. */ +/* Define to run updmap from otftotfm. */ #undef HAVE_AUTO_UPDMAP /* Define to 1 if you have the `bcmp' function. */ diff --git a/Build/source/texk/lcdf-typetools/configure.ac b/Build/source/texk/lcdf-typetools/configure.ac index ba434716447..da88626e40d 100644 --- a/Build/source/texk/lcdf-typetools/configure.ac +++ b/Build/source/texk/lcdf-typetools/configure.ac @@ -43,7 +43,7 @@ AC_SUBST(SELECTED_SUBDIRS) AC_FOREACH([Kpse_Opt], kpse_otftotfm_auto_opts, [AS_IF([test "x$enable_auto_]Kpse_Opt[" != xno], [AC_DEFINE([HAVE_AUTO_]AS_TR_CPP(Kpse_Opt), 1, - [Define to run ]Kpse_Opt[from otftotfm.])]) + [Define to run ]Kpse_Opt[ from otftotfm.])]) ]) dnl diff --git a/Build/source/texk/lcdf-typetools/include/efont/otfdata.hh b/Build/source/texk/lcdf-typetools/include/efont/otfdata.hh index e804b29136a..18fd894d5d2 100644 --- a/Build/source/texk/lcdf-typetools/include/efont/otfdata.hh +++ b/Build/source/texk/lcdf-typetools/include/efont/otfdata.hh @@ -14,19 +14,16 @@ # include <byteorder.h> #elif HAVE_NETINET_IN_H # include <netinet/in.h> -// MinGW32 has <sys/param.h> but also needs <winsock2.h> -#elif defined(HAVE_SYS_PARAM_H) || defined(WIN32) -# if defined(HAVE_SYS_PARAM_H) -# include <sys/param.h> -# endif -# if defined(WIN32) -# ifdef __MSC_VER -# pragma warning (disable: 4290) -# endif -# include <winsock2.h> +#elif HAVE_SYS_PARAM_H +# include <sys/param.h> +#elif !defined(WIN32) +# error "configury disaster! Report this error to ekohler@gmail.com" +#endif +#ifdef WIN32 +# ifdef __MSC_VER +# pragma warning (disable: 4290) # endif -#else -# error "configury disaster! Report this error to kohler@icir.org" +# include <winsock2.h> #endif class ErrorHandler; namespace Efont { namespace OpenType { |