ttf2pk ttf2pk2: Always first include <config.h>

git-svn-id: svn://tug.org/texlive/trunk@31054 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 15 insertions, 24 deletions

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;;