summaryrefslogtreecommitdiff
path: root/Build/source/texk/xdv2pdf
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2008-02-29 15:40:00 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2008-02-29 15:40:00 +0000
commit2b049d253dc2dfcbddc656ee3bffedf9f65a67b2 (patch)
tree11d05560a28146f8bb03fe436ae00e5e5ffd2712 /Build/source/texk/xdv2pdf
parentb18fbbf19bcc21a491e8c0145b1d7b2d3507ef21 (diff)
next step in autotools update
add autoheader in reautoconf script and maintainer rules (maintainer mode still has some problems) remove need for acconfig.h (templates via AC_DEFINE) svn:ignore atom4te.cache directories reautoconf of the whole tree git-svn-id: svn://tug.org/texlive/trunk@6773 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/xdv2pdf')
-rw-r--r--Build/source/texk/xdv2pdf/ChangeLog10
-rw-r--r--Build/source/texk/xdv2pdf/acconfig.h.dist (renamed from Build/source/texk/xdv2pdf/acconfig.h)0
-rw-r--r--Build/source/texk/xdv2pdf/c-auto.in91
-rw-r--r--Build/source/texk/xdv2pdf/config.h11
-rwxr-xr-xBuild/source/texk/xdv2pdf/configure28
-rw-r--r--Build/source/texk/xdv2pdf/configure.in16
-rw-r--r--Build/source/texk/xdv2pdf/stamp-aclocal1
-rw-r--r--Build/source/texk/xdv2pdf/stamp-auto.in1
8 files changed, 126 insertions, 32 deletions
diff --git a/Build/source/texk/xdv2pdf/ChangeLog b/Build/source/texk/xdv2pdf/ChangeLog
index 70bdc630687..e5f4d01c1a0 100644
--- a/Build/source/texk/xdv2pdf/ChangeLog
+++ b/Build/source/texk/xdv2pdf/ChangeLog
@@ -1,3 +1,13 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ The Makefile.in uses `kpse_include ../make/config.mk'; thus
+ autoheader most generate c-auto.in.
+ * config.h (new): includes the autogenerated c-auto.h.
+ * configure.in: removed `--enable-maint', added AC_DEFINES's
+ third arg to provide autoheader templates ...
+ * acconfig.h (removed): ... renamed ...
+ * acconfig.h.dist (new): ... into this.
+
2008-01-31 Peter Breitenlohner <peb@mppmu.mpg.de>
Convert from autoconf-2.13 to autoconf-2.59+:
diff --git a/Build/source/texk/xdv2pdf/acconfig.h b/Build/source/texk/xdv2pdf/acconfig.h.dist
index ee49123b348..ee49123b348 100644
--- a/Build/source/texk/xdv2pdf/acconfig.h
+++ b/Build/source/texk/xdv2pdf/acconfig.h.dist
diff --git a/Build/source/texk/xdv2pdf/c-auto.in b/Build/source/texk/xdv2pdf/c-auto.in
index 9c30520187e..8a639db0d1b 100644
--- a/Build/source/texk/xdv2pdf/c-auto.in
+++ b/Build/source/texk/xdv2pdf/c-auto.in
@@ -1,4 +1,89 @@
-/* c-auto.in. Generated automatically from configure.in by autoheader. */
+/* c-auto.in. Generated from configure.in by autoheader. */
-/* The number of bytes in a int. */
-#undef SIZEOF_INT
+/* Define if you have Carbon */
+#undef HAVE_CARBON
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* define if you have kpathsea */
+#undef HAVE_KPATHSEA
+
+/* define if kpathsea supports type1 and vf formats */
+#undef HAVE_KPSE_FORMATS
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define if you have QuickTime */
+#undef HAVE_QUICKTIME
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strspn' function. */
+#undef HAVE_STRSPN
+
+/* Define to 1 if you have the `system' function. */
+#undef HAVE_SYSTEM
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* define if you have kpathsea */
+#undef KPATHSEA
+
+/* package name */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+#undef TM_IN_SYS_TIME
+
+/* package version */
+#undef VERSION
+
+/* Define to 1 if your processor stores words with the most significant byte
+ first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#undef size_t
diff --git a/Build/source/texk/xdv2pdf/config.h b/Build/source/texk/xdv2pdf/config.h
new file mode 100644
index 00000000000..fa9f370a239
--- /dev/null
+++ b/Build/source/texk/xdv2pdf/config.h
@@ -0,0 +1,11 @@
+/* config.h:
+ * In the original package this file is generated by autoheader.
+ * When part of the teTeX / TeX live tree, we simply include
+ * c-auto.h as generted by autoheader and configure. */
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+
+#include "c-auto.h"
+
+#endif /* _CONFIG_H */
diff --git a/Build/source/texk/xdv2pdf/configure b/Build/source/texk/xdv2pdf/configure
index 4c1ac4654ca..88b6022e879 100755
--- a/Build/source/texk/xdv2pdf/configure
+++ b/Build/source/texk/xdv2pdf/configure
@@ -651,7 +651,6 @@ build_alias
host_alias
target_alias
VERSION
-MAINT
CC
CFLAGS
LDFLAGS
@@ -1251,11 +1250,6 @@ if test -n "$ac_init_help"; then
cat <<\_ACEOF
-Optional Features:
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-maint enable autoconf portions of Makefile
-
Some influential environment variables:
CC C compiler command
CFLAGS C compiler flags
@@ -1695,25 +1689,18 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
VERSION="0.991"
+
cat >>confdefs.h <<\_ACEOF
#define VERSION "0.991"
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define PACKAGE "xdv2pdf"
_ACEOF
-ac_config_headers="$ac_config_headers config.h"
-
-
-# Check whether --enable-maint was given.
-if test "${enable_maint+set}" = set; then
- enableval=$enable_maint; MAINT=''
-else
- MAINT='#'
-fi
-
+ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
@@ -4211,14 +4198,17 @@ echo "${ECHO_T}no" >&6; }
fi
+
cat >>confdefs.h <<\_ACEOF
#define KPATHSEA 1
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_KPATHSEA 1
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_KPSE_FORMATS 1
_ACEOF
@@ -6050,7 +6040,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF
for ac_config_target in $ac_config_targets
do
case $ac_config_target in
- "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ "c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS c-auto.h:c-auto.in" ;;
"Makefile.aux") CONFIG_FILES="$CONFIG_FILES Makefile.aux:Makefile.in" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.aux" ;;
@@ -6152,7 +6142,6 @@ build_alias!$build_alias$ac_delim
host_alias!$host_alias$ac_delim
target_alias!$target_alias$ac_delim
VERSION!$VERSION$ac_delim
-MAINT!$MAINT$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
LDFLAGS!$LDFLAGS$ac_delim
@@ -6176,7 +6165,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -6577,6 +6566,7 @@ echo "$as_me: $ac_file is unchanged" >&6;}
case $ac_file$ac_mode in
+ "c-auto.h":H) date >stamp-auto ;;
"Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
kpse_input=`case Makefile.in in
[\\/$]*) # Absolute
diff --git a/Build/source/texk/xdv2pdf/configure.in b/Build/source/texk/xdv2pdf/configure.in
index 776a5b255a2..06c91f38f34 100644
--- a/Build/source/texk/xdv2pdf/configure.in
+++ b/Build/source/texk/xdv2pdf/configure.in
@@ -5,14 +5,10 @@ define([_version_],"0.991")
VERSION=_version_
AC_SUBST(VERSION)
-AC_DEFINE(VERSION,_version_)
-AC_DEFINE(PACKAGE,"xdv2pdf")
+AC_DEFINE(VERSION, _version_, [package version])
+AC_DEFINE(PACKAGE, "xdv2pdf", [package name])
-AC_CONFIG_HEADERS([config.h])
-
-AC_ARG_ENABLE(maint, [ --enable-maint enable autoconf portions of Makefile],
- [MAINT=''], [MAINT='#'])
-AC_SUBST(MAINT)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
dnl First, check if we're configuring on Mac OS X -- can't build elsewhere
@@ -38,9 +34,9 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
-AC_DEFINE(KPATHSEA)
-AC_DEFINE(HAVE_KPATHSEA)
-AC_DEFINE(HAVE_KPSE_FORMATS)
+AC_DEFINE([KPATHSEA], 1, [define if you have kpathsea])
+AC_DEFINE([HAVE_KPATHSEA], 1, [define if you have kpathsea])
+AC_DEFINE([HAVE_KPSE_FORMATS], 1, [define if kpathsea supports type1 and vf formats])
TTF_OPT=''
AC_SUBST(TTF_OPT)
diff --git a/Build/source/texk/xdv2pdf/stamp-aclocal b/Build/source/texk/xdv2pdf/stamp-aclocal
new file mode 100644
index 00000000000..ad1b31d0cc3
--- /dev/null
+++ b/Build/source/texk/xdv2pdf/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:37:39 CET 2008
diff --git a/Build/source/texk/xdv2pdf/stamp-auto.in b/Build/source/texk/xdv2pdf/stamp-auto.in
new file mode 100644
index 00000000000..477f7088184
--- /dev/null
+++ b/Build/source/texk/xdv2pdf/stamp-auto.in
@@ -0,0 +1 @@
+Fri Feb 29 13:37:40 CET 2008