summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/ttf2pk/ChangeLog6
-rw-r--r--Build/source/texk/ttf2pk/Makefile.in20
-rw-r--r--Build/source/texk/ttf2pk/case.c4
-rw-r--r--Build/source/texk/ttf2pk/config.h.in (renamed from Build/source/texk/ttf2pk/c-auto.in)8
-rwxr-xr-xBuild/source/texk/ttf2pk/configure39
-rw-r--r--Build/source/texk/ttf2pk/configure.ac8
-rw-r--r--Build/source/texk/ttf2pk/errormsg.c4
-rw-r--r--Build/source/texk/ttf2pk/filesrch.c2
-rw-r--r--Build/source/texk/ttf2pk/ligkern.c4
-rw-r--r--Build/source/texk/ttf2pk/newobj.c4
-rw-r--r--Build/source/texk/ttf2pk/parse.c4
-rw-r--r--Build/source/texk/ttf2pk/pklib.c4
-rw-r--r--Build/source/texk/ttf2pk/subfont.c4
-rw-r--r--Build/source/texk/ttf2pk/texenc.c4
-rw-r--r--Build/source/texk/ttf2pk/tfmaux.c4
-rw-r--r--Build/source/texk/ttf2pk/ttf2pk.c4
-rw-r--r--Build/source/texk/ttf2pk/ttf2tfm.c4
-rw-r--r--Build/source/texk/ttf2pk/ttfaux.c4
-rw-r--r--Build/source/texk/ttf2pk/ttfenc.c4
-rw-r--r--Build/source/texk/ttf2pk/ttflib.c4
-rw-r--r--Build/source/texk/ttf2pk/vplaux.c4
-rw-r--r--Build/source/texk/ttf2pk2/ChangeLog6
-rw-r--r--Build/source/texk/ttf2pk2/Makefile.in20
-rw-r--r--Build/source/texk/ttf2pk2/case.c4
-rw-r--r--Build/source/texk/ttf2pk2/config.h.in (renamed from Build/source/texk/ttf2pk2/c-auto.in)8
-rwxr-xr-xBuild/source/texk/ttf2pk2/configure39
-rw-r--r--Build/source/texk/ttf2pk2/configure.ac6
-rw-r--r--Build/source/texk/ttf2pk2/errormsg.c4
-rw-r--r--Build/source/texk/ttf2pk2/filesrch.c2
-rw-r--r--Build/source/texk/ttf2pk2/ftlib.c4
-rw-r--r--Build/source/texk/ttf2pk2/ligkern.c4
-rw-r--r--Build/source/texk/ttf2pk2/newobj.c4
-rw-r--r--Build/source/texk/ttf2pk2/parse.c4
-rw-r--r--Build/source/texk/ttf2pk2/pklib.c4
-rw-r--r--Build/source/texk/ttf2pk2/subfont.c4
-rw-r--r--Build/source/texk/ttf2pk2/texenc.c4
-rw-r--r--Build/source/texk/ttf2pk2/tfmaux.c4
-rw-r--r--Build/source/texk/ttf2pk2/ttf2pk.c4
-rw-r--r--Build/source/texk/ttf2pk2/ttf2tfm.c4
-rw-r--r--Build/source/texk/ttf2pk2/ttfaux.c4
-rw-r--r--Build/source/texk/ttf2pk2/ttfenc.c4
-rw-r--r--Build/source/texk/ttf2pk2/ttflib.c4
-rw-r--r--Build/source/texk/ttf2pk2/vplaux.c4
43 files changed, 197 insertions, 91 deletions
diff --git a/Build/source/texk/ttf2pk/ChangeLog b/Build/source/texk/ttf2pk/ChangeLog
index a6ae0f58b89..4262eeb3db4 100644
--- a/Build/source/texk/ttf2pk/ChangeLog
+++ b/Build/source/texk/ttf2pk/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-30 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac, filesrch.c: Renamed c-auto.h => config.h.
+
+ * Include <config.h> first in all C files and never in headers.
+
2013-06-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* ac/withenable.ac: Disabled by default.
diff --git a/Build/source/texk/ttf2pk/Makefile.in b/Build/source/texk/ttf2pk/Makefile.in
index 477ef8d4017..0fcd0287046 100644
--- a/Build/source/texk/ttf2pk/Makefile.in
+++ b/Build/source/texk/ttf2pk/Makefile.in
@@ -83,7 +83,7 @@ bin_PROGRAMS = ttf2pk$(EXEEXT) ttf2tfm$(EXEEXT)
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
- $(srcdir)/c-auto.in $(top_srcdir)/../../build-aux/depcomp \
+ $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/depcomp \
$(dist_man1_MANS) $(dist_cfgdata_DATA) $(dist_encdata_DATA) \
$(dist_mapdata_DATA) $(dist_sfddata_DATA) \
$(top_srcdir)/../../build-aux/test-driver ChangeLog README \
@@ -114,7 +114,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = c-auto.h
+CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
@@ -213,7 +213,7 @@ MANS = $(dist_man1_MANS)
DATA = $(dist_cfgdata_DATA) $(dist_encdata_DATA) $(dist_mapdata_DATA) \
$(dist_sfddata_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
- $(LISP)c-auto.in
+ $(LISP)config.h.in
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
# *not* preserved.
@@ -623,7 +623,7 @@ EXTRA_DIST = $(TESTS) tests/GenR102.ttf tests/gentium-ec.enc \
tests/ipaexg-h.map tests/ipaexg-v.map BUGS MakeSub.in \
Makefile.dm dvidrv.btm dvidrv.doc emdir.c emdir.h emtexdir.c \
emtexdir.h ttf2pk.doc
-all: c-auto.h
+all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
@@ -663,20 +663,20 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
-c-auto.h: stamp-h1
+config.h: stamp-h1
@test -f $@ || rm -f stamp-h1
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
-stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status c-auto.h
-$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
distclean-hdr:
- -rm -f c-auto.h stamp-h1
+ -rm -f config.h stamp-h1
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -1296,7 +1296,7 @@ distcleancheck: distclean
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-am
-all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) c-auto.h
+all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(cfgdatadir)" "$(DESTDIR)$(encdatadir)" "$(DESTDIR)$(mapdatadir)" "$(DESTDIR)$(sfddatadir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
diff --git a/Build/source/texk/ttf2pk/case.c b/Build/source/texk/ttf2pk/case.c
index 496d1781bd8..3989f5ab4d6 100644
--- a/Build/source/texk/ttf2pk/case.c
+++ b/Build/source/texk/ttf2pk/case.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h> /* for definition of NULL */
#include "case.h"
diff --git a/Build/source/texk/ttf2pk/c-auto.in b/Build/source/texk/ttf2pk/config.h.in
index 8508e9e2c6d..345d6c19b90 100644
--- a/Build/source/texk/ttf2pk/c-auto.in
+++ b/Build/source/texk/ttf2pk/config.h.in
@@ -1,4 +1,4 @@
-/* c-auto.in. Generated from configure.ac by autoheader. */
+/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if the `closedir' function returns void instead of `int'. */
#undef CLOSEDIR_VOID
@@ -124,9 +124,6 @@
*/
#undef LT_OBJDIR
-/* Name of package */
-#undef PACKAGE
-
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
@@ -148,9 +145,6 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
-/* Version number of package */
-#undef VERSION
-
/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1
diff --git a/Build/source/texk/ttf2pk/configure b/Build/source/texk/ttf2pk/configure
index 2ccd21fb61f..51dd66c849d 100755
--- a/Build/source/texk/ttf2pk/configure
+++ b/Build/source/texk/ttf2pk/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ttf2pk for TeX Live 1.5.
+# Generated by GNU Autoconf 2.69 for ttf2pk (TeX Live) 1.5.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -588,10 +588,10 @@ MFLAGS=
MAKEFLAGS=
# Identity of this package.
-PACKAGE_NAME='ttf2pk for TeX Live'
-PACKAGE_TARNAME='ttf2pk-for-tex-live'
+PACKAGE_NAME='ttf2pk (TeX Live)'
+PACKAGE_TARNAME='ttf2pk--tex-live-'
PACKAGE_VERSION='1.5'
-PACKAGE_STRING='ttf2pk for TeX Live 1.5'
+PACKAGE_STRING='ttf2pk (TeX Live) 1.5'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -1332,7 +1332,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ttf2pk for TeX Live 1.5 to adapt to many kinds of systems.
+\`configure' configures ttf2pk (TeX Live) 1.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1381,7 +1381,7 @@ Fine tuning of the installation directories:
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root
- [DATAROOTDIR/doc/ttf2pk-for-tex-live]
+ [DATAROOTDIR/doc/ttf2pk--tex-live-]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1403,7 +1403,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ttf2pk for TeX Live 1.5:";;
+ short | recursive ) echo "Configuration of ttf2pk (TeX Live) 1.5:";;
esac
cat <<\_ACEOF
@@ -1525,7 +1525,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ttf2pk for TeX Live configure 1.5
+ttf2pk (TeX Live) configure 1.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2135,7 +2135,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ttf2pk for TeX Live $as_me 1.5, which was
+It was created by ttf2pk (TeX Live) $as_me 1.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -7624,19 +7624,10 @@ fi
# Define the identity of the package.
- PACKAGE='ttf2pk-for-tex-live'
+ PACKAGE='ttf2pk--tex-live-'
VERSION='1.5'
-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}"}
@@ -12925,7 +12916,7 @@ fi
-ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
+ac_config_headers="$ac_config_headers config.h"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing floor" >&5
@@ -13399,7 +13390,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-ttf2pk for TeX Live config.lt 1.5
+ttf2pk (TeX Live) config.lt 1.5
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -15037,7 +15028,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ttf2pk for TeX Live $as_me 1.5, which was
+This file was extended by ttf2pk (TeX Live) $as_me 1.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15103,7 +15094,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ttf2pk for TeX Live config.status 1.5
+ttf2pk (TeX Live) config.status 1.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -15514,7 +15505,7 @@ do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
- "c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS c-auto.h:c-auto.in" ;;
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
diff --git a/Build/source/texk/ttf2pk/configure.ac b/Build/source/texk/ttf2pk/configure.ac
index b6ec7d3ae68..8258d67ab3e 100644
--- a/Build/source/texk/ttf2pk/configure.ac
+++ b/Build/source/texk/ttf2pk/configure.ac
@@ -1,21 +1,21 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
-AC_INIT([ttf2pk for TeX Live], [1.5], [tex-k@tug.org])
+AC_INIT([ttf2pk (TeX Live)], [1.5], [tex-k@tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([ttf2pk.c])
AC_CONFIG_AUX_DIR([../../build-aux])
AC_CONFIG_MACRO_DIR([../../m4])
dnl Common code for all programs using libkpathsea.
-KPSE_COMMON([ttf2pk])
+KPSE_COMMON([ttf2pk], [no-define])
-AC_CONFIG_HEADERS([c-auto.h:c-auto.in])
+AC_CONFIG_HEADERS([config.h])
AC_SEARCH_LIBS([floor], [m])
diff --git a/Build/source/texk/ttf2pk/errormsg.c b/Build/source/texk/ttf2pk/errormsg.c
index 917036ca7d6..6dd9e266dd7 100644
--- a/Build/source/texk/ttf2pk/errormsg.c
+++ b/Build/source/texk/ttf2pk/errormsg.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stddef.h> /* for size_t */
#include <stdarg.h>
diff --git a/Build/source/texk/ttf2pk/filesrch.c b/Build/source/texk/ttf2pk/filesrch.c
index 07efe82d161..e2fa52b13a6 100644
--- a/Build/source/texk/ttf2pk/filesrch.c
+++ b/Build/source/texk/ttf2pk/filesrch.c
@@ -13,7 +13,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "c-auto.h"
+#include <config.h>
#endif
#include <stddef.h> /* for size_t */
diff --git a/Build/source/texk/ttf2pk/ligkern.c b/Build/source/texk/ttf2pk/ligkern.c
index 68c7f4245c2..788552e1855 100644
--- a/Build/source/texk/ttf2pk/ligkern.c
+++ b/Build/source/texk/ttf2pk/ligkern.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
#include <stdlib.h>
#include <stddef.h> /* for size_t */
diff --git a/Build/source/texk/ttf2pk/newobj.c b/Build/source/texk/ttf2pk/newobj.c
index 3639961c8cd..1c741f99e29 100644
--- a/Build/source/texk/ttf2pk/newobj.c
+++ b/Build/source/texk/ttf2pk/newobj.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h>
#include <stddef.h> /* for size_t */
#include <string.h>
diff --git a/Build/source/texk/ttf2pk/parse.c b/Build/source/texk/ttf2pk/parse.c
index 873bf27f9fe..5ecfd307d81 100644
--- a/Build/source/texk/ttf2pk/parse.c
+++ b/Build/source/texk/ttf2pk/parse.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h> /* for size_t */
diff --git a/Build/source/texk/ttf2pk/pklib.c b/Build/source/texk/ttf2pk/pklib.c
index 25b1c5c956c..49f64601729 100644
--- a/Build/source/texk/ttf2pk/pklib.c
+++ b/Build/source/texk/ttf2pk/pklib.c
@@ -39,6 +39,10 @@
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h> /* for size_t */
diff --git a/Build/source/texk/ttf2pk/subfont.c b/Build/source/texk/ttf2pk/subfont.c
index e99c6138b9e..9569d9f8bdc 100644
--- a/Build/source/texk/ttf2pk/subfont.c
+++ b/Build/source/texk/ttf2pk/subfont.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h> /* for size_t */
diff --git a/Build/source/texk/ttf2pk/texenc.c b/Build/source/texk/ttf2pk/texenc.c
index fa7fb8a5f17..d78fc0248f3 100644
--- a/Build/source/texk/ttf2pk/texenc.c
+++ b/Build/source/texk/ttf2pk/texenc.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h> /* for definition of NULL */
#include "ttf2tfm.h"
diff --git a/Build/source/texk/ttf2pk/tfmaux.c b/Build/source/texk/ttf2pk/tfmaux.c
index 314c105e9fb..fb379e2b07c 100644
--- a/Build/source/texk/ttf2pk/tfmaux.c
+++ b/Build/source/texk/ttf2pk/tfmaux.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/Build/source/texk/ttf2pk/ttf2pk.c b/Build/source/texk/ttf2pk/ttf2pk.c
index 40c81083bc6..02b06de36e8 100644
--- a/Build/source/texk/ttf2pk/ttf2pk.c
+++ b/Build/source/texk/ttf2pk/ttf2pk.c
@@ -10,6 +10,10 @@
* Copyright 2009 Peter Breitenlohner
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h> /* for size_t */
diff --git a/Build/source/texk/ttf2pk/ttf2tfm.c b/Build/source/texk/ttf2pk/ttf2tfm.c
index ebc92a10df9..50396f99436 100644
--- a/Build/source/texk/ttf2pk/ttf2tfm.c
+++ b/Build/source/texk/ttf2pk/ttf2tfm.c
@@ -19,6 +19,10 @@
* Adapted from afm2tfm by F. Loyer <loyer@ensta.fr>.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h> /* for size_t */
diff --git a/Build/source/texk/ttf2pk/ttfaux.c b/Build/source/texk/ttf2pk/ttfaux.c
index 39b666a3ae9..1e0108b4b26 100644
--- a/Build/source/texk/ttf2pk/ttfaux.c
+++ b/Build/source/texk/ttf2pk/ttfaux.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <math.h>
#include <string.h>
#include <stdlib.h>
diff --git a/Build/source/texk/ttf2pk/ttfenc.c b/Build/source/texk/ttf2pk/ttfenc.c
index 8439f3c146e..a1006f577c5 100644
--- a/Build/source/texk/ttf2pk/ttfenc.c
+++ b/Build/source/texk/ttf2pk/ttfenc.c
@@ -9,6 +9,10 @@
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/Build/source/texk/ttf2pk/ttflib.c b/Build/source/texk/ttf2pk/ttflib.c
index cce978fe843..ddae77bbb91 100644
--- a/Build/source/texk/ttf2pk/ttflib.c
+++ b/Build/source/texk/ttf2pk/ttflib.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/Build/source/texk/ttf2pk/vplaux.c b/Build/source/texk/ttf2pk/vplaux.c
index 9eef6e256fe..fb3ff8bb716 100644
--- a/Build/source/texk/ttf2pk/vplaux.c
+++ b/Build/source/texk/ttf2pk/vplaux.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <string.h>
#include <ctype.h>
diff --git a/Build/source/texk/ttf2pk2/ChangeLog b/Build/source/texk/ttf2pk2/ChangeLog
index 7b77bca01a5..5de6de713fe 100644
--- a/Build/source/texk/ttf2pk2/ChangeLog
+++ b/Build/source/texk/ttf2pk2/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-30 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac, filesrch.c: Renamed c-auto.h => config.h.
+
+ * Include <config.h> first in all C files and never in headers.
+
2013-06-27 Peter Breitenlohner <peb@mppmu.mpg.de>
Avoid compiler warnings (found by Mojca).
diff --git a/Build/source/texk/ttf2pk2/Makefile.in b/Build/source/texk/ttf2pk2/Makefile.in
index d92047874e8..9a73c355225 100644
--- a/Build/source/texk/ttf2pk2/Makefile.in
+++ b/Build/source/texk/ttf2pk2/Makefile.in
@@ -83,7 +83,7 @@ bin_PROGRAMS = ttf2pk$(EXEEXT) ttf2tfm$(EXEEXT)
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
- $(srcdir)/c-auto.in $(top_srcdir)/../../build-aux/depcomp \
+ $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/depcomp \
$(dist_man1_MANS) $(dist_cfgdata_DATA) $(dist_encdata_DATA) \
$(dist_mapdata_DATA) $(dist_sfddata_DATA) \
$(top_srcdir)/../../build-aux/test-driver ChangeLog README \
@@ -115,7 +115,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = c-auto.h
+CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
@@ -216,7 +216,7 @@ MANS = $(dist_man1_MANS)
DATA = $(dist_cfgdata_DATA) $(dist_encdata_DATA) $(dist_mapdata_DATA) \
$(dist_sfddata_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
- $(LISP)c-auto.in
+ $(LISP)config.h.in
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
# *not* preserved.
@@ -632,7 +632,7 @@ EXTRA_DIST = $(TESTS) tests/GenR102.ttf tests/gentium-ec.enc \
tests/ipaexg-h.map tests/ipaexg-v.map BUGS MakeSub.in \
Makefile.dm dvidrv.btm dvidrv.doc emdir.c emdir.h emtexdir.c \
emtexdir.h ttf2pk.doc
-all: c-auto.h
+all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
@@ -672,20 +672,20 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
-c-auto.h: stamp-h1
+config.h: stamp-h1
@test -f $@ || rm -f stamp-h1
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
-stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status c-auto.h
-$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
distclean-hdr:
- -rm -f c-auto.h stamp-h1
+ -rm -f config.h stamp-h1
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -1306,7 +1306,7 @@ distcleancheck: distclean
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-am
-all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) c-auto.h
+all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(cfgdatadir)" "$(DESTDIR)$(encdatadir)" "$(DESTDIR)$(mapdatadir)" "$(DESTDIR)$(sfddatadir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
diff --git a/Build/source/texk/ttf2pk2/case.c b/Build/source/texk/ttf2pk2/case.c
index 496d1781bd8..3989f5ab4d6 100644
--- a/Build/source/texk/ttf2pk2/case.c
+++ b/Build/source/texk/ttf2pk2/case.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h> /* for definition of NULL */
#include "case.h"
diff --git a/Build/source/texk/ttf2pk2/c-auto.in b/Build/source/texk/ttf2pk2/config.h.in
index 8508e9e2c6d..345d6c19b90 100644
--- a/Build/source/texk/ttf2pk2/c-auto.in
+++ b/Build/source/texk/ttf2pk2/config.h.in
@@ -1,4 +1,4 @@
-/* c-auto.in. Generated from configure.ac by autoheader. */
+/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if the `closedir' function returns void instead of `int'. */
#undef CLOSEDIR_VOID
@@ -124,9 +124,6 @@
*/
#undef LT_OBJDIR
-/* Name of package */
-#undef PACKAGE
-
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
@@ -148,9 +145,6 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
-/* Version number of package */
-#undef VERSION
-
/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1
diff --git a/Build/source/texk/ttf2pk2/configure b/Build/source/texk/ttf2pk2/configure
index 1201c22d0ea..19c0dea8c7b 100755
--- a/Build/source/texk/ttf2pk2/configure
+++ b/Build/source/texk/ttf2pk2/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ttf2pk2 for TeX Live 2.0.
+# Generated by GNU Autoconf 2.69 for ttf2pk2 (TeX Live) 2.0.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -588,10 +588,10 @@ MFLAGS=
MAKEFLAGS=
# Identity of this package.
-PACKAGE_NAME='ttf2pk2 for TeX Live'
-PACKAGE_TARNAME='ttf2pk2-for-tex-live'
+PACKAGE_NAME='ttf2pk2 (TeX Live)'
+PACKAGE_TARNAME='ttf2pk2--tex-live-'
PACKAGE_VERSION='2.0'
-PACKAGE_STRING='ttf2pk2 for TeX Live 2.0'
+PACKAGE_STRING='ttf2pk2 (TeX Live) 2.0'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -1338,7 +1338,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ttf2pk2 for TeX Live 2.0 to adapt to many kinds of systems.
+\`configure' configures ttf2pk2 (TeX Live) 2.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1387,7 +1387,7 @@ Fine tuning of the installation directories:
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root
- [DATAROOTDIR/doc/ttf2pk2-for-tex-live]
+ [DATAROOTDIR/doc/ttf2pk2--tex-live-]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1409,7 +1409,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ttf2pk2 for TeX Live 2.0:";;
+ short | recursive ) echo "Configuration of ttf2pk2 (TeX Live) 2.0:";;
esac
cat <<\_ACEOF
@@ -1532,7 +1532,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ttf2pk2 for TeX Live configure 2.0
+ttf2pk2 (TeX Live) configure 2.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2142,7 +2142,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ttf2pk2 for TeX Live $as_me 2.0, which was
+It was created by ttf2pk2 (TeX Live) $as_me 2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -7631,19 +7631,10 @@ fi
# Define the identity of the package.
- PACKAGE='ttf2pk2-for-tex-live'
+ PACKAGE='ttf2pk2--tex-live-'
VERSION='2.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}"}
@@ -12932,7 +12923,7 @@ fi
-ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
+ac_config_headers="$ac_config_headers config.h"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing floor" >&5
@@ -13406,7 +13397,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-ttf2pk2 for TeX Live config.lt 2.0
+ttf2pk2 (TeX Live) config.lt 2.0
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -15159,7 +15150,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ttf2pk2 for TeX Live $as_me 2.0, which was
+This file was extended by ttf2pk2 (TeX Live) $as_me 2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15225,7 +15216,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ttf2pk2 for TeX Live config.status 2.0
+ttf2pk2 (TeX Live) config.status 2.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -15636,7 +15627,7 @@ do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
- "c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS c-auto.h:c-auto.in" ;;
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
diff --git a/Build/source/texk/ttf2pk2/configure.ac b/Build/source/texk/ttf2pk2/configure.ac
index a3d6feda68a..3c5bc733c96 100644
--- a/Build/source/texk/ttf2pk2/configure.ac
+++ b/Build/source/texk/ttf2pk2/configure.ac
@@ -6,16 +6,16 @@ dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
-AC_INIT([ttf2pk2 for TeX Live], [2.0], [tex-k@tug.org])
+AC_INIT([ttf2pk2 (TeX Live)], [2.0], [tex-k@tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([ttf2pk.c])
AC_CONFIG_AUX_DIR([../../build-aux])
AC_CONFIG_MACRO_DIR([../../m4])
dnl Common code for all programs using libkpathsea.
-KPSE_COMMON([ttf2pk])
+KPSE_COMMON([ttf2pk], [no-define])
-AC_CONFIG_HEADERS([c-auto.h:c-auto.in])
+AC_CONFIG_HEADERS([config.h])
AC_SEARCH_LIBS([floor], [m])
diff --git a/Build/source/texk/ttf2pk2/errormsg.c b/Build/source/texk/ttf2pk2/errormsg.c
index 917036ca7d6..6dd9e266dd7 100644
--- a/Build/source/texk/ttf2pk2/errormsg.c
+++ b/Build/source/texk/ttf2pk2/errormsg.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stddef.h> /* for size_t */
#include <stdarg.h>
diff --git a/Build/source/texk/ttf2pk2/filesrch.c b/Build/source/texk/ttf2pk2/filesrch.c
index 07efe82d161..e2fa52b13a6 100644
--- a/Build/source/texk/ttf2pk2/filesrch.c
+++ b/Build/source/texk/ttf2pk2/filesrch.c
@@ -13,7 +13,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "c-auto.h"
+#include <config.h>
#endif
#include <stddef.h> /* for size_t */
diff --git a/Build/source/texk/ttf2pk2/ftlib.c b/Build/source/texk/ttf2pk2/ftlib.c
index e1011876c5c..a0c5aaad065 100644
--- a/Build/source/texk/ttf2pk2/ftlib.c
+++ b/Build/source/texk/ttf2pk2/ftlib.c
@@ -11,6 +11,10 @@
* Peter Breitenlohner <tex-live@tug.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/Build/source/texk/ttf2pk2/ligkern.c b/Build/source/texk/ttf2pk2/ligkern.c
index 68c7f4245c2..788552e1855 100644
--- a/Build/source/texk/ttf2pk2/ligkern.c
+++ b/Build/source/texk/ttf2pk2/ligkern.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
#include <stdlib.h>
#include <stddef.h> /* for size_t */
diff --git a/Build/source/texk/ttf2pk2/newobj.c b/Build/source/texk/ttf2pk2/newobj.c
index 35ecf15b284..c23a8c67b77 100644
--- a/Build/source/texk/ttf2pk2/newobj.c
+++ b/Build/source/texk/ttf2pk2/newobj.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h>
#include <stddef.h> /* for size_t */
#include <string.h>
diff --git a/Build/source/texk/ttf2pk2/parse.c b/Build/source/texk/ttf2pk2/parse.c
index 873bf27f9fe..5ecfd307d81 100644
--- a/Build/source/texk/ttf2pk2/parse.c
+++ b/Build/source/texk/ttf2pk2/parse.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h> /* for size_t */
diff --git a/Build/source/texk/ttf2pk2/pklib.c b/Build/source/texk/ttf2pk2/pklib.c
index 25b1c5c956c..49f64601729 100644
--- a/Build/source/texk/ttf2pk2/pklib.c
+++ b/Build/source/texk/ttf2pk2/pklib.c
@@ -39,6 +39,10 @@
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h> /* for size_t */
diff --git a/Build/source/texk/ttf2pk2/subfont.c b/Build/source/texk/ttf2pk2/subfont.c
index e99c6138b9e..9569d9f8bdc 100644
--- a/Build/source/texk/ttf2pk2/subfont.c
+++ b/Build/source/texk/ttf2pk2/subfont.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h> /* for size_t */
diff --git a/Build/source/texk/ttf2pk2/texenc.c b/Build/source/texk/ttf2pk2/texenc.c
index fa7fb8a5f17..d78fc0248f3 100644
--- a/Build/source/texk/ttf2pk2/texenc.c
+++ b/Build/source/texk/ttf2pk2/texenc.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h> /* for definition of NULL */
#include "ttf2tfm.h"
diff --git a/Build/source/texk/ttf2pk2/tfmaux.c b/Build/source/texk/ttf2pk2/tfmaux.c
index 314c105e9fb..fb379e2b07c 100644
--- a/Build/source/texk/ttf2pk2/tfmaux.c
+++ b/Build/source/texk/ttf2pk2/tfmaux.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/Build/source/texk/ttf2pk2/ttf2pk.c b/Build/source/texk/ttf2pk2/ttf2pk.c
index e2a62017450..2224ca275f2 100644
--- a/Build/source/texk/ttf2pk2/ttf2pk.c
+++ b/Build/source/texk/ttf2pk2/ttf2pk.c
@@ -11,6 +11,10 @@
* Peter Breitenlohner <tex-live@tug.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h> /* for size_t */
diff --git a/Build/source/texk/ttf2pk2/ttf2tfm.c b/Build/source/texk/ttf2pk2/ttf2tfm.c
index 116fa128cb6..fa490a443bb 100644
--- a/Build/source/texk/ttf2pk2/ttf2tfm.c
+++ b/Build/source/texk/ttf2pk2/ttf2tfm.c
@@ -21,6 +21,10 @@
* Adapted from afm2tfm by F. Loyer <loyer@ensta.fr>.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h> /* for size_t */
diff --git a/Build/source/texk/ttf2pk2/ttfaux.c b/Build/source/texk/ttf2pk2/ttfaux.c
index 943dabb6f5b..b249f243daa 100644
--- a/Build/source/texk/ttf2pk2/ttfaux.c
+++ b/Build/source/texk/ttf2pk2/ttfaux.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
#include <stdlib.h>
diff --git a/Build/source/texk/ttf2pk2/ttfenc.c b/Build/source/texk/ttf2pk2/ttfenc.c
index 8439f3c146e..a1006f577c5 100644
--- a/Build/source/texk/ttf2pk2/ttfenc.c
+++ b/Build/source/texk/ttf2pk2/ttfenc.c
@@ -9,6 +9,10 @@
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/Build/source/texk/ttf2pk2/ttflib.c b/Build/source/texk/ttf2pk2/ttflib.c
index b36b0c72f0c..0d7f9ead9e7 100644
--- a/Build/source/texk/ttf2pk2/ttflib.c
+++ b/Build/source/texk/ttf2pk2/ttflib.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/Build/source/texk/ttf2pk2/vplaux.c b/Build/source/texk/ttf2pk2/vplaux.c
index ffe6d539502..18a21081d2d 100644
--- a/Build/source/texk/ttf2pk2/vplaux.c
+++ b/Build/source/texk/ttf2pk2/vplaux.c
@@ -8,6 +8,10 @@
* Werner Lemberg <wl@gnu.org>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <string.h>
#include <ctype.h>