[tex-k] Moving towards Autoconf-2.59

Peter Breitenlohner peb at mppmu.mpg.de
Thu Feb 24 12:14:42 CET 2005


On Fri, 18 Feb 2005, Olaf Weber wrote:

> Karl Berry writes:
>
>>> meanwhile it occured to me, that the present autoconf-2.59 provides
>>> everything we need for ac_include without any need to split the Makefiles.
>
>> Sounds excellent.  I guess it is Olaf who has the final word.
>
> I'll look at it, but you'll have to forgive me if it ends up taking
> some time....

Hi Olaf, Karl, Thomas, Sebastian,

I'd really like to get this project under way, before the web2c/teTeX/TeX-Live
CVSs start to diverge too much from what is in the teTeX-3.0 tarball.

Attached is a bunch of patches for teTeX-3.0 (as in tetex-src-3.0.tar.gz
from Feb 16). Where relevant, the patches are split into two parts, one for
the web2c subtree (i.e., everything in web2c-7.5.4-*.tar.gz as of Jan 21),
and the other for the remaining part of the teTeX tree.

I propose to proceed as follows:

1. Fix some glitches in teTeX-3.0:
    ==============================

patch-03-AC_xxSET_CC:

 	Remove AC_UNSET_CC and AC_RESET_CC from acsite.m4, because:

 	(1) they are already present in acspecific.m4, and

 	(2) the copy in acsite.m4 is broken (split & truncated lines)

patch-03-gd:

 	Include libs/gd/withenable.ac and libs/gd/gd.ac in libs/configure.in

 	Otherwise libs/gd is configured unconditionally

2. Prepare for autoconf-2.5x -- step 1
    ===================================

2.1. Enhance the current patched autoconf-2.13 such that it accepts some
relevant autoconf-2.59 constructs

patch-04-prepare1-autoconf:

 	1. acgeneral.m4:

 	Define AC_CONFIG_HEADERS(HEADERS..., [COMMANDS], [INIT-CMDS])
 	and obsolete AC_CONFIG_HEADER

 	Define AC_CONFIG_FILES(FILE..., [COMMANDS], [INIT-CMDS])
 	and obsolete AC_OUTPUT with arguments

 	Add kpse_include substitution and obsolete ac_include

 	Allow env vars on the command line, e.g., CFLAGS='-O2 -Wall',
 	as passed to sub-configure by autoconf-2.59

 	Allow constructs like
 		if test ...; then
 			AC_CONFIG_FILES(FILE..., [COMMANDS], [INIT-CMDS])
 			AC_CONFIG_SUBDIRS(DIR...)
 		fi
 	as in autoconf-2.59

 	2. acsite.m4

 	Add KPSE_CONFIG_FILES, for the moment just another name
 	for AC_CONFIG_FILES. When switching to autoconf-2.5x,
 	KPSE_CONFIG_FILES will be with kpse_include substitutions,
 	whereas AC_CONFIG_FILES will be without.

2.2. Provide autoconf-2.59 M4 macros for KPSE

patch-04-prepare1-m4:

 	M4 macros for KPSE with autoconf-2.59, mostly copied
 	from acgeneral.m4 and acsite.m4

3. Prepare for autoconf-2.5x -- step 2
    ===================================

patch-05-prepare2-include-{web2c,teTeX}:

 	Replace
 		ac_include FILE
 	by
 		kpse_include FILE

patch-06-prepare2-config-{web2c,teTeX}:

 	1. Replace
 		AC_CONFIG_HEADER(FILE)
 		...
 		COMMANDS_AT_END
 	by
 		AC_CONFIG_HEADERS([FILE], [COMMANDS_AT_END])
 	and similar

 	2. Replace
 		AC_OUTPUT(FILES)
 	by
 		KPSE_CONFIG_FILES([some FILES])
 		AC_CONFIG_FILES([other FILES])
 		AC_OUTPUT
 	where KPSE_CONFIG_FILES enables kpse_include substitutions

4. Prepare for autoconf-2.5x -- step 3
    ===================================

patch-07-prepare3-quote-{web2c,teTeX}:

 	Quote all arguments of AC_ARG_WITH and AC_ARG_ENABLE.

5. Prepare for autoconf-2.5x -- step 4
    ===================================

patch-08-prepare4-literal-web2c:

 	Avoid as much as possible shell variables as arguments of
 		KPSE_CONFIG_FILES
 		AC_CONFIG_FILES
 		AC_CONFIG_SUBDIRS

--------------------------------------------------------------

With these patches I have reached a situation where almost the whole teTeX
tree can be autoconf'ed with V-2.13 as before, and most of it can
alternatively be autoconf'ed with V-2.59.

I was using the attached "reautoconf" script as substitute for the one at
the root of the teTeX tree. (I have omitted some parts present in the
original, most notably the cache-file handling; since V-2.59 by default uses
/dev/null that wasn't much of a problem for me.)

This script autoconf's every directory containing a "configure.in" except
 	utils/texi{nfo,2html} which are automade and autoconf'ed with V-2.59
and
 	libs/ncurses which needs some strange autoconf version.

At the moment these directories are always autoconf'ed with V-2.13:
 	texk/{dvip{dfm,ng},xdvik}
because (i) they come with a non-trivial aclocal.m4, (ii) the current
aclocal-1.9.4 cannot handle configure.in with sinclude, and (iii) I have not
yet figured out how to best add the required additional macros to aclocal.m4
by hand (although that last point shouldn't be too difficult).

--------------------------------------------------------------

Attached are the logs autoconf-2.{13,59}-log obtained by running "reautoconf
old" with V-2.13 only and "reautoconf new" mostly with V-2.59.

In either case a subsequent
../SRC/configure --enable-shared --disable-static --with-x \
 	--without-texinfo --without-dialog --with-etex \
 	--without-cxx-runtime-hack --without-mf-nowin \
 	--enable-a4 --disable-auto-core --disable-dump-share \
 	--disable-multiplatform --disable-magick \
 	--with-mf-x-toolkit=yes --with-xdvi-x-toolkit=xaw \
 	--with-system-ncurses --with-system-pnglib \
 	--with-system-t1lib --with-system-zlib --with-system-gd
works fine, as does
 	make; make check

--------------------------------------------------------------

I have tested all this on ix86-gnu-linux, and testing on other systems will
certainly be required.

I haven't done anything for the non-teTeX part of TeX-Live, but the modified
V-2.13 should work with the unmodified {configure,Makefile}.in's, just
producing some warnings that ac_include, AC_CONFIG_HEADER, and AC_OUTPUT
with arguments are obsolete and should be replaced.

Such modifications (plus proper m4 quoting) can then be done for individual
directories, thereby allowing them to be autoconf'ed with either version.

regards
Peter Breitenlohner <peb at mppmu.mpg.de>
-------------- next part --------------
	Remove AC_UNSET_CC and AC_RESET_CC from acsite.m4, because:

	(1) they are already present in acspecific.m4, and

	(2) the copy in acsite.m4 is broken (split & truncated lines)

diff -ur -N tetex-src-3.0/texk/etc/autoconf.orig/acsite.m4 tetex-src-3.0/texk/etc/autoconf/acsite.m4
--- tetex-src-3.0/texk/etc/autoconf.orig/acsite.m4	2004-07-04 12:24:57.000000000 +0200
+++ tetex-src-3.0/texk/etc/autoconf/acsite.m4	2005-02-20 00:06:59.000000000 +0100
@@ -15,8 +15,7 @@
 
 dnl Check if gcc asm for i386 needs external symbols with an underscore.
 dnl Peter Breitenlohner, April 15, 1996.
-undefine([pb_AC_ASM_UNDERSCORE])
-AC_DEFUN(pb_AC_ASM_UNDERSCORE,
+AC_DEFUN([pb_AC_ASM_UNDERSCORE],
 [AC_REQUIRE_CPP()dnl
 AC_CACHE_CHECK(whether gcc asm needs underscore, pb_cv_asm_underscore,
 [
@@ -76,29 +75,6 @@
 ]
 )
 
-dnl Following two are copied from 'acspecific.m4'. --Roozbeh Pournader
-
-dnl Unset CC to run configure with cross compiler.
-AC_DEFUN(AC_UNSET_CC, [
-ZZ=
-if test "$cross_compiling" = yes &&
-   (test "x$CC" = "xdos-gcc" || test "x$CC" = "xi386-mingw32-gcc" || test
-"x$CC" = "xgnuwin32gcc"
-ZZ=$CC
-unset CC
-cross_compiling=no
-fi
-])
-
-dnl Restore CC that has been unset by AC_UNSET_CC
-AC_DEFUN(AC_RESET_CC, [
-if test "x$ZZ" = "xdos-gcc" || test "x$ZZ" = "xi386-mingw32-gcc" || test
-"x$ZZ" = "xgnuwin32gcc"
-CC=$ZZ
-cross_compiling=yes
-fi		 
-])		 
-
 dnl The following three macros are copied from Thomas Dickey's autoconf
 dnl patches at:
 dnl 	http://dickey.his.com/autoconf/autoconf.html
-------------- next part --------------
	Include libs/gd/withenable.ac and libs/gd/gd.ac in libs/configure.in

	Otherwise libs/gd is configured unconditionally

diff -ur -N -x configure -x aclocal.m4 -x autom4te.cache tetex-src-3.0.orig/libs/configure.in tetex-src-3.0/libs/configure.in
--- tetex-src-3.0.orig/libs/configure.in	2004-12-07 20:58:58.000000000 +0100
+++ tetex-src-3.0/libs/configure.in	2005-02-18 09:06:20.000000000 +0100
@@ -20,6 +20,8 @@
 sinclude(libpng/libpng.ac)
 sinclude(zlib/withenable.ac)
 sinclude(zlib/zlib.ac)
+sinclude(gd/withenable.ac)
+sinclude(gd/gd.ac)
 sinclude(freetype/withenable.ac)
 sinclude(freetype/freetype.ac)
 
-------------- next part --------------
	Prepare for autoconf-2.5x -- step 1 -- autoconf

	1. acgeneral.m4:

	Define AC_CONFIG_HEADERS(HEADERS..., [COMMANDS], [INIT-CMDS])
	and obsolete AC_CONFIG_HEADER

	Define AC_CONFIG_FILES(FILE..., [COMMANDS], [INIT-CMDS])
	and obsolete AC_OUTPUT with arguments

	Add kpse_include substitution and obsolete ac_include

	Allow env vars on the command line, e.g., CFLAGS='-O2 -Wall',
	as passed to sub-configure by autoconf-2.59

	Allow constructs like
		if test ...; then
			AC_CONFIG_FILES(FILE..., [COMMANDS], [INIT-CMDS])
			AC_CONFIG_SUBDIRS(DIR...)
		fi
	as in autoconf-2.59

	2. acsite.m4

	Add KPSE_CONFIG_FILES, for the moment just another name
	for AC_CONFIG_FILES. When switching to autoconf-2.5x,
	KPSE_CONFIG_FILES will be with kpse_include substitutions,
	whereas AC_CONFIG_FILES will be without.
 
diff -ur -N -x configure -x aclocal.m4 -x autom4te.cache tetex-src-3.0.orig/texk/etc/autoconf/acgeneral.m4 tetex-src-3.0/texk/etc/autoconf/acgeneral.m4
--- tetex-src-3.0.orig/texk/etc/autoconf/acgeneral.m4	2003-10-18 02:13:57.000000000 +0200
+++ tetex-src-3.0/texk/etc/autoconf/acgeneral.m4	2005-02-23 23:05:52.000000000 +0100
@@ -206,6 +206,7 @@
 mandir='${prefix}/man'
 
 # Initialize some other variables.
+ac_config_files=
 subdirs=
 MFLAGS= MAKEFLAGS=
 SHELL=${CONFIG_SHELL-/bin/sh}
@@ -550,6 +551,18 @@
   -*) AC_MSG_ERROR([$ac_option: invalid option; use --help to show usage])
     ;;
 
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([[^=]]*\)='`
+    # Reject names that are not valid shell variable names.
+changequote(, )dnl
+    if test -n "`echo $ac_envvar| sed 's/[_a-zA-Z0-9]//g'`"; then
+changequote([, ])dnl
+      AC_MSG_ERROR([invalid variable name: $ac_envvar])
+    fi
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"
+    export $ac_envvar ;;
+
   *)
 changequote(, )dnl
     if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
@@ -2047,10 +2060,49 @@
 
 dnl ### Creating output files
 
+dnl # Preparing for autoconf-2.5x:
+dnl #
+dnl # As a first step towards autoconf-2.5x we (re)define some
+dnl # autoconf-2.13 macros, thus simulating autoconf-2.5x syntax.
+dnl #
+dnl # In a second step we shall convert the various configure.in's
+dnl # to the new syntax (and add required quoting) such that they
+dnl # can be used with both autoconf versions.
+dnl #
+dnl # 2005-02-20  Peter Breitenlohner  <peb at mppmu.mpg.de>
+
+dnl # First we define some new macros as in autoconf-2.5x
+
+dnl # AC_CONFIG_HEADERS(HEADERS..., [COMMANDS], [INIT-CMDS])
+dnl # ------------------------------------------------------
+define([AC_LIST_HEADER])
+AC_DEFUN(AC_CONFIG_HEADERS,
+[define([AC_LIST_HEADER], AC_LIST_HEADER $1)dnl
+AC_DIVERT_PUSH(AC_DIVERSION_CMDS)dnl
+[$2]
+AC_DIVERT_POP()dnl
+AC_DIVERT_PUSH(AC_DIVERSION_ICMDS)dnl
+[$3]
+AC_DIVERT_POP()])
+
+dnl # AC_CONFIG_FILES(FILE..., [COMMANDS], [INIT-CMDS])
+dnl # -------------------------------------------------
+AC_DEFUN(AC_CONFIG_FILES,
+[ac_config_files="$ac_config_files $1"
+AC_DIVERT_PUSH(AC_DIVERSION_CMDS)dnl
+[$2]
+AC_DIVERT_POP()dnl
+AC_DIVERT_PUSH(AC_DIVERSION_ICMDS)dnl
+[$3]
+AC_DIVERT_POP()])
+
+dnl # Below we redefine some autoconf-2.13 macros in terms of the
+dnl # new ones.
 
 dnl AC_CONFIG_HEADER(HEADER-TO-CREATE ...)
 AC_DEFUN(AC_CONFIG_HEADER,
-[define([AC_LIST_HEADER], $1)])
+[AC_OBSOLETE([$0], [; instead use AC_CONFIG_HEADERS]) 
+AC_CONFIG_HEADERS([$1])])
 
 dnl Link each of the existing files SOURCE... to the corresponding
 dnl link name in DEST...
@@ -2075,8 +2127,7 @@
 dnl AC_CONFIG_SUBDIRS(DIR ...)
 AC_DEFUN(AC_CONFIG_SUBDIRS,
 [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-define([AC_LIST_SUBDIRS], ifdef([AC_LIST_SUBDIRS], [AC_LIST_SUBDIRS ],)[$1])dnl
-subdirs="AC_LIST_SUBDIRS"
+subdirs="$subdirs $1"
 AC_SUBST(subdirs)dnl
 ])
 
@@ -2085,6 +2136,8 @@
 dnl AC_OUTPUT([FILE...] [, EXTRA-CMDS] [, INIT-CMDS])
 define(AC_OUTPUT,
 [trap '' 1 2 15
+ifelse([$1][$2][$3], , , [AC_OBSOLETE([$0 with arguments],
+  [; instead use AC_CONFIG_FILES and $0 without arguments])])dnl
 AC_CACHE_SAVE
 trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
 
@@ -2146,15 +2199,12 @@
 ifdef([AC_PROVIDE_AC_PROG_INSTALL], [ac_given_INSTALL="$INSTALL"
 ])dnl
 
-changequote(<<, >>)dnl
-ifdef(<<AC_LIST_HEADER>>,
-<<trap 'rm -fr `echo "$1 AC_LIST_HEADER" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15>>,
-<<trap 'rm -fr `echo "$1" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15>>)
-changequote([, ])dnl
+ifelse([$1], [],, [AC_CONFIG_FILES([$1])])
+trap 'rm -fr `echo "$ac_config_files AC_LIST_HEADER" | sed "s/:[[^ ]]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
-AC_OUTPUT_FILES($1)
+AC_OUTPUT_FILES([$ac_config_files])
 ifdef([AC_LIST_HEADER], [AC_OUTPUT_HEADER(AC_LIST_HEADER)])dnl
 ifdef([AC_LIST_LINKS], [AC_OUTPUT_LINKS(AC_LIST_FILES, AC_LIST_LINKS)])dnl
 EOF
@@ -2171,7 +2221,7 @@
 rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 dnl config.status should not do recursion.
-ifdef([AC_LIST_SUBDIRS], [AC_OUTPUT_SUBDIRS(AC_LIST_SUBDIRS)])dnl
+AC_OUTPUT_SUBDIRS([$subdirs])dnl
 ])dnl
 
 dnl Set the DEFS variable to the -D options determined earlier.
@@ -2316,7 +2366,10 @@
   *) ac_comsub= ;;
   esac
 
+  rm -f conftest.in
   ac_file_inputs=`echo $ac_file_in|sed -e "s%:% $ac_given_srcdir/%g" -e "s%^%$ac_given_srcdir/%"`
+  cat $ac_file_inputs > conftest.in
+  # 
   # Replace lines of the form ac_include foo with the contents of foo:
   # first, from the ac_include lines construct a list of file names.
   # From that list, we construct a second list of those files that exist.
@@ -2329,32 +2382,28 @@
   # Be careful, because the filename may contain /.  Be careful with
   # whitespace; we need to use echo.
   # 
-  # No support for the multiple-output file :-separated stuff.
-  # 
-  file_substs=`sed -n \
-changequote(,)dnl
-'/^ac_include/s%ac_include[ 	]*\(.*\)%\1%p' \
-changequote([,])dnl
-               "$ac_given_srcdir/$ac_file_in"`
+  file_substs=`sed -n '/^ac_include/s%ac_include[[ 	]]*\(.*\)%\1%p' conftest.in`
   # Create the sed command line ...
-  file_subst_cmd='sed'
-  for ac_inc in $file_substs; do
+  if test -n "$file_substs"; then
+    AC_MSG_WARN([ac_include is obsolete; instead use kpse_include])
+    file_subst_cmd="sed -e 's/^ac_include/kpse_include/'"
+  else
+    file_subst_cmd='sed'
+  fi
+  kpse_substs=`sed -n '/^kpse_include/s%kpse_include[[ 	]]*\(.*\)%\1%p' conftest.in`
+  for ac_inc in $file_substs $kpse_substs; do
     if test -f "$ac_given_srcdir/$ac_inc"; then
       ac_mung=`echo $ac_inc | sed 's,/,%,g'`
-      file_subst_cmd="$file_subst_cmd -e '/^ac_include $ac_mung$/r $ac_inc'"
+      file_subst_cmd="$file_subst_cmd -e '/^kpse_include $ac_mung$/r $ac_given_srcdir/$ac_inc'"
     fi
   done
-  file_subst_cmd="$file_subst_cmd -e '/^ac_include/d'"
+  file_subst_cmd="$file_subst_cmd -e '/^kpse_include/d'"
   # ... and fix the whitespace and escaped slashes.
   file_subst_cmd=`echo "$file_subst_cmd" | sed -e 's,%,\\\/,g' \
-changequote(,)dnl
--e 's/ac_include /ac_include[ 	]*/g'`
-changequote([,])dnl
-  # cd into the srcdir because the files being included more or less
-  # must be part of the distribution. I can't find any way to do
-  # variable substitution in the sed commands (so the user could have,
-  # e.g., $top_srcdir in their ac_include line).
-  (cd $ac_given_srcdir && eval $file_subst_cmd $ac_file_in) \
+-e 's/kpse_include /kpse_include[[ 	]]*/g'`
+  # I can't find any way to do variable substitution in the sed commands
+  # (so the user could have, e.g., $top_srcdir in their ac_include line).
+  (eval $file_subst_cmd conftest.in) \
   | sed -e "$ac_comsub
 s%@configure_input@%$configure_input%g
 s%@srcdir@%$srcdir%g
@@ -2375,7 +2424,7 @@
 dnl    mv conftest.out $ac_file
 dnl  fi
 fi; done
-rm -f conftest.s*
+rm -f conftest.s* conftest.in
 ])
 
 dnl Create the config.h files from the config.h.in files.
@@ -2593,7 +2642,7 @@
     esac
   done
 
-  for ac_config_dir in $1; do
+  for ac_config_dir in : $1; do
 
     # Do not complain, so a configure script can configure whichever
     # parts of a large source tree are present.
diff -ur -N -x configure -x aclocal.m4 -x autom4te.cache tetex-src-3.0.orig/texk/etc/autoconf/acsite.m4 tetex-src-3.0/texk/etc/autoconf/acsite.m4
--- tetex-src-3.0.orig/texk/etc/autoconf/acsite.m4	2005-02-20 00:06:59.000000000 +0100
+++ tetex-src-3.0/texk/etc/autoconf/acsite.m4	2005-02-20 23:25:04.000000000 +0100
@@ -131,3 +131,16 @@
 fi
 AC_SUBST(BUILD$1)
 ])
+
+dnl # Preparing for autoconf-2.5x:
+dnl #
+dnl # As a first step towards autoconf-2.5x we define some new
+dnl # autoconf-2.13 macros.
+dnl #
+dnl # 2005-02-20  Peter Breitenlohner  <peb at mppmu.mpg.de>
+
+dnl # KPSE_CONFIG_FILES(FILE..., [COMMANDS], [INIT-CMDS])
+dnl # ---------------------------------------------------
+dnl # For now just an other name for AC_CONFIG_FILES, in future
+dnl # (autoconf-2.5x) this will enable kpse_include substitution.
+AC_DEFUN([KPSE_CONFIG_FILES], [AC_CONFIG_FILES([$1], [$2], [$3])])
-------------- next part --------------
	Prepare for autoconf-2.5x -- step 1 -- m4

	M4 macros for KPSE with autoconf-2.59, mostly copied
	from acgeneral.m4 and acsite.m4

diff -ur -N -x configure -x aclocal.m4 -x autom4te.cache tetex-src-3.0.orig/texk/m4/ac-xxset-cc.m4 tetex-src-3.0/texk/m4/ac-xxset-cc.m4
--- tetex-src-3.0.orig/texk/m4/ac-xxset-cc.m4	1970-01-01 01:00:00.000000000 +0100
+++ tetex-src-3.0/texk/m4/ac-xxset-cc.m4	2005-02-22 22:52:36.000000000 +0100
@@ -0,0 +1,20 @@
+dnl Unset CC to run configure with cross compiler.
+AC_DEFUN([AC_UNSET_CC], [
+ZZ=
+if test "$cross_compiling" = yes &&
+   (test "x$CC" = "xdos-gcc" || test "x$CC" = "xi386-mingw32-gcc" || test "x$CC" = "xgnuwin32gcc") ; then
+ZZ=$CC
+unset CC
+cross_compiling=no
+fi
+])
+
+dnl Restore CC that has been unset by AC_UNSET_CC
+AC_DEFUN([AC_RESET_CC], [
+if test "x$ZZ" = "xdos-gcc" || test "x$ZZ" = "xi386-mingw32-gcc" || test "x$ZZ" = "xgnuwin32gcc" ; then
+CC=$ZZ
+cross_compiling=yes
+fi
+])
+
+
diff -ur -N -x configure -x aclocal.m4 -x autom4te.cache tetex-src-3.0.orig/texk/m4/acsite.m4.not tetex-src-3.0/texk/m4/acsite.m4.not
--- tetex-src-3.0.orig/texk/m4/acsite.m4.not	1970-01-01 01:00:00.000000000 +0100
+++ tetex-src-3.0/texk/m4/acsite.m4.not	2005-02-22 23:03:08.000000000 +0100
@@ -0,0 +1,51 @@
+dnl Modifications for the latest version of Autoconf for kpathsea.
+dnl These changes have all been sent back to the Autoconf maintainer via
+dnl bug-gnu-utils at prep.ai.mit.edu.
+
+
+dnl kb_AC_LIBTOOL_REPLACE_FUNCS(FUNCTION-NAME...)
+AC_DEFUN(kb_AC_LIBTOOL_REPLACE_FUNCS,
+[for ac_func in $1
+do
+AC_CHECK_FUNC($ac_func, , [LIBTOOL_LIBOBJS="$LIBTOOL_LIBOBJS ${ac_func}.lo"])
+done
+AC_SUBST(LIBTOOL_LIBOBJS)dnl
+])
+
+
+dnl Added /lib/... for A/UX.
+dnl undefine([AC_PATH_X_DIRECT])dnl
+
+dnl Changed make to ${MAKE-make}.
+dnl undefine([AC_PATH_X_XMKMF])dnl
+
+dnl Always more junk to check.
+dnl undefine([AC_PATH_XTRA])dnl
+
+dnl Added ac_include support.
+dnl undefine([AC_OUTPUT_FILES])dnl
+
+
+dnl The following three macros are copied from Thomas Dickey's autoconf
+dnl patches at:
+dnl 	http://dickey.his.com/autoconf/autoconf.html
+dnl --Roozbeh Pournader
+
+define(AC_DIVERSION_HELP, 3)dnl                user help-messages
+define(ac_help_count, 0)dnl
+
+dnl Send text to the user help-message list.  We will expand it as a here-
+dnl document, so we'll split it to avoid too-long strings.
+dnl AC_DIVERT_HELP(message)
+define(AC_DIVERT_HELP,
+[AC_DIVERT_PUSH(AC_DIVERSION_HELP)dnl
+ifelse(ac_help_count,0,[--enable and --with options recognized:
+])dnl
+define([ac_help_count], builtin(eval, ac_help_count + 1))dnl
+[$1]
+ifelse(ac_help_count,13,[EOF
+cat <<EOF
+define([ac_help_count], 1)dnl
+])dnl
+AC_DIVERT_POP()dnl
+])
diff -ur -N -x configure -x aclocal.m4 -x autom4te.cache tetex-src-3.0.orig/texk/m4/asm-underscore.m4 tetex-src-3.0/texk/m4/asm-underscore.m4
--- tetex-src-3.0.orig/texk/m4/asm-underscore.m4	1970-01-01 01:00:00.000000000 +0100
+++ tetex-src-3.0/texk/m4/asm-underscore.m4	2005-02-22 22:57:52.000000000 +0100
@@ -0,0 +1,31 @@
+# pb_AC_ASM_UNDERSCORE
+# --------------------
+# Check if gcc asm for i386 needs external symbols with an underscore.
+# Peter Breitenlohner, April 15, 1996.
+
+
+AC_DEFUN([pb_AC_ASM_UNDERSCORE],
+[AC_REQUIRE_CPP()dnl
+AC_CACHE_CHECK([whether gcc asm needs underscore], [pb_cv_asm_underscore],
+[
+# Older versions of GCC asm for i386 need an underscore prepended to
+# external symbols. Figure out if this is so.
+AC_TRY_LINK([
+extern char val ;
+extern void sub () ;
+#if defined (__i386__) && defined (__GNUC__) 
+asm("        .align 4\n"
+".globl sub\n"
+"sub:\n"
+"        movb \$][1,val\n"
+"        ret\n");
+#else
+void sub () { val = 1; }
+#endif /* assembler */
+char val ;
+], [sub], [pb_cv_asm_underscore=no], [pb_cv_asm_underscore=yes])])
+if test "x$pb_cv_asm_underscore" = xyes; then
+  AC_DEFINE(ASM_NEEDS_UNDERSCORE)
+fi
+])
+
diff -ur -N -x configure -x aclocal.m4 -x autom4te.cache tetex-src-3.0.orig/texk/m4/kpse-cross.m4 tetex-src-3.0/texk/m4/kpse-cross.m4
--- tetex-src-3.0.orig/texk/m4/kpse-cross.m4	1970-01-01 01:00:00.000000000 +0100
+++ tetex-src-3.0/texk/m4/kpse-cross.m4	2005-02-22 23:02:12.000000000 +0100
@@ -0,0 +1,33 @@
+# Find a program when cross-compiling, or use a default when not.
+# $1 = variable which records the outcome
+# $2 = program to look for when cross-compiling
+# $3 = program to use when not cross-compiling
+AC_DEFUN([KPSE_CROSS_PATH_PROG],
+  [if test "$cross_compiling" = yes; then
+AC_PATH_PROG([$1], [$2])
+if test -z "${$1}"; then
+  AC_MSG_ERROR([$2 was not found but is required when cross-compiling.
+  Install $2 or set \$$1 to the full pathname.])
+fi
+else
+  $1=$3
+fi])
+
+# Set BUILD$1 to $2 when cross-compiling, to $($1) if not.
+# Example: KPSE_CROSS_BUILD_VAR([CC], [cc]) sets 'BUILDCC' to 'cc'
+# if cross-compiling, and to '$(CC)' if not.
+AC_DEFUN([KPSE_CROSS_BUILD_VAR],
+  [if test "$cross_compiling" = yes; then
+  if test -z "${BUILD$1}"; then
+    BUILD$1='$2'
+  fi
+  AC_MSG_RESULT([setting \$BUILD$1 to ${BUILD$1}])
+else
+  if test -n "${BUILD$1}"; then
+    AC_MSG_WARN([\$BUILD$1 set but not cross-compiling.])
+  fi
+  BUILD$1='$($1)'
+fi
+AC_SUBST(BUILD$1)
+])
+
diff -ur -N -x configure -x aclocal.m4 -x autom4te.cache tetex-src-3.0.orig/texk/m4/kpse-include.m4 tetex-src-3.0/texk/m4/kpse-include.m4
--- tetex-src-3.0.orig/texk/m4/kpse-include.m4	1970-01-01 01:00:00.000000000 +0100
+++ tetex-src-3.0/texk/m4/kpse-include.m4	2005-02-22 17:14:30.000000000 +0100
@@ -0,0 +1,121 @@
+# kpse_ac.m4
+dnl Copyright (C) ........
+
+dnl Authors:
+dnl   ....
+
+dnl Private macros for the kpathsea library, not to be installed.
+
+# KPSE_CONFIG_FILES(FILE..., [COMMANDS], [INIT-CMDS])
+# ---------------------------------------------------
+# Specify output files that are configured with AC_SUBST.
+# In a first step, each input file is converted into an auxiliary file
+# with all `kpse_include' directives resolved.
+# I a second step each auxiliary file is passed to AC_CONFIG_FILES
+# with the (optional) COMMANDS to be run after config.status creates
+# the output file.
+#
+# Each FILE is specified as OUTPUT[:[INPUT][:[AUX]]], i.e., the syntax is
+# similar to that for AC_CONFIG_FILES but the meaning is quite different,
+# there is one unique INPUT for each OUTPUT.  If omitted, INPUT defaults
+# to OUTPUT.in and AUX to OUTPUT.aux.
+AC_DEFUN([KPSE_CONFIG_FILES],
+[AC_REQUIRE([KPSE_EMPTY])dnl
+AC_FOREACH([AC_File], [$1],
+  [_KPSE_CONFIG_FILE([$2], m4_bpatsubst(AC_File, [:], [,]))])dnl
+_AC_CONFIG_COMMANDS_INIT([$3])dnl
+])
+
+# _KPSE_CONFIG_FILE([COMMANDS], OUTPUT, [INPUT], [AUX])
+# -----------------------------------
+# See above.
+m4_define([_KPSE_CONFIG_FILE],
+[AC_CONFIG_FILES(m4_ifval([$4], [$4], [$2].aux):_KPSE_EMPTY,
+  [_KPSE_INCLUDE(m4_ifval([$4], [$4], [$2].aux), m4_ifval([$3], [$3], [$2].in))])dnl
+AC_CONFIG_FILES([$2]:m4_ifval([$4], [$4], [$2].aux), [$1])dnl
+])
+
+# _KPSE_INCLUDE(DEST, SOURCE)
+# ---------------------------
+# Create DEST from SOURCE with all occurrences of
+#      kpse_include INCLUDE_FILE
+# replaced by the contents if INCLUDE_FILE if that file exists.
+m4_define([_KPSE_INCLUDE],
+[kpse_input=`case $2 in
+  [[\\/$]]*) # Absolute
+    test -f "$2" || AC_MSG_ERROR([cannot find input file: $2])
+    echo "$2";;
+  *) # Relative
+    if test -f "$2"; then
+      # Build tree
+      echo "$2"
+    elif test -f "$srcdir/$2"; then
+      # Source tree
+      echo "$srcdir/$2"
+    else
+      # /dev/null tree
+      AC_MSG_ERROR([cannot find input file: $2])
+    fi;;
+  esac` || AS_EXIT([1])
+# Replace lines of the form "kpse_include foo" with the contents of foo:
+# first, from the kpse_include lines construct a list of file names.
+# From that list, we construct a second list of those files that exist.
+# Then we construct a list of sed commands for including those files,
+# and a sed command that removes the kpse_include lines. We don't attempt
+# to read non-existent files because some (buggy) versions of sed choke
+# on this. Have to use sed because old (Ultrix, SunOs) awk does not support
+# getline or system. (Anyway, configure scripts aren't supposed to use awk.)
+# Can't use only one -e and commands {dr foo} because foo has to be last.
+# Be careful, because the filename may contain /.
+# Be careful with whitespace; we need to use echo.
+kpse_file_substs=`sed -n '/^kpse_include/s%[[ 	]]*\(.*\)%\1%p' "$kpse_input"`
+if test x"$kpse_file_substs" = x; then
+  AC_MSG_WARN([No need to use \`[KPSE_CONFIG_FILES]' for input \`$2'
+               without any \`kpse_include' directives])
+fi
+# Create the sed command line ...
+# Input lines containing "@configure_input@" are output twice,
+# first unmodified and then with our modifications.
+kpse_substs="sed -e '/@configure_input@/p' \
+  -e 's, at configure_input@,$1.  Generated from `echo $2 |
+  sed 's,.*/,,'` by configure.,'"
+for kpse_inc in $kpse_file_substs; do
+  kpse_read=`case $kpse_inc in
+    [[\\/$]]*) # Absolute
+      if test -f "$kpse_inc"; then
+        echo "$kpse_inc"
+      fi;;
+    *) # Relative
+      if test -f "$kpse_inc"; then
+        # Build tree
+        echo "$kpse_inc"
+      elif test -f "$srcdir/$kpse_inc"; then
+        # Source tree
+        echo "$srcdir/$kpse_inc"
+      fi;;
+  esac`
+  if test -n "$kpse_read"; then
+    kpse_mung=`echo $kpse_inc | sed 's,/,%,g'`
+    kpse_substs="$kpse_substs -e '/^kpse_include $kpse_mung$/r $kpse_read'"
+  fi
+done
+# ... and fix the whitespace and escaped slashes.
+kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \
+  -e 's/kpse_include /kpse_include[[ 	]]*/g'`
+dnl The parens around the eval prevent an "illegal io" in Ultrix sh.
+(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > $1
+])
+
+
+# KPSE_EMPTY(FILE)
+# ----------------
+# Create an empty auxiliary file FILE.
+# KPSE_CONFIG_FILES normally uses an empty file `kpse_empty',
+# with KPSE_EMPTY the name of that file can be changed to FILE.
+AC_DEFUN([KPSE_EMPTY],
+[m4_ifdef([_KPSE_EMPTY],
+          [AC_FATAL([_KPSE_EMPTY is already registered as] `_KPSE_EMPTY'.)])dnl
+m4_define([_KPSE_EMPTY], m4_ifval([$1], [$1], [kpse_empty]))
+AC_CONFIG_COMMANDS_PRE([echo empty >]_KPSE_EMPTY)dnl
+])
+
diff -ur -N -x configure -x aclocal.m4 -x autom4te.cache tetex-src-3.0.orig/texk/m4/maintainer-mode.m4 tetex-src-3.0/texk/m4/maintainer-mode.m4
--- tetex-src-3.0.orig/texk/m4/maintainer-mode.m4	1970-01-01 01:00:00.000000000 +0100
+++ tetex-src-3.0/texk/m4/maintainer-mode.m4	2005-02-22 23:00:35.000000000 +0100
@@ -0,0 +1,22 @@
+# AM_MAINTAINER_MODE
+# ------------------
+# Add --enable-maintainer-mode option to configure.
+# From automake distribution, by Jim Meyering:
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE([maintainer-mode],
+[  --enable-maintainer-mode enable make rules and dependencies not useful
+                           (and sometimes confusing) to the casual installer],
+      [USE_MAINTAINER_MODE=$enableval],
+      [USE_MAINTAINER_MODE=no])
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  if test "x$USE_MAINTAINER_MODE" = xyes; then
+    MAINT=
+  else
+    MAINT='#M#'
+  fi
+  AC_SUBST(MAINT)dnl
+])
+
-------------- next part --------------
	Prepare for autoconf-2.5x -- step 2 -- teTeX
	Changes to non-web2c part of teTeX-3.0 tree

	Replace
		ac_include FILE
	by
		kpse_include FILE

diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/libs/gd/Makefile.in tetex-src-3.0/libs/gd/Makefile.in
--- tetex-src-3.0.orig/libs/gd/Makefile.in	2004-11-07 19:41:01.000000000 +0100
+++ tetex-src-3.0/libs/gd/Makefile.in	2005-02-20 21:37:03.000000000 +0100
@@ -1,6 +1,6 @@
-ac_include ../../texk/make/common.mk
-ac_include ../../texk/make/programs.mk
-ac_include ../../texk/make/library.mk
+kpse_include ../../texk/make/common.mk
+kpse_include ../../texk/make/programs.mk
+kpse_include ../../texk/make/library.mk
 
 ZLIBDIR=../zlib
 ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/libs/libpng/Makefile.in tetex-src-3.0/libs/libpng/Makefile.in
--- tetex-src-3.0.orig/libs/libpng/Makefile.in	2002-10-20 14:24:03.000000000 +0200
+++ tetex-src-3.0/libs/libpng/Makefile.in	2005-02-20 21:36:58.000000000 +0100
@@ -7,9 +7,9 @@
 # For conditions of distribution and use of the other files in this
 # directory, see copyright notice in png.h.
 
-ac_include ../texk/make/common.mk
-ac_include ../texk/make/programs.mk
-ac_include ../texk/make/library.mk
+kpse_include ../texk/make/common.mk
+kpse_include ../texk/make/programs.mk
+kpse_include ../texk/make/library.mk
 
 ZLIBDIR=../zlib
 ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/libs/t1lib/Makefile.in tetex-src-3.0/libs/t1lib/Makefile.in
--- tetex-src-3.0.orig/libs/t1lib/Makefile.in	2004-07-06 08:32:21.000000000 +0200
+++ tetex-src-3.0/libs/t1lib/Makefile.in	2005-02-20 21:36:52.000000000 +0100
@@ -1,7 +1,7 @@
-ac_include ../../texk/make/common.mk
-ac_include ../../texk/make/programs.mk
-ac_include ../../texk/make/library.mk
-ac_include ../../texk/make/paths.mk
+kpse_include ../../texk/make/common.mk
+kpse_include ../../texk/make/programs.mk
+kpse_include ../../texk/make/library.mk
+kpse_include ../../texk/make/paths.mk
 
 prog_cflags = @X_CFLAGS@ -DT1LIB_IDENT=\"@T1LIB_IDENTIFIER@\" -DGLOBAL_CONFIG_DIR=\"@T1LIB_DATA_DIR@\"
 
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/libs/type1/Makefile.in tetex-src-3.0/libs/type1/Makefile.in
--- tetex-src-3.0.orig/libs/type1/Makefile.in	2002-10-20 14:23:49.000000000 +0200
+++ tetex-src-3.0/libs/type1/Makefile.in	2005-02-20 21:36:55.000000000 +0100
@@ -1,7 +1,7 @@
-ac_include ../../texk/make/common.mk
-ac_include ../../texk/make/programs.mk
-ac_include ../../texk/make/library.mk
-ac_include ../../texk/make/paths.mk
+kpse_include ../../texk/make/common.mk
+kpse_include ../../texk/make/programs.mk
+kpse_include ../../texk/make/library.mk
+kpse_include ../../texk/make/paths.mk
 
 OBJS = arith.o bstring.o curves.o fontfcn.o hints.o lines.o objects.o \
   paths.o regions.o scanfont.o spaces.o t1io.o t1snap.o t1stub.o token.o \
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/dviljk/Makefile.in tetex-src-3.0/texk/dviljk/Makefile.in
--- tetex-src-3.0.orig/texk/dviljk/Makefile.in	2004-05-05 10:39:18.000000000 +0200
+++ tetex-src-3.0/texk/dviljk/Makefile.in	2005-02-20 21:37:59.000000000 +0100
@@ -3,9 +3,9 @@
 
 .NOTPARALLEL:
 
-ac_include ../make/paths.mk
-ac_include ../make/common.mk
-ac_include ../make/programs.mk
+kpse_include ../make/paths.mk
+kpse_include ../make/common.mk
+kpse_include ../make/programs.mk
 
 prog_cflags = -DKPATHSEA
 
@@ -46,7 +46,7 @@
 
 dvilj.o dvilj2p.o dvilj4.o dvilj4l.o: dvi2xx.c
 
-ac_include ../make/tkpathsea.mk
+kpse_include ../make/tkpathsea.mk
 
 install: install-exec install-data
 uninstall: uninstall-exec uninstall-data
@@ -94,12 +94,12 @@
 post-dist-$(distname):
 	ln -s `pwd`/fonts `pwd`/tex `pwd`/src.fonts $(distdir)
 
-ac_include ../make/dist.mk
-ac_include ../make/config.mk
+kpse_include ../make/dist.mk
+kpse_include ../make/config.mk
 
 info dvi check:
 
-ac_include ../make/clean.mk
+kpse_include ../make/clean.mk
 
-ac_include ../make/rdepend.mk
-ac_include depend.mk
+kpse_include ../make/rdepend.mk
+kpse_include depend.mk
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/dvipdfm/Makefile.in tetex-src-3.0/texk/dvipdfm/Makefile.in
--- tetex-src-3.0.orig/texk/dvipdfm/Makefile.in	2004-12-09 20:58:57.000000000 +0100
+++ tetex-src-3.0/texk/dvipdfm/Makefile.in	2005-02-20 21:37:57.000000000 +0100
@@ -1,6 +1,6 @@
-ac_include ../make/paths.mk
-ac_include ../make/common.mk
-ac_include ../make/programs.mk
+kpse_include ../make/paths.mk
+kpse_include ../make/common.mk
+kpse_include ../make/programs.mk
 
 ZLIBDIR=../../libs/zlib
 ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
@@ -40,7 +40,7 @@
 $(ZLIBDIR)/libz.a:
 	cd $(ZLIBDIR); $(MAKE)
 
-ac_include ../make/tkpathsea.mk
+kpse_include ../make/tkpathsea.mk
 
 install: install-exec install-data
 uninstall: uninstall-exec uninstall-data
@@ -68,10 +68,10 @@
 	rm -f $(man1dir)/dvipdft.$(manext)
 	rm -f $(man1dir)/ebb.$(manext)
 
-ac_include ../make/config.mk
+kpse_include ../make/config.mk
 
 info dvi check:
 
-ac_include ../make/clean.mk
-ac_include ../make/rdepend.mk
-ac_include depend.mk
+kpse_include ../make/clean.mk
+kpse_include ../make/rdepend.mk
+kpse_include depend.mk
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/dvipng/Makefile.in tetex-src-3.0/texk/dvipng/Makefile.in
--- tetex-src-3.0.orig/texk/dvipng/Makefile.in	2004-12-01 17:33:56.000000000 +0100
+++ tetex-src-3.0/texk/dvipng/Makefile.in	2005-02-20 21:38:06.000000000 +0100
@@ -1,10 +1,10 @@
 # Thomas Esser, for teTeX. All settings here are my fault, don't blame
 # the dvipng maintainers for it.
 
-ac_include ../make/paths.mk
-ac_include ../make/common.mk
-ac_include ../make/programs.mk
-ac_include ../make/cross.mk
+kpse_include ../make/paths.mk
+kpse_include ../make/common.mk
+kpse_include ../make/programs.mk
+kpse_include ../make/cross.mk
 
 ZLIBDIR		= ../../libs/zlib
 ZLIBSRCDIR	= $(srcdir)/$(ZLIBDIR)
@@ -92,11 +92,11 @@
 uninstall-data:
 	rm -f $(man1dir)/dvipng.$(manext)
 
-ac_include ../make/config.mk
+kpse_include ../make/config.mk
 
 info dvi check:
 
-ac_include ../make/clean.mk
-ac_include ../make/tkpathsea.mk
-ac_include ../make/rdepend.mk
-ac_include depend.mk
+kpse_include ../make/clean.mk
+kpse_include ../make/tkpathsea.mk
+kpse_include ../make/rdepend.mk
+kpse_include depend.mk
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/dvipsk/Makefile.in tetex-src-3.0/texk/dvipsk/Makefile.in
--- tetex-src-3.0.orig/texk/dvipsk/Makefile.in	2005-01-30 14:17:04.000000000 +0100
+++ tetex-src-3.0/texk/dvipsk/Makefile.in	2005-02-20 21:38:01.000000000 +0100
@@ -13,11 +13,11 @@
 # won't work at all on such systems; if you have info one way or the
 # other, please let kb at cs.umb.edu know.)
 
-ac_include ../make/paths.mk
-ac_include ../make/common.mk
-ac_include ../make/programs.mk
-ac_include ../make/cross.mk
-ac_include ../make/texi.mk
+kpse_include ../make/paths.mk
+kpse_include ../make/common.mk
+kpse_include ../make/programs.mk
+kpse_include ../make/cross.mk
+kpse_include ../make/texi.mk
 prog_cflags = -DUNIX -DKPATHSEA -DNeedFunctionPrototypes -DSHIFTLOWCHARS
 
 # The `t[mp]-' business is so that we don't create an empty .pro file,
@@ -62,7 +62,7 @@
 texc.lpro: texc.script tex.lpro
 	$(SHELL) $(srcdir)/texc.script $(srcdir)/tex.lpro $@
 
-ac_include ../make/tkpathsea.mk
+kpse_include ../make/tkpathsea.mk
 
 # The environment for running check.
 # No need to specify TEXMF, as ../kpathsea/texmf.cnf should contain
@@ -158,8 +158,8 @@
 	ln -s `pwd`/README.reencode $(distdir)/reencode/README
 	rm -f $(distdir)/texc.lpro
 
-ac_include ../make/dist.mk
-ac_include ../make/config.mk
+kpse_include ../make/dist.mk
+kpse_include ../make/config.mk
 
 info: $(program).info
 dvi: $(program).dvi
@@ -173,7 +173,7 @@
 @MAINT@	./dvips --help >$@
 @MAINT at doc: info INSTALL
 
-ac_include ../make/clean.mk
+kpse_include ../make/clean.mk
 
 distclean::
 	rm -f *.pro texc.lpro
@@ -181,5 +181,5 @@
 clean::
 	rm -f mtest.ps dvipstst.ps
 
-ac_include ../make/rdepend.mk
-ac_include depend.mk
+kpse_include ../make/rdepend.mk
+kpse_include depend.mk
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/gsftopk/Makefile.in tetex-src-3.0/texk/gsftopk/Makefile.in
--- tetex-src-3.0.orig/texk/gsftopk/Makefile.in	2003-02-16 13:54:54.000000000 +0100
+++ tetex-src-3.0/texk/gsftopk/Makefile.in	2005-02-20 21:38:11.000000000 +0100
@@ -4,9 +4,9 @@
 program = gsftopk
 default all: $(program) gsftopk.1
 
-ac_include ../make/paths.mk
-ac_include ../make/common.mk
-ac_include ../make/programs.mk
+kpse_include ../make/paths.mk
+kpse_include ../make/common.mk
+kpse_include ../make/programs.mk
 
 gsftopkpsheaderdir = $(psheaderdir)/gsftopk
 
@@ -22,7 +22,7 @@
 $(program): $(kpathsea) $(objects)
 	$(kpathsea_link) $(objects) $(LOADLIBES)
 
-ac_include ../make/tkpathsea.mk
+kpse_include ../make/tkpathsea.mk
 
 gsftopk.1: gsftopk1.sed sedscript
 	sed -f sedscript <$(srcdir)/gsftopk1.sed >$@
@@ -47,7 +47,7 @@
 	rm -f $(man1dir)/gsftopk.$(manext)
 	rm -f $(gsftopkpsheaderdir)/render.ps
 
-ac_include ../make/clean.mk
+kpse_include ../make/clean.mk
 
 clean::
 	rm -f sedscript
@@ -55,9 +55,9 @@
 distclean::
 	rm -f gsftopk.1
 
-ac_include ../make/config.mk
+kpse_include ../make/config.mk
 
 info dvi check:
 
-ac_include ../make/rdepend.mk
-ac_include depend.mk
+kpse_include ../make/rdepend.mk
+kpse_include depend.mk
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/makeindexk/Makefile.in tetex-src-3.0/texk/makeindexk/Makefile.in
--- tetex-src-3.0.orig/texk/makeindexk/Makefile.in	2003-02-16 13:54:38.000000000 +0100
+++ tetex-src-3.0/texk/makeindexk/Makefile.in	2005-02-20 21:37:06.000000000 +0100
@@ -1,9 +1,9 @@
 # Makefile for makeindexk --te at dbs.uni-hannover.de. Public domain.
 version = 2.13
 
-ac_include ../make/paths.mk
-ac_include ../make/common.mk
-ac_include ../make/programs.mk
+kpse_include ../make/paths.mk
+kpse_include ../make/common.mk
+kpse_include ../make/programs.mk
 
 objects = genind.o mkind.o qsort.o scanid.o scanst.o sortid.o
 program = makeindex
@@ -13,7 +13,7 @@
 
 $(program): $(kpathsea) $(objects)
 	$(kpathsea_link) $(objects) $(LOADLIBES)
-ac_include ../make/tkpathsea.mk
+kpse_include ../make/tkpathsea.mk
 
 install: install-exec install-data
 uninstall: uninstall-exec uninstall-data
@@ -40,14 +40,14 @@
 pre-dist-$(distname):
 post-dist-$(distname):
 
-ac_include ../make/dist.mk
-ac_include ../make/config.mk
+kpse_include ../make/dist.mk
+kpse_include ../make/config.mk
 
 info dvi check:
 
-ac_include ../make/clean.mk
+kpse_include ../make/clean.mk
 
 distclean::
 
-ac_include ../make/rdepend.mk
-ac_include depend.mk
+kpse_include ../make/rdepend.mk
+kpse_include depend.mk
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/ps2pkm/Makefile.in tetex-src-3.0/texk/ps2pkm/Makefile.in
--- tetex-src-3.0.orig/texk/ps2pkm/Makefile.in	2003-02-16 13:53:18.000000000 +0100
+++ tetex-src-3.0/texk/ps2pkm/Makefile.in	2005-02-20 21:38:09.000000000 +0100
@@ -1,9 +1,9 @@
 # Makefile for ps2pkm --te at dbs.uni-hannover.de. Public domain.
 version = 1.5m
 
-ac_include ../make/paths.mk
-ac_include ../make/common.mk
-ac_include ../make/programs.mk
+kpse_include ../make/paths.mk
+kpse_include ../make/common.mk
+kpse_include ../make/programs.mk
 prog_cflags = -DUNIX -DKPATHSEA
 
 libobj = arith.o curves.o fontfcn.o hints.o lines.o objects.o paths.o \
@@ -29,7 +29,7 @@
 mag: $(kpathsea) $(magobjs)
 	$(kpathsea_link) $(magobjs) $(LOADLIBES)
 
-ac_include ../make/tkpathsea.mk
+kpse_include ../make/tkpathsea.mk
 
 install: install-exec install-data
 uninstall: uninstall-exec uninstall-data
@@ -53,11 +53,11 @@
 pre-dist-$(distname):
 post-dist-$(distname):
 
-ac_include ../make/dist.mk
-ac_include ../make/config.mk
+kpse_include ../make/dist.mk
+kpse_include ../make/config.mk
 
 info dvi check:
 
-ac_include ../make/clean.mk
-ac_include ../make/rdepend.mk
-ac_include depend.mk
+kpse_include ../make/clean.mk
+kpse_include ../make/rdepend.mk
+kpse_include depend.mk
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/tetex/Makefile.in tetex-src-3.0/texk/tetex/Makefile.in
--- tetex-src-3.0.orig/texk/tetex/Makefile.in	2005-02-04 23:20:54.000000000 +0100
+++ tetex-src-3.0/texk/tetex/Makefile.in	2005-02-20 21:37:10.000000000 +0100
@@ -1,9 +1,9 @@
 # Makefile for teTeX's extra scripts - te at dbs.uni-hannover.de.
 # Public domain.
 
-ac_include ../make/paths.mk
-ac_include ../make/common.mk
-ac_include ../make/programs.mk
+kpse_include ../make/paths.mk
+kpse_include ../make/common.mk
+kpse_include ../make/programs.mk
 
 man5dir = $(mandir)/man5
 
@@ -107,7 +107,7 @@
 	  done
 	cd $(scriptdir); rm -f mktexfmt; ln -s fmtutil mktexfmt
 
-ac_include ../make/clean.mk
+kpse_include ../make/clean.mk
 
 config.status: $(srcdir)/configure
 	$(SHELL) $(srcdir)/configure --no-create --verbose
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/xdvik/Makefile.in tetex-src-3.0/texk/xdvik/Makefile.in
--- tetex-src-3.0.orig/texk/xdvik/Makefile.in	2005-01-24 00:17:52.000000000 +0100
+++ tetex-src-3.0/texk/xdvik/Makefile.in	2005-02-20 21:37:50.000000000 +0100
@@ -4,10 +4,10 @@
 #   the top makefile is for!
 #
 
-ac_include ../make/paths.mk
-ac_include ../make/common.mk
-ac_include ../make/programs.mk
-ac_include ../make/cross.mk
+kpse_include ../make/paths.mk
+kpse_include ../make/common.mk
+kpse_include ../make/programs.mk
+kpse_include ../make/cross.mk
 
 all_subdirs = gui
 
@@ -178,12 +178,12 @@
 post-dist-$(distname):
 	cd $(top_distdir); rm -f xdvik/psheader.c
 
-ac_include ../make/dist.mk
-ac_include ../make/config.mk
+kpse_include ../make/dist.mk
+kpse_include ../make/config.mk
 
 info dvi check:
 
-ac_include ../make/clean.mk
+kpse_include ../make/clean.mk
 
 mostlyclean::
 	test ! -r gui/Makefile \
@@ -220,6 +220,6 @@
 	cd $(LIBTYPE1DIR); $(MAKE) $(makeargs) libtype1.a
 
 
-ac_include ../make/tkpathsea.mk
-ac_include ../make/rdepend.mk
-ac_include depend.mk
+kpse_include ../make/tkpathsea.mk
+kpse_include ../make/rdepend.mk
+kpse_include depend.mk
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/xdvik/gui/Makefile.in tetex-src-3.0/texk/xdvik/gui/Makefile.in
--- tetex-src-3.0.orig/texk/xdvik/gui/Makefile.in	2004-04-18 14:21:13.000000000 +0200
+++ tetex-src-3.0/texk/xdvik/gui/Makefile.in	2005-02-20 21:37:48.000000000 +0100
@@ -7,10 +7,10 @@
 
 ### NOTE: ac_include paths must be relative to texk/xdvik, since that
 ### is from where the configure is run!
-ac_include ../make/paths.mk
-ac_include ../make/library.mk
-ac_include ../make/common.mk
-ac_include ../make/programs.mk
+kpse_include ../make/paths.mk
+kpse_include ../make/library.mk
+kpse_include ../make/common.mk
+kpse_include ../make/programs.mk
 
 kpathsea_parent = ../..
 
@@ -69,12 +69,12 @@
 	$(AR) $(ARFLAGS) $@ $(objects)
 	$(RANLIB) $@
 
-ac_include ../make/dist.mk
-ac_include ../make/clean.mk
+kpse_include ../make/dist.mk
+kpse_include ../make/clean.mk
 
 clean::
 	rm -f *.o *.a
 
 c_auto_h_dir = ..
-ac_include ../make/rdepend.mk
-ac_include ./gui/depend.mk
+kpse_include ../make/rdepend.mk
+kpse_include ./gui/depend.mk
-------------- next part --------------
	Prepare for autoconf-2.5x -- step 2 -- web2c
	Changes to web2c part of teTeX-3.0 tree

	Replace
		ac_include FILE
	by
		kpse_include FILE

diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/libs/xpdf/fofi/Makefile.in tetex-src-3.0/libs/xpdf/fofi/Makefile.in
--- tetex-src-3.0.orig/libs/xpdf/fofi/Makefile.in	2004-05-16 09:52:27.000000000 +0200
+++ tetex-src-3.0/libs/xpdf/fofi/Makefile.in	2005-02-20 21:36:44.000000000 +0100
@@ -16,7 +16,7 @@
 CXX = @CXX@
 CFLAGS = @CFLAGS@
 
-ac_include ../../texk/make/library.mk
+kpse_include ../../texk/make/library.mk
 
 
 #------------------------------------------------------------------------
@@ -50,4 +50,4 @@
 	 $(CC) $(ALLCFLAGS) -MM $(srcdir)/*.c) \
 	   | sed 's|$(srcdir)|$$(srcdir)|' > $(srcdir)/depend.mk
 
-ac_include fofi/depend.mk
+kpse_include fofi/depend.mk
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/libs/xpdf/goo/Makefile.in tetex-src-3.0/libs/xpdf/goo/Makefile.in
--- tetex-src-3.0.orig/libs/xpdf/goo/Makefile.in	2004-05-16 09:45:58.000000000 +0200
+++ tetex-src-3.0/libs/xpdf/goo/Makefile.in	2005-02-20 21:36:36.000000000 +0100
@@ -17,7 +17,7 @@
 CXX = @CXX@
 CFLAGS = @CFLAGS@
 
-ac_include ../../texk/make/library.mk
+kpse_include ../../texk/make/library.mk
 
 
 #------------------------------------------------------------------------
@@ -70,4 +70,4 @@
 	 $(CC) $(ALLCFLAGS) -MM $(srcdir)/*.c) \
 	   | sed 's|$(srcdir)|$$(srcdir)|' > $(srcdir)/depend.mk
 
-ac_include goo/depend.mk
+kpse_include goo/depend.mk
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/libs/xpdf/xpdf/Makefile.in tetex-src-3.0/libs/xpdf/xpdf/Makefile.in
--- tetex-src-3.0.orig/libs/xpdf/xpdf/Makefile.in	2004-07-04 09:05:47.000000000 +0200
+++ tetex-src-3.0/libs/xpdf/xpdf/Makefile.in	2005-02-20 21:36:46.000000000 +0100
@@ -20,7 +20,7 @@
 ALLCXXFLAGS = $(CXXFLAGS) @DEFS@ $(XCFLAGS) -I.. -I$(srcdir)/.. -I$(goodir) -I$(fofidir) -I. -I$(srcdir) \
 	-DPDF_PARSER_ONLY
 
-ac_include ../../texk/make/library.mk
+kpse_include ../../texk/make/library.mk
 
 .SUFFIXES:
 .SUFFIXES: .cc .o
@@ -60,4 +60,4 @@
 
 #------------------------------------------------------------------------
 
-ac_include xpdf/depend.mk
+kpse_include xpdf/depend.mk
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/libs/zlib/Makefile.in tetex-src-3.0/libs/zlib/Makefile.in
--- tetex-src-3.0.orig/libs/zlib/Makefile.in	2004-11-13 18:08:20.000000000 +0100
+++ tetex-src-3.0/libs/zlib/Makefile.in	2005-02-20 21:36:49.000000000 +0100
@@ -1,8 +1,8 @@
 # Thomas Esser, Makefile.in for zlib / teTeX. (C) 2002-2004, public domain.
 
-ac_include ../texk/make/common.mk
-ac_include ../texk/make/programs.mk
-ac_include ../texk/make/library.mk
+kpse_include ../texk/make/common.mk
+kpse_include ../texk/make/programs.mk
+kpse_include ../texk/make/library.mk
 
 OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
        zutil.o inflate.o infback.o inftrees.o inffast.o
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/Makefile.in tetex-src-3.0/texk/Makefile.in
--- tetex-src-3.0.orig/texk/Makefile.in	2005-01-21 10:11:48.000000000 +0100
+++ tetex-src-3.0/texk/Makefile.in	2005-02-20 21:38:04.000000000 +0100
@@ -7,8 +7,8 @@
 kpathsea_dir = kpathsea
 all_dirs = $(programs) $(kpathsea_dir)
 
-ac_include make/paths.mk
-ac_include make/makevars.mk
+kpse_include make/paths.mk
+kpse_include make/makevars.mk
 
 # It's too bad we have to pass all these down, but I see no alternative,
 # if we are to propagate changes at the top level.
@@ -20,10 +20,10 @@
 # Not everything from common.mk is relevant to this top-level
 # Makefile, but most of it is, and it doesn't seem worth separating the
 # compilation-specific stuff.
-ac_include make/common.mk
+kpse_include make/common.mk
 
 # Get more of the default setup.
-ac_include make/programs.mk
+kpse_include make/programs.mk
 
 # kpathsea is not a sibling, it's a child.
 kpathsea_parent = .
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/kpathsea/Makefile.in tetex-src-3.0/texk/kpathsea/Makefile.in
--- tetex-src-3.0.orig/texk/kpathsea/Makefile.in	2005-01-30 17:56:30.000000000 +0100
+++ tetex-src-3.0/texk/kpathsea/Makefile.in	2005-02-20 21:37:54.000000000 +0100
@@ -3,12 +3,12 @@
 
 # Add -DNO_DEBUG to disable debugging, for vanishingly better performance.
 
-ac_include ../make/paths.mk
-ac_include ../make/makevars.mk
-ac_include ../make/common.mk
-ac_include ../make/library.mk
-ac_include ../make/programs.mk
-ac_include ../make/texi.mk
+kpse_include ../make/paths.mk
+kpse_include ../make/makevars.mk
+kpse_include ../make/common.mk
+kpse_include ../make/library.mk
+kpse_include ../make/programs.mk
+kpse_include ../make/texi.mk
 
 @MAINT at warn_more = -Wmissing-prototypes -Wwrite-strings -Wshadow
 @MAINT at MAKEINFO_FLAGS := $(MAKEINFO_FLAGS) --no-split
@@ -248,7 +248,7 @@
 always:
 .PHONY: always
 
-ac_include ../make/config.mk
+kpse_include ../make/config.mk
 
 info: $(library).info
 dvi: $(library).dvi
@@ -267,7 +267,7 @@
 @MAINT@	$(MAKEINFO) $(one_info) $(MAKEINFO_FLAGS) $< -o $@
 @MAINT at doc: info HIER BUGS INSTALL unixtex.ftp
 
-ac_include ../make/clean.mk
+kpse_include ../make/clean.mk
 
 mostlyclean::
 	rm -f kpsewhich kpsestat kpseaccess kpsereadlink *.lo
@@ -279,7 +279,7 @@
 manfiles = kpseaccess.1 kpsestat.1 kpsewhich.1 kpsereadlink.1 \
            mktexlsr.1 mktexmf.1 mktextfm.1 mktexpk.1
 
-ac_include ../make/man.mk
+kpse_include ../make/man.mk
 
-ac_include ../make/rdepend.mk
-ac_include depend.mk
+kpse_include ../make/rdepend.mk
+kpse_include depend.mk
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/web2c/Makefile.in tetex-src-3.0/texk/web2c/Makefile.in
--- tetex-src-3.0.orig/texk/web2c/Makefile.in	2005-02-06 11:56:56.000000000 +0100
+++ tetex-src-3.0/texk/web2c/Makefile.in	2005-02-20 21:37:34.000000000 +0100
@@ -28,15 +28,15 @@
 # available from ftp://ftp.tug.org/tex/modes.mf, among other places.
 localmodes = modes
 
-ac_include ../make/paths.mk
+kpse_include ../make/paths.mk
 
 # Used for triptrap.
 DIFF = diff
 DIFFFLAGS =
 
 .SUFFIXES: # get rid of .p.o
-ac_include ../make/common.mk
-ac_include ../make/programs.mk
+kpse_include ../make/common.mk
+kpse_include ../make/programs.mk
 
 CXX = @CXX@
 CXXLD = $(CXX)
@@ -638,15 +638,15 @@
 	rm -rf tfm
 # 
 # Helper makefile fragment for pdf*tex.
-ac_include pdftexdir/pdftexlib.mk
+kpse_include pdftexdir/pdftexlib.mk
 # 
 # Makefile fragments:
-ac_include etexdir/etex.mk
-ac_include omegadir/omega.mk
-ac_include alephdir/aleph.mk
-ac_include pdftexdir/pdftex.mk
-ac_include pdfetexdir/pdfetex.mk
-ac_include pdfxtexdir/pdfxtex.mk
+kpse_include etexdir/etex.mk
+kpse_include omegadir/omega.mk
+kpse_include alephdir/aleph.mk
+kpse_include pdftexdir/pdftex.mk
+kpse_include pdfetexdir/pdfetex.mk
+kpse_include pdfxtexdir/pdfxtex.mk
 # 
 # Common
 programs = bibtex ctangle ctie cweave dvicopy dvitomp dvitype gftodvi gftopk \
@@ -799,7 +799,7 @@
 web2c/web2c: web2c/main.c web2c/web2c.h web2c/web2c.l web2c/web2c.y web2c/kps.c
 	cd web2c && $(MAKE) $(common_makeargs) web2c
 
-ac_include ../make/tkpathsea.mk
+kpse_include ../make/tkpathsea.mk
 
 # 
 # Making dumps.
@@ -1194,9 +1194,9 @@
 @MAINT@	GZIP=-9 tar czf web2c-$(version)-pdftexlibs.tar.gz $(top_distdir)
 @MAINT@	rm -rf $(top_distdir)
 
-ac_include ../make/dist.mk
+kpse_include ../make/dist.mk
 
-ac_include ../make/config.mk
+kpse_include ../make/config.mk
 
 @MAINT@$(srcdir)/configure: $(srcdir)/withenable.ac
 
@@ -1236,14 +1236,14 @@
 	test ! -r lib/Makefile \
 	  || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done
 
-ac_include ../make/clean.mk
+kpse_include ../make/clean.mk
 
 @MAINT at depend::
 @MAINT@	for d in lib mpware web2c window $(otps); do \
 @MAINT@	  (cd $$d && $(MAKE) depend); done
 
-ac_include ../make/rdepend.mk
-ac_include depend.mk
+kpse_include ../make/rdepend.mk
+kpse_include depend.mk
 
 # 
 # Local variables:
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/web2c/doc/Makefile.in tetex-src-3.0/texk/web2c/doc/Makefile.in
--- tetex-src-3.0.orig/texk/web2c/doc/Makefile.in	2005-01-13 09:07:58.000000000 +0100
+++ tetex-src-3.0/texk/web2c/doc/Makefile.in	2005-02-20 21:37:17.000000000 +0100
@@ -1,9 +1,9 @@
 # Makefile for Web2c documentation.
 
-ac_include ../make/paths.mk
-ac_include ../make/common.mk
-ac_include kpathsea.mk
-ac_include ../make/texi.mk
+kpse_include ../make/paths.mk
+kpse_include ../make/common.mk
+kpse_include kpathsea.mk
+kpse_include ../make/texi.mk
 
 info: web2c.info
 dvi: web2c.dvi
@@ -60,4 +60,4 @@
 
 #html: texi2html -expandinfo -number -menu -split_chapter
 
-ac_include ../make/clean.mk
+kpse_include ../make/clean.mk
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/web2c/lib/Makefile.in tetex-src-3.0/texk/web2c/lib/Makefile.in
--- tetex-src-3.0.orig/texk/web2c/lib/Makefile.in	2004-07-04 13:37:57.000000000 +0200
+++ tetex-src-3.0/texk/web2c/lib/Makefile.in	2005-02-20 21:37:21.000000000 +0100
@@ -1,8 +1,8 @@
 # Makefile for the web2c library.
 
-ac_include ../make/common.mk
-ac_include ../make/library.mk
-ac_include kpathsea.mk
+kpse_include ../make/common.mk
+kpse_include ../make/library.mk
+kpse_include kpathsea.mk
 
 library = lib
 
@@ -27,6 +27,6 @@
 Makefile: Makefile.in ../config.status
 	cd .. && $(SHELL) config.status
 
-ac_include ../make/clean.mk
-ac_include ../make/rdepend.mk
-ac_include lib/depend.mk
+kpse_include ../make/clean.mk
+kpse_include ../make/rdepend.mk
+kpse_include lib/depend.mk
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/web2c/man/Makefile.in tetex-src-3.0/texk/web2c/man/Makefile.in
--- tetex-src-3.0.orig/texk/web2c/man/Makefile.in	2004-12-20 20:57:52.000000000 +0100
+++ tetex-src-3.0/texk/web2c/man/Makefile.in	2005-02-20 21:37:25.000000000 +0100
@@ -10,8 +10,8 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
-ac_include ../make/common.mk
-ac_include kpathsea.mk
+kpse_include ../make/common.mk
+kpse_include kpathsea.mk
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -23,7 +23,7 @@
 # directory names.  They should match the system directories so the
 # documentation and the programs will be consistent. They are overridden
 # by make from web2c/Makefile.
-ac_include ../make/paths.mk
+kpse_include ../make/paths.mk
 
 localmodes = modes
 
@@ -68,14 +68,14 @@
 
 default all: manfiles
 
-ac_include ../make/man.mk
+kpse_include ../make/man.mk
 
 install install-data: install-man
 
 Makefile: Makefile.in ../config.status
 	(cd ..; $(SHELL) config.status)
 
-ac_include ../make/clean.mk
+kpse_include ../make/clean.mk
 
 # Prevent GNU make 3 from overflowing arg limit on system V.
 .NOEXPORT:
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/web2c/mpware/Makefile.in tetex-src-3.0/texk/web2c/mpware/Makefile.in
--- tetex-src-3.0.orig/texk/web2c/mpware/Makefile.in	2003-02-15 13:58:37.000000000 +0100
+++ tetex-src-3.0/texk/web2c/mpware/Makefile.in	2005-02-20 21:37:36.000000000 +0100
@@ -1,9 +1,9 @@
 # Makefile for the MetaPost support programs.
 
-ac_include ../make/paths.mk
-ac_include ../make/common.mk
-ac_include ../make/programs.mk
-ac_include kpathsea.mk
+kpse_include ../make/paths.mk
+kpse_include ../make/common.mk
+kpse_include ../make/programs.mk
+kpse_include kpathsea.mk
 
 proglib = ../lib/lib.a
 programs = dmp mpto newer makempx
@@ -52,11 +52,11 @@
 	$(INSTALL_SCRIPT) makempx $(scriptdir)/makempx
 install-data:
 
-ac_include ../make/tkpathsea.mk
-ac_include ../make/clean.mk
+kpse_include ../make/tkpathsea.mk
+kpse_include ../make/clean.mk
 
 mostlyclean::
 	rm -f testex1 testex2
 
-ac_include ../make/rdepend.mk
-ac_include mpware/depend.mk
+kpse_include ../make/rdepend.mk
+kpse_include mpware/depend.mk
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/web2c/omegafonts/Makefile.in tetex-src-3.0/texk/web2c/omegafonts/Makefile.in
--- tetex-src-3.0.orig/texk/web2c/omegafonts/Makefile.in	2003-02-15 13:59:12.000000000 +0100
+++ tetex-src-3.0/texk/web2c/omegafonts/Makefile.in	2005-02-20 21:37:45.000000000 +0100
@@ -1,10 +1,10 @@
 # Makefile for TeX-project WEB sources to C conversion programs.
 
 # These get expanded from the parent directory, not this one.
-ac_include ../make/common.mk
-ac_include ../make/programs.mk
-ac_include ../make/paths.mk
-ac_include kpathsea.mk
+kpse_include ../make/common.mk
+kpse_include ../make/programs.mk
+kpse_include ../make/paths.mk
+kpse_include kpathsea.mk
 
 LEX = @LEX@
 #LEXLIB = @LEXLIB@
@@ -62,11 +62,11 @@
 Makefile: Makefile.in ../config.status
 	cd .. && $(SHELL) config.status
 
-ac_include ../make/tkpathsea.mk
-ac_include ../make/clean.mk
+kpse_include ../make/tkpathsea.mk
+kpse_include ../make/clean.mk
 
 clean::
 	rm -f y_tab.c y_tab.h y.out* yacc.* $(LEX_OUTPUT_ROOT).c
 
-ac_include ../make/rdepend.mk
-ac_include omegafonts/depend.mk
+kpse_include ../make/rdepend.mk
+kpse_include omegafonts/depend.mk
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/web2c/otps/Makefile.in tetex-src-3.0/texk/web2c/otps/Makefile.in
--- tetex-src-3.0.orig/texk/web2c/otps/Makefile.in	2003-02-15 13:59:27.000000000 +0100
+++ tetex-src-3.0/texk/web2c/otps/Makefile.in	2005-02-20 21:37:28.000000000 +0100
@@ -1,10 +1,10 @@
 # Makefile for TeX-project WEB sources to C conversion programs.
 
 # These get expanded from the parent directory, not this one.
-ac_include ../make/common.mk
-ac_include ../make/programs.mk
-ac_include ../make/paths.mk
-ac_include kpathsea.mk
+kpse_include ../make/common.mk
+kpse_include ../make/programs.mk
+kpse_include ../make/paths.mk
+kpse_include kpathsea.mk
 
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -42,11 +42,11 @@
 Makefile: Makefile.in ../config.status
 	cd .. && $(SHELL) config.status
 
-ac_include ../make/tkpathsea.mk
-ac_include ../make/clean.mk
+kpse_include ../make/tkpathsea.mk
+kpse_include ../make/clean.mk
 
 clean::
 	rm -f y_tab.c y_tab.h y.out* yacc.* $(LEX_OUTPUT_ROOT).c
 
-ac_include ../make/rdepend.mk
-ac_include otps/depend.mk
+kpse_include ../make/rdepend.mk
+kpse_include otps/depend.mk
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/web2c/pdftexdir/Makefile.in tetex-src-3.0/texk/web2c/pdftexdir/Makefile.in
--- tetex-src-3.0.orig/texk/web2c/pdftexdir/Makefile.in	2004-08-06 21:41:57.000000000 +0200
+++ tetex-src-3.0/texk/web2c/pdftexdir/Makefile.in	2005-02-20 21:37:39.000000000 +0100
@@ -1,9 +1,9 @@
 # Makefile for libpdf - te at dbs.uni-hannover.de
 # $Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/Makefile.in#19 $
 
-ac_include ../make/common.mk
-ac_include ../make/programs.mk
-ac_include ../make/library.mk
+kpse_include ../make/common.mk
+kpse_include ../make/programs.mk
+kpse_include ../make/library.mk
 
 kpathsea_srcdir_parent = $(srcdir)/../..
 kpathsea_dir_parent = ../..
@@ -58,4 +58,4 @@
 	    grep -v "^$(CC)\|$(CXX)\|$(AR)\|make\|klibtool" | \
 	    sed 's: [^ ]*/\.\./libs/[^ ]*::g' > $(srcdir)/depend.mk
 
-ac_include pdftexdir/depend.mk
+kpse_include pdftexdir/depend.mk
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/web2c/web2c/Makefile.in tetex-src-3.0/texk/web2c/web2c/Makefile.in
--- tetex-src-3.0.orig/texk/web2c/web2c/Makefile.in	2004-07-11 09:54:28.000000000 +0200
+++ tetex-src-3.0/texk/web2c/web2c/Makefile.in	2005-02-20 21:37:31.000000000 +0100
@@ -6,10 +6,10 @@
 .NOTPARALLEL:
 
 # These get expanded from the parent directory, not this one.
-ac_include ../make/common.mk
-ac_include ../make/programs.mk
-ac_include ../make/cross.mk
-ac_include kpathsea.mk
+kpse_include ../make/common.mk
+kpse_include ../make/programs.mk
+kpse_include ../make/cross.mk
+kpse_include kpathsea.mk
 
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -61,11 +61,11 @@
 Makefile: Makefile.in ../config.status
 	cd .. && $(SHELL) config.status
 
-ac_include ../make/tkpathsea.mk
-ac_include ../make/clean.mk
+kpse_include ../make/tkpathsea.mk
+kpse_include ../make/clean.mk
 
 clean::
 	rm -f y_tab.c y_tab.h y.out* yacc.* $(LEX_OUTPUT_ROOT).c
 
-ac_include ../make/rdepend.mk
-ac_include web2c/depend.mk
+kpse_include ../make/rdepend.mk
+kpse_include web2c/depend.mk
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/web2c/window/Makefile.in tetex-src-3.0/texk/web2c/window/Makefile.in
--- tetex-src-3.0.orig/texk/web2c/window/Makefile.in	2002-10-20 14:25:06.000000000 +0200
+++ tetex-src-3.0/texk/web2c/window/Makefile.in	2005-02-20 21:37:42.000000000 +0100
@@ -1,8 +1,8 @@
 # Makefile for the Metafont window support library.
 
-ac_include ../make/common.mk
-ac_include ../make/library.mk
-ac_include kpathsea.mk
+kpse_include ../make/common.mk
+kpse_include ../make/library.mk
+kpse_include kpathsea.mk
 
 x_cppflags = @X_CFLAGS@
 library = window
@@ -28,10 +28,10 @@
 Makefile: Makefile.in ../config.status
 	cd .. && $(SHELL) config.status
 
-ac_include ../make/clean.mk
+kpse_include ../make/clean.mk
 
 distclean::
 	rm -f x11.c
 
-ac_include ../make/rdepend.mk
-ac_include window/depend.mk
+kpse_include ../make/rdepend.mk
+kpse_include window/depend.mk
-------------- next part --------------
	Prepare for autoconf-2.5x -- step 2 -- teTeX
	Changes to non-web2c part of teTeX-3.0 tree

	1. Replace
		AC_CONFIG_HEADER(FILE)
		...
		COMMANDS_AT_END
	by
		AC_CONFIG_HEADERS([FILE], [COMMANDS_AT_END])
	and similar

	2. Replace
		AC_OUTPUT(FILES)
	by
		KPSE_CONFIG_FILES([some FILES])
		AC_CONFIG_FILES([other FILES])
		AC_OUTPUT
	where KPSE_CONFIG_FILES enables kpse_include substitutions

diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/libs/gd/configure.in tetex-src-3.0/libs/gd/configure.in
--- tetex-src-3.0.orig/libs/gd/configure.in	2004-11-07 19:44:47.000000000 +0100
+++ tetex-src-3.0/libs/gd/configure.in	2005-02-20 21:56:07.000000000 +0100
@@ -11,7 +11,7 @@
 AC_SUBST(GDLIB_REVISION)
 AC_SUBST(GDLIBNAME)
 
-AC_CONFIG_HEADER(config.h:config.hin)
+AC_CONFIG_HEADERS(config.h:config.hin)
 
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -28,4 +28,5 @@
 sinclude(../libpng/withenable.ac)
 sinclude(../libpng/libpng.ac)
 
-AC_OUTPUT(Makefile)
+KPSE_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/libs/t1lib/configure.in tetex-src-3.0/libs/t1lib/configure.in
--- tetex-src-3.0.orig/libs/t1lib/configure.in	2004-03-10 10:06:00.000000000 +0100
+++ tetex-src-3.0/libs/t1lib/configure.in	2005-02-20 21:54:50.000000000 +0100
@@ -1,6 +1,6 @@
 AC_REVISION([configure.in 1.00])
 AC_INIT(t1base.c)
-AC_CONFIG_HEADER(sysconf.h:sysconf.h.in)
+AC_CONFIG_HEADERS(sysconf.h:sysconf.h.in)
 AC_CONFIG_AUX_DIR(../../config)
 
 define( MACRO_T1LIB_LT_CURRENT, 5)
@@ -175,4 +175,5 @@
 AC_C_CONST()
 AC_TYPE_SIZE_T()
 
-AC_OUTPUT([Makefile])
+KPSE_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/libs/type1/configure.in tetex-src-3.0/libs/type1/configure.in
--- tetex-src-3.0.orig/libs/type1/configure.in	2002-06-06 19:16:17.000000000 +0200
+++ tetex-src-3.0/libs/type1/configure.in	2005-02-20 21:55:04.000000000 +0100
@@ -1,7 +1,7 @@
 AC_REVISION([configure.in 1.00])
 AC_INIT(t1stub.c)
 AC_CONFIG_AUX_DIR(../../config)
-AC_CONFIG_HEADER(c-auto.h:c-auto.in)
+AC_CONFIG_HEADERS(c-auto.h:c-auto.in)
 
 AC_PROG_MAKE_SET
 AC_PROG_CC
@@ -33,4 +33,5 @@
   fi
 fi
 
-AC_OUTPUT([Makefile])
+KPSE_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/dviljk/configure.in tetex-src-3.0/texk/dviljk/configure.in
--- tetex-src-3.0.orig/texk/dviljk/configure.in	1999-02-08 22:42:01.000000000 +0100
+++ tetex-src-3.0/texk/dviljk/configure.in	2005-02-20 22:51:24.000000000 +0100
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(dvi2xx.c)
 
-AC_CONFIG_HEADER(c-auto.h:c-auto.in)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
 
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -14,6 +14,5 @@
 AC_C_CHAR_UNSIGNED
 AC_CHECK_SIZEOF(long)
 
-AC_OUTPUT(Makefile)
-dnl Update stamp-auto, since we just remade `c-auto.h'.
-date >stamp-auto
+KPSE_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/dvipdfm/configure.in tetex-src-3.0/texk/dvipdfm/configure.in
--- tetex-src-3.0.orig/texk/dvipdfm/configure.in	2002-12-25 22:37:44.000000000 +0100
+++ tetex-src-3.0/texk/dvipdfm/configure.in	2005-02-20 22:03:11.000000000 +0100
@@ -8,7 +8,7 @@
 AC_DEFINE(VERSION,_version_)
 AC_DEFINE(PACKAGE,"dvipdfm")
 
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
 
 AC_ARG_ENABLE(maint, [  --enable-maint          enable autoconf portions of Makefile],
   [MAINT=''], [MAINT='#'])
@@ -59,4 +59,5 @@
 AC_CHECK_FUNCS(strspn system)
 AC_CHECK_LIB(m, main)
 
-AC_OUTPUT(Makefile)
+KPSE_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/dvipng/configure.in tetex-src-3.0/texk/dvipng/configure.in
--- tetex-src-3.0.orig/texk/dvipng/configure.in	2005-02-04 20:20:26.000000000 +0100
+++ tetex-src-3.0/texk/dvipng/configure.in	2005-02-20 22:03:39.000000000 +0100
@@ -68,5 +68,6 @@
 AC_CHECK_LIB(m, main)
 AC_CHECK_LIB(gen, basename)
 
-AC_CONFIG_HEADER([config.h])
-AC_OUTPUT(Makefile)
+AC_CONFIG_HEADERS([config.h])
+KPSE_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/dvipsk/configure.in tetex-src-3.0/texk/dvipsk/configure.in
--- tetex-src-3.0.orig/texk/dvipsk/configure.in	2004-07-04 14:24:08.000000000 +0200
+++ tetex-src-3.0/texk/dvipsk/configure.in	2005-02-20 22:55:35.000000000 +0100
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(dvips.c)
 
-AC_CONFIG_HEADER(c-auto.h:c-auto.in)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
 
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -30,6 +30,5 @@
 KPSE_CROSS_BUILD_VAR(LDFLAGS, $(BUILDXLDFLAGS))
 KPSE_CROSS_BUILD_VAR(CCLD, $(BUILDCC))
 
-AC_OUTPUT(Makefile)
-dnl Update stamp-auto, since we just remade `c-auto.h'.
-date >stamp-auto
+KPSE_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/gsftopk/configure.in tetex-src-3.0/texk/gsftopk/configure.in
--- tetex-src-3.0.orig/texk/gsftopk/configure.in	1999-04-22 07:53:37.000000000 +0200
+++ tetex-src-3.0/texk/gsftopk/configure.in	2005-02-20 22:55:38.000000000 +0100
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(gsftopk.c)
 
-AC_CONFIG_HEADER(c-auto.h:c-auto.in)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
 
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -24,5 +24,5 @@
   AC_CHECK_HEADERS(sys/select.h select.h)
 fi
 
-AC_OUTPUT(Makefile)
-date >stamp-auto
+KPSE_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/makeindexk/configure.in tetex-src-3.0/texk/makeindexk/configure.in
--- tetex-src-3.0.orig/texk/makeindexk/configure.in	2002-10-02 14:29:04.000000000 +0200
+++ tetex-src-3.0/texk/makeindexk/configure.in	2005-02-20 22:55:46.000000000 +0100
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(mkind.c)
 
-AC_CONFIG_HEADER(c-auto.h:c-auto.in)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
 
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -14,7 +14,5 @@
 AC_HAVE_HEADERS(ctype.h types.h locale.h)
 AC_CHECK_FUNCS(strchr strrchr setlocale)
 
-AC_OUTPUT(Makefile)
-
-dnl update `stamp-auto' since we just remade `c-auto.h'
-date >stamp-auto
+KPSE_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/ps2pkm/configure.in tetex-src-3.0/texk/ps2pkm/configure.in
--- tetex-src-3.0.orig/texk/ps2pkm/configure.in	2001-10-30 22:09:23.000000000 +0100
+++ tetex-src-3.0/texk/ps2pkm/configure.in	2005-02-20 22:52:29.000000000 +0100
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(arith.c)
 
-AC_CONFIG_HEADER(c-auto.h:c-auto.in)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
 
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -19,7 +19,5 @@
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(memset)
 
-AC_OUTPUT(Makefile)
-
-dnl update `stamp-auto' since we just remade `c-auto.h'
-date >stamp-auto
+KPSE_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/tetex/configure.in tetex-src-3.0/texk/tetex/configure.in
--- tetex-src-3.0.orig/texk/tetex/configure.in	2002-11-01 19:19:16.000000000 +0100
+++ tetex-src-3.0/texk/tetex/configure.in	2005-02-20 21:56:32.000000000 +0100
@@ -8,4 +8,5 @@
 
 sinclude(../kpathsea/withenable.ac)
 
-AC_OUTPUT(Makefile)
+KPSE_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/xdvik/configure.in tetex-src-3.0/texk/xdvik/configure.in
--- tetex-src-3.0.orig/texk/xdvik/configure.in	2005-01-24 00:42:17.000000000 +0100
+++ tetex-src-3.0/texk/xdvik/configure.in	2005-02-20 22:59:27.000000000 +0100
@@ -6,7 +6,8 @@
 AC_INIT(xdvi.c)
 AC_PREREQ(2.13)
 
-AC_CONFIG_HEADER(c-auto.h:c-auto.in)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
+
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
@@ -277,7 +278,6 @@
 KPSE_CROSS_BUILD_VAR(LDFLAGS, $(BUILDXLDFLAGS))
 KPSE_CROSS_BUILD_VAR(CCLD, $(BUILDCC))
 
-AC_OUTPUT(Makefile gui/Makefile xdvi-sh)
-
-dnl update `stamp-auto' since we just remade `c-auto.h'
-date >stamp-auto
+KPSE_CONFIG_FILES([Makefile gui/Makefile])
+AC_CONFIG_FILES([xdvi-sh])
+AC_OUTPUT
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/utils/dialog/configure.in tetex-src-3.0/utils/dialog/configure.in
--- tetex-src-3.0.orig/utils/dialog/configure.in	2004-10-05 21:10:06.000000000 +0200
+++ tetex-src-3.0/utils/dialog/configure.in	2005-02-20 22:03:51.000000000 +0100
@@ -9,7 +9,7 @@
 AC_ISC_POSIX
 AC_PROG_INSTALL
 AC_SET_MAKE
-AC_CONFIG_HEADER(dialogconfig.h)
+AC_CONFIG_HEADERS(dialogconfig.h)
 AC_CHECK_FUNCS(strcasecmp)
 
 sinclude(../../libs/ncurses/withenable.ac)
@@ -17,4 +17,5 @@
 
 dnl ac_configure_args=`echo "$ac_configure_args" | sed 's at --prefix=[[^ ]]*@@'`
 
-AC_OUTPUT(Makefile)
+KPSE_CONFIG_FILES([Makefile])
+AC_OUTPUT
-------------- next part --------------
	Prepare for autoconf-2.5x -- step 2 -- web2c
	Changes to web2c part of teTeX-3.0 tree

	1. Replace
		AC_CONFIG_HEADER(FILE)
		...
		COMMANDS_AT_END
	by
		AC_CONFIG_HEADERS([FILE], [COMMANDS_AT_END])
	and similar

	2. Replace
		AC_OUTPUT(FILES)
	by
		KPSE_CONFIG_FILES([some FILES])
		AC_CONFIG_FILES([other FILES])
		AC_OUTPUT
	where KPSE_CONFIG_FILES enables kpse_include substitutions

diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/configure.in tetex-src-3.0/configure.in
--- tetex-src-3.0.orig/configure.in	2005-02-01 22:59:46.000000000 +0100
+++ tetex-src-3.0/configure.in	2005-02-20 22:03:57.000000000 +0100
@@ -223,4 +223,5 @@
 AC_SUBST(INSTDIRS)
 
 AC_CONFIG_SUBDIRS(libs $ESUBDIRS texk)
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/libs/configure.in tetex-src-3.0/libs/configure.in
--- tetex-src-3.0.orig/libs/configure.in	2005-02-18 09:06:20.000000000 +0100
+++ tetex-src-3.0/libs/configure.in	2005-02-20 21:55:32.000000000 +0100
@@ -53,4 +53,5 @@
 fi
 
 AC_CONFIG_SUBDIRS($subconfigures)
-AC_OUTPUT($outfiles)
+KPSE_CONFIG_FILES([$outfiles])
+AC_OUTPUT
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/libs/xpdf/configure.in tetex-src-3.0/libs/xpdf/configure.in
--- tetex-src-3.0.orig/libs/xpdf/configure.in	2004-05-16 09:46:17.000000000 +0200
+++ tetex-src-3.0/libs/xpdf/configure.in	2005-02-20 21:54:05.000000000 +0100
@@ -1,6 +1,6 @@
 AC_INIT(xpdf/Array.cc)
 AC_CONFIG_AUX_DIR(../../config)
-AC_CONFIG_HEADER(aconf.h)
+AC_CONFIG_HEADERS(aconf.h)
 
 dnl ##### Optional features.
 AC_ARG_ENABLE(a4-paper,
@@ -89,4 +89,6 @@
 AC_LANG_C
 
 dnl ##### Write the makefiles.
-AC_OUTPUT(Makefile xpdf/Makefile goo/Makefile fofi/Makefile)
+AC_CONFIG_FILES([Makefile])
+KPSE_CONFIG_FILES([xpdf/Makefile goo/Makefile fofi/Makefile])
+AC_OUTPUT
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/configure.in tetex-src-3.0/texk/configure.in
--- tetex-src-3.0.orig/texk/configure.in	2004-05-12 22:32:37.000000000 +0200
+++ tetex-src-3.0/texk/configure.in	2005-02-20 22:03:20.000000000 +0100
@@ -64,4 +64,5 @@
 
 AC_CONFIG_SUBDIRS(kpathsea web2c $ESUBDIRS)
 
-AC_OUTPUT(Makefile)
+KPSE_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/kpathsea/common.ac tetex-src-3.0/texk/kpathsea/common.ac
--- tetex-src-3.0.orig/texk/kpathsea/common.ac	2004-07-04 12:31:17.000000000 +0200
+++ tetex-src-3.0/texk/kpathsea/common.ac	2005-02-20 22:59:34.000000000 +0100
@@ -6,7 +6,7 @@
 AC_PREREQ(2.12.1)
 
 dnl Write output here, instead of putting a zillion -D's on the command line.
-AC_CONFIG_HEADER(c-auto.h:c-auto.in)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
 
 AC_PROG_CC
 AC_PROG_INSTALL
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/kpathsea/configure.in tetex-src-3.0/texk/kpathsea/configure.in
--- tetex-src-3.0.orig/texk/kpathsea/configure.in	2004-12-28 19:27:28.000000000 +0100
+++ tetex-src-3.0/texk/kpathsea/configure.in	2005-02-20 22:59:30.000000000 +0100
@@ -7,6 +7,5 @@
 
 sinclude(common.ac)
 
-AC_OUTPUT(Makefile)
-dnl Update stamp-auto, since we just remade `c-auto.h'.
-date >stamp-auto
+KPSE_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/web2c/configure.in tetex-src-3.0/texk/web2c/configure.in
--- tetex-src-3.0.orig/texk/web2c/configure.in	2005-01-08 20:55:16.000000000 +0100
+++ tetex-src-3.0/texk/web2c/configure.in	2005-02-20 22:58:15.000000000 +0100
@@ -21,7 +21,7 @@
 AC_DEFINE_UNQUOTED(WEB2CVERSION," (Web2C $WEB2CVERSION)")
 
 dnl Write output here, instead of putting a zillion -D's on the command line.
-AC_CONFIG_HEADER(c-auto.h:c-auto.in)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
 
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -392,9 +392,8 @@
 fi
 
 dnl Generate `Makefile's, `config.status', and our header file.
-AC_OUTPUT(Makefile doc/Makefile lib/Makefile man/Makefile mpware/Makefile 
+KPSE_CONFIG_FILES([Makefile doc/Makefile lib/Makefile man/Makefile mpware/Makefile 
           web2c/Makefile window/Makefile
           $libpdfmakefile $libpdfemakefile $libpdfxmakefile
-          $omegafontsmakefile $otpsmakefile fmtutil.cnf:fmtutil.in)
-dnl Update stamp-auto, since we just remade `c-auto.h'.
-date >stamp-auto
+          $omegafontsmakefile $otpsmakefile fmtutil.cnf:fmtutil.in])
+AC_OUTPUT
-------------- next part --------------
	Prepare for autoconf-2.5x -- step 3 -- teTeX
	Changes to non-web2c part of teTeX-3.0 tree

	Quote all arguments of AC_ARG_WITH and AC_ARG_ENABLE.

diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/libs/gd/withenable.ac tetex-src-3.0/libs/gd/withenable.ac
--- tetex-src-3.0.orig/libs/gd/withenable.ac	2004-05-04 20:25:23.000000000 +0200
+++ tetex-src-3.0/libs/gd/withenable.ac	2005-02-21 18:29:40.000000000 +0100
@@ -1,10 +1,10 @@
-AC_ARG_WITH(system_gd,
+AC_ARG_WITH([system_gd],
 	[  --with-system-gd         use installed gd library])
 
-AC_ARG_WITH(gd_libdir,
+AC_ARG_WITH([gd_libdir],
 [  --with-gd-libdir=DIR
                           Specify directory where the gd library resides.])
 
-AC_ARG_WITH(gd_include,
+AC_ARG_WITH([gd_include],
 [  --with-gd-include=DIR
                           Specify the gd header files location.])
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/libs/ncurses/withenable.ac tetex-src-3.0/libs/ncurses/withenable.ac
--- tetex-src-3.0.orig/libs/ncurses/withenable.ac	2004-10-23 21:06:41.000000000 +0200
+++ tetex-src-3.0/libs/ncurses/withenable.ac	2005-02-21 18:30:28.000000000 +0100
@@ -1,15 +1,15 @@
 dnl withenable.ac: --with and --enable options.
 try_ncurses=no
-AC_ARG_WITH(system-ncurses,
+AC_ARG_WITH([system-ncurses],
         [  --with-system-ncurses   check for installed ncurses],
         [test "$withval" = "yes" && try_ncurses=yes],
         [try_ncurses=no])
 
-AC_ARG_WITH(ncurses_libdir,
+AC_ARG_WITH([ncurses_libdir],
 [  --with-ncurses-libdir=DIR
                           Specify directory where the ncurses library resides.])
 
-AC_ARG_WITH(ncurses_include,
+AC_ARG_WITH([ncurses_include],
 [  --with-ncurses-include=DIR
                           Specify the ncurses header files location.])
 
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/libs/t1lib/withenable.ac tetex-src-3.0/libs/t1lib/withenable.ac
--- tetex-src-3.0.orig/libs/t1lib/withenable.ac	2003-12-13 00:32:09.000000000 +0100
+++ tetex-src-3.0/libs/t1lib/withenable.ac	2005-02-21 18:30:35.000000000 +0100
@@ -1,10 +1,10 @@
-AC_ARG_WITH(system-t1lib,
+AC_ARG_WITH([system-t1lib],
 [  --with-system-t1lib	  Use installed T1lib])
 
-AC_ARG_WITH(t1lib_libdir,
+AC_ARG_WITH([t1lib_libdir],
 [  --with-t1lib-libdir=DIR
                           Specify the location of T1lib library files (libt1.a)])
 
-AC_ARG_WITH(t1lib_include,
+AC_ARG_WITH([t1lib_include],
 [  --with-t1lib-include=DIR
                           Specify the location of T1lib header files])
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/dvipdfm/configure.in tetex-src-3.0/texk/dvipdfm/configure.in
--- tetex-src-3.0.orig/texk/dvipdfm/configure.in	2005-02-20 22:03:11.000000000 +0100
+++ tetex-src-3.0/texk/dvipdfm/configure.in	2005-02-21 18:21:12.000000000 +0100
@@ -10,7 +10,7 @@
 
 AC_CONFIG_HEADERS(config.h)
 
-AC_ARG_ENABLE(maint, [  --enable-maint          enable autoconf portions of Makefile],
+AC_ARG_ENABLE([maint], [  --enable-maint          enable autoconf portions of Makefile],
   [MAINT=''], [MAINT='#'])
 AC_SUBST(MAINT)  
 
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/xdvik/configure.in tetex-src-3.0/texk/xdvik/configure.in
--- tetex-src-3.0.orig/texk/xdvik/configure.in	2005-02-20 22:59:27.000000000 +0100
+++ tetex-src-3.0/texk/xdvik/configure.in	2005-02-21 18:39:06.000000000 +0100
@@ -134,14 +134,14 @@
 prog_extension="xaw"
 motif_include=
 motif_libdir=
-AC_ARG_WITH(motif-include,
+AC_ARG_WITH([motif-include],
 [  --with-motif-include=DIR
                           Specify the location of Motif include files],
-motif_include="$withval")
-AC_ARG_WITH(motif-libdir,
+[motif_include="$withval"])
+AC_ARG_WITH([motif-libdir],
 [  --with-motif-libdir=DIR
                           Specify the location of Motif libraries],
-motif_libdir="$withval")
+[motif_libdir="$withval"])
 
 if test "x$with_xdvi_x_toolkit" = xno; then
    AC_MSG_WARN([xdvi needs at least the Xaw toolkit - ignoring the 'notool' option])
@@ -167,7 +167,7 @@
 fi
 AC_SUBST(x_tool_libs)
 
-AC_ARG_WITH(iconv-libdir,
+AC_ARG_WITH([iconv-libdir],
 [  --with-iconv-libdir=DIR
                           Specify the location of iconv library (librecode.so)],
 [if test XXX"$withval" != "XXX"; then
@@ -190,7 +190,7 @@
 AC_SUBST(iconv_libpath)
 AC_SUBST(iconv_libs)
 
-AC_ARG_WITH(iconv-include,
+AC_ARG_WITH([iconv-include],
 [  --with-iconv-include=DIR
                           Specify the location of iconv header (iconv.h)],
 [if test XXX"$withval" != "XXX"; then
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/xdvik/withenable.ac tetex-src-3.0/texk/xdvik/withenable.ac
--- tetex-src-3.0.orig/texk/xdvik/withenable.ac	2004-12-09 21:22:13.000000000 +0100
+++ tetex-src-3.0/texk/xdvik/withenable.ac	2005-02-21 18:41:11.000000000 +0100
@@ -2,17 +2,17 @@
 
 # Check if the user wants to use Ghostscript, DPS or NeWS to
 # display PostScript.
-AC_ARG_WITH(ps,
+AC_ARG_WITH([ps],
 [  --with-ps=PS            Use PostScript (PS=no/yes/gs/dps/news, default gs)],
 [case $withval in
   yes|gs) PS_DEF="$PS_DEF -DPS_GS";;
       no) PS_DEF=no;;
      dps) PS_DEF="$PS_DEF -DPS_DPS";;
     news) PS_DEF="$PS_DEF -DPS_NEWS";;
-       *)] AC_MSG_WARN(Unknown --with-ps argument \`$withval'; using gs.);;
- esac)
+       *) AC_MSG_WARN([Unknown --with-ps argument \`$withval'; using gs.]);;
+ esac])
 
-AC_ARG_ENABLE(grey,
+AC_ARG_ENABLE([grey],
 [  --disable-grey          Disable greyscale anti-aliasing for shrunken bitmaps]
 ,
 [if test "$enableval" = yes; then
@@ -20,36 +20,36 @@
  else
   echo DISABLED grey
 fi],
-AC_DEFINE(GREY))
+[AC_DEFINE(GREY)])
 
-AC_ARG_ENABLE(color,
+AC_ARG_ENABLE([color],
 [  --disable-color         Disable support for color specials],
 [if test "$enableval" = yes; then
   AC_DEFINE(COLOR)
  else
   echo DISABLED color
 fi],
-AC_DEFINE(COLOR))
+[AC_DEFINE(COLOR)])
 
-dnl OBSOLETE AC_ARG_ENABLE(buttons,
+dnl OBSOLETE AC_ARG_ENABLE([buttons],
 dnl OBSOLETE [  --disable-buttons       Disable buttons on the side of the window],
 dnl OBSOLETE [if test "$enableval" = yes; then
 dnl OBSOLETE   AC_DEFINE(BUTTONS)
 dnl OBSOLETE  else
 dnl OBSOLETE   echo DISABLED buttons
 dnl OBSOLETE fi],
-dnl OBSOLETE AC_DEFINE(BUTTONS))
+dnl OBSOLETE [AC_DEFINE(BUTTONS)])
 
-dnl OBSOLETE AC_ARG_ENABLE(statusline,
+dnl OBSOLETE AC_ARG_ENABLE([statusline],
 dnl OBSOLETE [  --disable-statusline    Disable statusline at bottom of window],
 dnl OBSOLETE [if test "$enableval" = yes; then
 dnl OBSOLETE   AC_DEFINE(STATUSLINE)
 dnl OBSOLETE  else
 dnl OBSOLETE   echo DISABLED statusline
 dnl OBSOLETE fi],
-dnl OBSOLETE AC_DEFINE(STATUSLINE))
+dnl OBSOLETE [AC_DEFINE(STATUSLINE)])
 
-AC_ARG_ENABLE(t1lib,
+AC_ARG_ENABLE([t1lib],
 [  --disable-t1lib         Do not use T1lib (direct rendering of Type1 fonts)],
 [if test "$enableval" = yes; then
   T1LIB=1
@@ -61,12 +61,12 @@
   LDT1LIB=
   echo DISABLED t1lib
 fi],
-T1LIB=1
+[T1LIB=1
 LDT1LIB=../../libs/t1lib/lib/.libs/libt1.a
 AC_DEFINE(LDT1LIB)
-AC_DEFINE(T1LIB))
+AC_DEFINE(T1LIB)])
 
-AC_ARG_ENABLE(gf,
+AC_ARG_ENABLE([gf],
 [  --enable-gf             Enable gf format pixel files (in addition to pk)],
 [if test "$enableval" != no; then
   AC_DEFINE(USE_GF)
@@ -74,16 +74,16 @@
   OPT_OBJS="$OPT_OBJS gf.o"
 fi])
 
-AC_ARG_ENABLE(a4,
+AC_ARG_ENABLE([a4],
 [  --disable-a4            Set default paper size to letter and default unit to inch],
 [if test "$enableval" = yes; then
   AC_DEFINE(A4)
  else
   echo Disabled a4/cm, using letter/in instead
 fi],
-AC_DEFINE(A4))
+[AC_DEFINE(A4)])
 
-AC_ARG_ENABLE(magick,
+AC_ARG_ENABLE([magick],
 [  --enable-magick         Use ImageMagick to load/render image files.
                           EXPERIMENTAL - DO NOT USE!],
 [if test "$enableval" != no; then
@@ -131,7 +131,7 @@
 
 dnl Remember to add AC_PATH_XTRA when actually using X.
 
-AC_ARG_WITH(xdvi-x-toolkit,
+AC_ARG_WITH([xdvi-x-toolkit],
 [  --with-xdvi-x-toolkit=KIT
 			  Use toolkit KIT for xdvi (KIT=motif/xaw/xaw3d/neXtaw).
 			  If no --with-xdvi-x-toolkit option is used, use Motif
-------------- next part --------------
	Prepare for autoconf-2.5x -- step 3 -- web2c
	Changes to web2c part of teTeX-3.0 tree

	Quote all arguments of AC_ARG_WITH and AC_ARG_ENABLE.

diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/libs/libpng/withenable.ac tetex-src-3.0/libs/libpng/withenable.ac
--- tetex-src-3.0.orig/libs/libpng/withenable.ac	1998-10-07 23:27:06.000000000 +0200
+++ tetex-src-3.0/libs/libpng/withenable.ac	2005-02-21 18:29:45.000000000 +0100
@@ -1,10 +1,10 @@
-AC_ARG_WITH(system-pnglib,
+AC_ARG_WITH([system-pnglib],
 	[  --with-system-pnglib       use installed pnglib library])
 
-AC_ARG_WITH(pnglib_libdir,
+AC_ARG_WITH([pnglib_libdir],
 [  --with-pnglib-libdir=DIR
                           Specify directory where the png library (libpng.a) resides.])
 
-AC_ARG_WITH(pnglib_include,
+AC_ARG_WITH([pnglib_include],
 [  --with-pnglib-include=DIR
                           Specify the pnglib header files location.])
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/libs/xpdf/configure.in tetex-src-3.0/libs/xpdf/configure.in
--- tetex-src-3.0.orig/libs/xpdf/configure.in	2005-02-20 21:54:05.000000000 +0100
+++ tetex-src-3.0/libs/xpdf/configure.in	2005-02-21 18:21:10.000000000 +0100
@@ -3,16 +3,16 @@
 AC_CONFIG_HEADERS(aconf.h)
 
 dnl ##### Optional features.
-AC_ARG_ENABLE(a4-paper,
+AC_ARG_ENABLE([a4-paper],
 [  --enable-a4-paper       use A4 paper size instead of Letter for
                           PostScript output],
-AC_DEFINE(A4_PAPER))
+[AC_DEFINE(A4_PAPER)])
 AC_ARG_ENABLE(opi,
 [  --enable-opi            include support for OPI comments],
-AC_DEFINE(OPI_SUPPORT))
-AC_ARG_ENABLE(multithreaded,
+[AC_DEFINE(OPI_SUPPORT)])
+AC_ARG_ENABLE([multithreaded],
 [  --enable-multithreaded  include support for multithreading],
-AC_DEFINE(MULTITHREADED))
+[AC_DEFINE(MULTITHREADED)])
 
 dnl ##### Path to xpdfrc.
 dnl This ugly kludge to get the sysconfdir path is needed because
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/libs/zlib/withenable.ac tetex-src-3.0/libs/zlib/withenable.ac
--- tetex-src-3.0.orig/libs/zlib/withenable.ac	2001-11-13 20:28:01.000000000 +0100
+++ tetex-src-3.0/libs/zlib/withenable.ac	2005-02-21 18:30:45.000000000 +0100
@@ -1,10 +1,10 @@
-AC_ARG_WITH(system_zlib,
+AC_ARG_WITH([system_zlib],
 	[  --with-system-zlib         use installed zlib library])
 
-AC_ARG_WITH(zlib_libdir,
+AC_ARG_WITH([zlib_libdir],
 [  --with-zlib-libdir=DIR
                           Specify directory where the zlib.a resides.])
 
-AC_ARG_WITH(zlib_include,
+AC_ARG_WITH([zlib_include],
 [  --with-zlib-include=DIR
                           Specify the zlib header files location.])
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/kpathsea/withenable.ac tetex-src-3.0/texk/kpathsea/withenable.ac
--- tetex-src-3.0.orig/texk/kpathsea/withenable.ac	2004-10-05 21:09:04.000000000 +0200
+++ tetex-src-3.0/texk/kpathsea/withenable.ac	2005-02-21 18:34:37.000000000 +0100
@@ -17,26 +17,26 @@
 CF_SUBST(archiver,AR,ar)
 CF_SUBST(archiver options,ARFLAGS,rc)
 
-AC_ARG_WITH(mktexmf-default,
+AC_ARG_WITH([mktexmf-default],
 [  --without-mktexmf-default    do not run mktexmf if MF source missing],
-  , with_mktexmf_default=yes)
-AC_ARG_WITH(mktexpk-default,
+  , [with_mktexmf_default=yes])
+AC_ARG_WITH([mktexpk-default],
 [  --without-mktexpk-default    do not run mktexpk if PK font missing],
-  , with_mktexpk_default=yes)
-AC_ARG_WITH(mktextfm-default,
+  , [with_mktexpk_default=yes])
+AC_ARG_WITH([mktextfm-default],
 [  --without-mktextfm-default   do not run mktextfm if TFM file missing],
-   , with_mktextfm_default=yes)
-AC_ARG_WITH(mkocp-default,
+   , [with_mktextfm_default=yes])
+AC_ARG_WITH([mkocp-default],
 [  --without-mkocp-default      do not run mkocp if OCP file missing],
-   , with_mkocp_default=yes)
-AC_ARG_WITH(mkofm-default,
+   , [with_mkocp_default=yes])
+AC_ARG_WITH([mkofm-default],
 [  --without-mkofm-default      do not run mkofm if OFM file missing],
-   , with_mkofm_default=yes)
-AC_ARG_WITH(mktexfmt-default,
+   , [with_mkofm_default=yes])
+AC_ARG_WITH([mktexfmt-default],
 [  --with-mktexfmt-default      run mktexfmt if format file missing])
-AC_ARG_WITH(mktextex-default,
+AC_ARG_WITH([mktextex-default],
 [  --with-mktextex-default      run mktextex if TeX source missing],
-  with_mktextex_default=yes, with_mktextex_default=no)
+  [with_mktextex_default=yes], [with_mktextex_default=no])
 
 dnl Check whether we can find a texmf tree.  Look at the most common spots.
 dnl Not a switch, but something that must be included everywhere, even at
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/kpathsea/xt.ac tetex-src-3.0/texk/kpathsea/xt.ac
--- tetex-src-3.0.orig/texk/kpathsea/xt.ac	2004-12-20 20:52:36.000000000 +0100
+++ tetex-src-3.0/texk/kpathsea/xt.ac	2005-02-21 18:35:13.000000000 +0100
@@ -1,6 +1,6 @@
 dnl Included by web2c and xdvik to handle the obsolete --with-x-toolkit option.
 
-AC_ARG_WITH(x-toolkit,
+AC_ARG_WITH([x-toolkit],
 [  --with-x-toolkit=KIT    OBSOLETE: use --with-mf-x-toolkit and/or
                           --with-xdvi-x-toolkit instead.],
 [
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/web2c/withenable.ac tetex-src-3.0/texk/web2c/withenable.ac
--- tetex-src-3.0.orig/texk/web2c/withenable.ac	2005-01-21 11:29:12.000000000 +0100
+++ tetex-src-3.0/texk/web2c/withenable.ac	2005-02-21 18:23:37.000000000 +0100
@@ -5,49 +5,48 @@
 
 dnl Do we compile e-TeX?
 dnl We default to yes if the sources are available.
-AC_ARG_WITH(etex,
+AC_ARG_WITH([etex],
 [  --without-etex             don't compile and install e-TeX])
 
 dnl Do we compile Omega?
 dnl We default to yes if the sources are available.
-AC_ARG_WITH(omega,
+AC_ARG_WITH([omega],
 [  --without-omega            don't compile and install Omega])
 
 dnl Do we compile Aleph?
 dnl We default to yes if the sources are available.
-AC_ARG_WITH(aleph,
+AC_ARG_WITH([aleph],
 [  --without-aleph            don't compile and install Aleph])
 
 dnl Do we compile pdfTeX?
 dnl We default to yes if the sources are available.
-AC_ARG_WITH(pdftex,
+AC_ARG_WITH([pdftex],
 [  --without-pdftex           don't compile and install pdfTeX])
 
 dnl Do we compile pdfeTeX?
 dnl We default to yes if the sources are available.
-AC_ARG_WITH(pdfetex,
+AC_ARG_WITH([pdfetex],
 [  --without-pdfetex          don't compile and install pdfeTeX])
 
 dnl Do we compile pdfxTeX?
 dnl We default to yes if the sources are available.
-AC_ARG_WITH(pdfxtex,
+AC_ARG_WITH([pdfxtex],
 [  --without-pdfxtex          don't compile and install pdfxTeX])
 
 dnl Try to link C++ runtime statically?
 dnl Only important, if you want to create binaries which are slightly
 dnl more portable.
-AC_ARG_WITH(cxx-runtime-hack,
+AC_ARG_WITH([cxx-runtime-hack],
 [  --with-cxx-runtime-hack    link C++ runtime statically])
 
-AC_ARG_WITH(editor, changequote(`,')dnl
-`  --with-editor=CMD       invoke CMD from the e option [vi +%d %s]',
-changequote([,])dnl
-  AC_DEFINE_UNQUOTED(EDITOR, "$with_editor")
-)
+AC_ARG_WITH([editor],
+[  --with-editor=CMD       invoke CMD from the e option [[vi +%d %s]]],
+  [AC_DEFINE_UNQUOTED(EDITOR, "$with_editor")
+])
 
-AC_ARG_ENABLE(ipc,
+AC_ARG_ENABLE([ipc],
 [  --enable-ipc            enable TeX's --ipc option, i.e., pipe to a program],
-if test "x$enableval" = xyes; then
+[if test "x$enableval" = xyes; then
   AC_DEFINE(IPC)
   # -lsocket is needed on Solaris, at least.  Maybe -lnsl on SCO, too?
   # See ac_path_xtra.
@@ -56,88 +55,88 @@
     AC_CHECK_LIB(socket, connect, socketlibs="-lsocket $socketlibs")
   fi
 fi
-)
+])
 AC_SUBST(socketlibs)
 
-AC_ARG_ENABLE(auto-core,
+AC_ARG_ENABLE([auto-core],
 [  --enable-auto-core      cause TeX&MF to dump core given a certain filename],
-  AC_DEFINE(FUNNY_CORE_DUMP))
+  [AC_DEFINE(FUNNY_CORE_DUMP)])
 
-AC_ARG_ENABLE(dump-share,
+AC_ARG_ENABLE([dump-share],
 [  --disable-dump-share    make fmt/base/mem files architecture-dependent],
-if test "x$enableval" = xno; then
+[if test "x$enableval" = xno; then
   AC_DEFINE(NO_DUMP_SHARE)
 fi
-)
+])
 
-AC_ARG_ENABLE(fmtutil,
+AC_ARG_ENABLE([fmtutil],
 [  --enable-fmtutil    use fmtutil for build dumps])
 
 dnl Do we include Window system support in MF?
 dnl Here we have three choices: yes, no, and as a separate executable mfw.
 dnl We default to mf.
-AC_ARG_WITH(mf-nowin,
+AC_ARG_WITH([mf-nowin],
 [  --with-mf-nowin           build a separate non-windows-capable METAFONT])
 
 # Window system support for Metafont.
-AC_ARG_WITH(epsfwin,
+AC_ARG_WITH([epsfwin],
   [  --with-epsfwin          include EPSF pseudo-window support],
-if test "x$withval" = xyes; then
+[if test "x$withval" = xyes; then
   AC_DEFINE(EPSFWIN)
 fi
-)
-AC_ARG_WITH(hp2627win,
+])
+AC_ARG_WITH([hp2627win],
   [  --with-hp2627win        include HP 2627 window support in Metafont],
-if test "x$withval" = xyes; then
+[if test "x$withval" = xyes; then
   AC_DEFINE(HP2627WIN)
 fi
-)
-AC_ARG_WITH(mftalkwin,
+])
+AC_ARG_WITH([mftalkwin],
   [  --with-mftalkwin        include mftalk (generic server) window support],
-if test "x$withval" = xyes; then
+[if test "x$withval" = xyes; then
   AC_DEFINE(MFTALKWIN)
 fi
-)
-AC_ARG_WITH(nextwin,
+])
+AC_ARG_WITH([nextwin],
   [  --with-nextwin          include NeXT window support],
-if test "x$withval" = xyes; then
+[if test "x$withval" = xyes; then
   AC_DEFINE(NEXTWIN)
 fi
-)
-AC_ARG_WITH(regiswin,
+])
+AC_ARG_WITH([regiswin],
   [  --with-regiswin         include Regis window support],
-if test "x$withval" = xyes; then
+[if test "x$withval" = xyes; then
   AC_DEFINE(REGISWIN)
 fi
-)
-AC_ARG_WITH(suntoolswin,
+])
+AC_ARG_WITH([suntoolswin],
   [  --with-suntoolswin      include old Suntools window support (this is not X)],
-if test "x$withval" = xyes; then
+[if test "x$withval" = xyes; then
   wlibs="-lsuntool -lsunwindow -lpixrect $wlibs"
   AC_DEFINE(SUNWIN)
 fi
-)
-AC_ARG_WITH(tektronixwin,
+])
+AC_ARG_WITH([tektronixwin],
   [  --with-tektronixwin     include Tektronix window support],
-if test "x$withval" = xyes; then
+[if test "x$withval" = xyes; then
   AC_DEFINE(TEKTRONIXWIN)
 fi
-)
-AC_ARG_WITH(unitermwin,
+])
+AC_ARG_WITH([unitermwin],
   [  --with-unitermwin       include Uniterm window support],
-if test "x$withval" = xyes; then
+[if test "x$withval" = xyes; then
   AC_DEFINE(UNITERMWIN)
 fi
-)
+])
 
 sinclude(../kpathsea/xt.ac)
 
-AC_ARG_WITH(x11win,
+AC_ARG_WITH([x11win],
   [  --with-x11win           same as --with-x],
-  with_x="$withval")
-AC_ARG_WITH(x11,
+  [with_x="$withval"])
+AC_ARG_WITH([x11],
   [  --with-x11              same as --with-x],
-  with_x="$withval")
+  [with_x="$withval"])
 
 dnl This defines --with-x implicitly (which is why we use that package
 dnl name below), so put it here, so it comes first in the --help output.
@@ -145,7 +144,7 @@
 
 dnl Remember to add AC_PATH_XTRA when actually using X.
 
-AC_ARG_WITH(mf-x-toolkit,
+AC_ARG_WITH([mf-x-toolkit],
 [  --with-mf-x-toolkit    Use X toolkit for mf.],
 [         case "${withval}" in
             y | ye | yes )      val=yes ;;
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/texk/withenable.ac tetex-src-3.0/texk/withenable.ac
--- tetex-src-3.0.orig/texk/withenable.ac	2004-05-04 16:26:01.000000000 +0200
+++ tetex-src-3.0/texk/withenable.ac	2005-02-21 18:37:00.000000000 +0100
@@ -1,50 +1,50 @@
 dnl withenable.ac: --with and --enable options.
 
-AC_ARG_WITH(bibtex8,
+AC_ARG_WITH([bibtex8],
 	[  --without-bibtex8          do not build the bibtex8 package])
-AC_ARG_WITH(cjkutils,
+AC_ARG_WITH([cjkutils],
 	[  --without-cjkutils         do not build the cjkutils package])
-AC_ARG_WITH(detex,
+AC_ARG_WITH([detex],
 	[  --without-detex            do not build the detex package])
-AC_ARG_WITH(dtl,
+AC_ARG_WITH([dtl],
 	[  --without-dtl              do not build the dtl package])
-AC_ARG_WITH(dvi2tty,
+AC_ARG_WITH([dvi2tty],
 	[  --without-dvi2tty          do not build the dvi2tty package])
-AC_ARG_WITH(dvidvi,
+AC_ARG_WITH([dvidvi],
 	[  --without-dvidvi           do not build the dvidvi package])
-AC_ARG_WITH(dviljk,
+AC_ARG_WITH([dviljk],
 	[  --without-dviljk           do not build the dviljk package])
-AC_ARG_WITH(dvipdfm,
+AC_ARG_WITH([dvipdfm],
 	[  --without-dvipdfm          do not build the dvipdfm package])
-AC_ARG_WITH(dvipng,
+AC_ARG_WITH([dvipng],
 	[  --without-dvipng           do not build the dvipng package])
-AC_ARG_WITH(dvipsk,
+AC_ARG_WITH([dvipsk],
 	[  --without-dvipsk           do not build the dvipsk package])
-AC_ARG_WITH(gsftopk,
+AC_ARG_WITH([gsftopk],
 	[  --without-gsftopk          do not build the gsftopk package])
-AC_ARG_WITH(lacheck,
+AC_ARG_WITH([lacheck],
 	[  --without-lacheck          do not build the lacheck package])
-AC_ARG_WITH(makeindexk,
+AC_ARG_WITH([makeindexk],
 	[  --without-makeindexk       do not build the makeindexk package])
-AC_ARG_WITH(musixflx,
+AC_ARG_WITH([musixflx],
 	[  --without-musixflx         do not build the musixflx package])
-AC_ARG_WITH(odvipsk,
+AC_ARG_WITH([odvipsk],
 	[  --without-odvipsk          do not build the odvipsk package])
-AC_ARG_WITH(oxdvik,
+AC_ARG_WITH([oxdvik],
 	[  --without-oxdvik           do not build the oxdvik package])
-AC_ARG_WITH(ps2pkm,
+AC_ARG_WITH([ps2pkm],
 	[  --without-ps2pkm           do not build the ps2pkm package])
-AC_ARG_WITH(seetexk,
+AC_ARG_WITH([seetexk],
 	[  --without-seetexk          do not build the seetexk package])
-AC_ARG_WITH(tetex,
+AC_ARG_WITH([tetex],
 	[  --without-tetex            do not build the tetex package])
-AC_ARG_WITH(tex4htk,
+AC_ARG_WITH([tex4htk],
 	[  --without-tex4htk          do not build the tex4htk package])
-AC_ARG_WITH(texlive,
+AC_ARG_WITH([texlive],
 	[  --without-texlive          do not build the texlive package])
-AC_ARG_WITH(ttf2pk,
+AC_ARG_WITH([ttf2pk],
 	[  --without-ttf2pk           do not build the ttf2pk package])
-AC_ARG_WITH(tth,
+AC_ARG_WITH([tth],
 	[  --without-tth              do not build the tth package])
-AC_ARG_WITH(xdvik,
+AC_ARG_WITH([xdvik],
 	[  --without-xdvik            do not build the xdvik package])
diff -ur -N -x configure -x configure.save tetex-src-3.0.orig/withenable.ac tetex-src-3.0/withenable.ac
--- tetex-src-3.0.orig/withenable.ac	2005-01-21 11:31:36.000000000 +0100
+++ tetex-src-3.0/withenable.ac	2005-02-21 18:41:38.000000000 +0100
@@ -1,20 +1,20 @@
-AC_ARG_WITH(texinfo,
+AC_ARG_WITH([texinfo],
         [  --without-texinfo       do not build the texinfo package])
 
-AC_ARG_WITH(dialog,
+AC_ARG_WITH([dialog],
         [  --without-dialog        do not build the dialog package])
 
-AC_ARG_WITH(t1utils,
+AC_ARG_WITH([t1utils],
         [  --without-t1utils       do not build the t1utils package])
 
-AC_ARG_WITH(lcdf-typetools,
+AC_ARG_WITH([lcdf-typetools],
         [  --without-lcdf-typetools    do not build the lcdf-typetools package])
 
-AC_ARG_WITH(psutils,
+AC_ARG_WITH([psutils],
         [  --without-psutils       do not build the psutils package])
 
-AC_ARG_WITH(texi2html,
+AC_ARG_WITH([texi2html],
         [  --without-texi2html       do not build the texi2html package])
 
-AC_ARG_ENABLE(multiplatform,
+AC_ARG_ENABLE([multiplatform],
 	[  --enable-multiplatform     put executables in bin/PLATFORM])
-------------- next part --------------
	Prepare for autoconf-2.5x -- step 4 -- web2c
	Changes to web2c part of teTeX-3.0 tree

	Avoid as much as possible shell variables as arguments of
		KPSE_CONFIG_FILES
		AC_CONFIG_FILES
		AC_CONFIG_SUBDIRS

diff -ur -N -x configure -x aclocal.m4 -x autom4te.cache tetex-src-3.0.orig/configure.in tetex-src-3.0/configure.in
--- tetex-src-3.0.orig/configure.in	2005-02-20 22:03:57.000000000 +0100
+++ tetex-src-3.0/configure.in	2005-02-23 23:13:39.000000000 +0100
@@ -191,12 +191,15 @@
 test "$needs_freetype" = yes && test "$using_system_freetype" != yes \
   && LIBSDIRS="$FREETYPEDIR $LIBSDIRS"
 
+AC_CONFIG_SUBDIRS([libs])
+
 PKGS='texinfo dialog t1utils lcdf-typetools psutils texi2html'
 ESUBDIRS=
 for pkg in $PKGS; do
   if test -d $srcdir/utils/$pkg; then
     if eval "test \"`echo '$with_'${pkg}`\" != no"; then
       ESUBDIRS="$ESUBDIRS utils/$pkg"
+      AC_CONFIG_SUBDIRS([utils/$pkg])
       test -d utils || mkdir utils
     fi
   fi
@@ -222,6 +225,6 @@
 fi
 AC_SUBST(INSTDIRS)
 
-AC_CONFIG_SUBDIRS(libs $ESUBDIRS texk)
+AC_CONFIG_SUBDIRS([texk])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff -ur -N -x configure -x aclocal.m4 -x autom4te.cache tetex-src-3.0.orig/libs/configure.in tetex-src-3.0/libs/configure.in
--- tetex-src-3.0.orig/libs/configure.in	2005-02-20 21:55:32.000000000 +0100
+++ tetex-src-3.0/libs/configure.in	2005-02-23 23:21:46.000000000 +0100
@@ -29,29 +29,32 @@
 # system's terminfo definitions if configured without explicit --prefix.
 # ac_configure_args=`echo "$ac_configure_args" | sed 's at --prefix=[[^ ]]*@@'`
 
-subconfigures=
-test "x$needs_libt1" != xno && test "$using_system_t1lib"  != yes \
-  && subconfigures="$subconfigures t1lib type1"
-test "x$needs_ncurses" != xno && test "$using_system_ncurses"  != yes \
-  && subconfigures="$subconfigures ncurses"
-test "x$needs_libxpdf" != xno \
-  && subconfigures="$subconfigures xpdf"
-test "x$needs_freetype" != xno && test "$using_system_freetype" != yes \
-  && subconfigures="$subconfigures freetype"
-test "x$needs_gd" != xno && test "$using_system_gd" != yes \
-  && subconfigures="$subconfigures gd"
+if test "x$needs_libt1" != xno && test "$using_system_t1lib"  != yes; then
+  AC_CONFIG_SUBDIRS([t1lib type1])
+fi
+if test "x$needs_ncurses" != xno && test "$using_system_ncurses"  != yes; then
+  AC_CONFIG_SUBDIRS([ncurses])
+fi
+if test "x$needs_libxpdf" != xno; then
+  AC_CONFIG_SUBDIRS([xpdf])
+fi
+if test "x$needs_freetype" != xno && test "$using_system_freetype" != yes; then
+  AC_CONFIG_SUBDIRS([freetype])
+fi
+if test "x$needs_gd" != xno && test "$using_system_gd" != yes; then
+  AC_CONFIG_SUBDIRS([gd])
+fi
 
-outfiles=
-test "x$needs_pnglib" != xno && test "$using_system_pnglib"  != yes \
-  && outfiles="$outfiles libpng/Makefile"
-test "x$needs_zlib" != xno && test "$using_system_zlib"  != yes \
-  && outfiles="$outfiles zlib/Makefile"
+if test "x$needs_pnglib" != xno && test "$using_system_pnglib"  != yes; then
+  KPSE_CONFIG_FILES([libpng/Makefile])
+fi
+if test "x$needs_zlib" != xno && test "$using_system_zlib"  != yes; then
+  KPSE_CONFIG_FILES([zlib/Makefile])
+fi
 
 # create md5 directory  when building outside the srcdir:
 if test -d $srcdir/md5; then
   test -d md5 || mkdir md5
 fi
 
-AC_CONFIG_SUBDIRS($subconfigures)
-KPSE_CONFIG_FILES([$outfiles])
 AC_OUTPUT
diff -ur -N -x configure -x aclocal.m4 -x autom4te.cache tetex-src-3.0.orig/texk/web2c/configure.in tetex-src-3.0/texk/web2c/configure.in
--- tetex-src-3.0.orig/texk/web2c/configure.in	2005-02-20 22:58:15.000000000 +0100
+++ tetex-src-3.0/texk/web2c/configure.in	2005-02-23 23:20:51.000000000 +0100
@@ -116,8 +116,7 @@
 fi
 if test "x$with_omega" = xyes; then
   OMEGA=
-  omegafontsmakefile=omegafonts/Makefile
-  otpsmakefile=otps/Makefile
+  KPSE_CONFIG_FILES([omegafonts/Makefile otps/Makefile])
 else
   OMEGA='#! '
 fi
@@ -350,17 +349,17 @@
    test "$with_pdfetex" = yes || \
    test "$with_pdfxtex" = yes
 then
-  libpdfmakefile=pdftexdir/Makefile
+  KPSE_CONFIG_FILES([pdftexdir/Makefile])
 fi
 
 # Don't bother with pdfelib unless pdfeTeX is requested.
 if test "$with_pdfetex" = yes; then
-  libpdfemakefile=pdfetexdir/Makefile
+  AC_CONFIG_FILES([pdfetexdir/Makefile])
 fi
 
 # Don't bother with pdfxlib unless pdfxTeX is requested.
 if test "$with_pdfxtex" = yes; then
-  libpdfxmakefile=pdfxtexdir/Makefile
+  AC_CONFIG_FILES([pdfxtexdir/Makefile])
 fi
 
 dnl Create tests subdirectory.
@@ -393,7 +392,6 @@
 
 dnl Generate `Makefile's, `config.status', and our header file.
 KPSE_CONFIG_FILES([Makefile doc/Makefile lib/Makefile man/Makefile mpware/Makefile 
-          web2c/Makefile window/Makefile
-          $libpdfmakefile $libpdfemakefile $libpdfxmakefile
-          $omegafontsmakefile $otpsmakefile fmtutil.cnf:fmtutil.in])
+          web2c/Makefile window/Makefile])
+AC_CONFIG_FILES([fmtutil.cnf:fmtutil.in])
 AC_OUTPUT
-------------- next part --------------
#! /bin/sh

case $1 in
	old)	trynew=no;;
	new)	trynew=yes;;
	*)	echo "Usage:	$0 {old|new} [autoconf-options]"
		exit 1
	;;
esac
shift

# This my replacement for the "reautoconf" script found at the
# root of the web2c/teTeX/TeX-Live tree

# Used to run autoconf Versions 2.13 (old) resp. 2.59 (new) in various directories.
# At present only for web2c/teTeX, I haven't looked yet at TeX-Live

# This work for me (peb) and requires bash or similar.

[ -f ./texk/make/common.mk ] || {
	echo "*** can't find ./texk/make/common.mk"
	exit 1
}

# I have installed a private patched version of autoconf-2.13
# under "$HOME/autoconf-2.13"
#
# The files are as in teTeX-3.0 (including acsite.m4) + current patches, but I haven't
# bothered to properly set --prefix (i.e., the default for AC_MACRODIR).

acold () {	# $dir=current
	echo "Running autoconf-2.13 in \`$dir'"
	PATH=$HOME/autoconf-2.13/bin:$PATH \
	AC_MACRODIR=$HOME/autoconf-2.13/share/autoconf \
	$HOME/autoconf-2.13/bin/autoconf "$@"
}

if [ "$trynew" != yes ]; then

acnew () { acold "$@"; }

else	# trynew

# For autoconf-2.59 two things have to be done:
#
# 1. Build aclocal.m4 by hand, because aclocal-1.9.4 badly chokes
# when configure.in includes other files (via sinclude or m4_include).
# The result is similar to what "aclocal -I $rdir" should produce.
#
# Obviously fails in directories that come with aclocal.m4.
#
# 2. Run /usr/local/bin/autoconf

acnew () {	# $dir=current, $dir/$rdir->./texk/m4 with the KPSE macros.
	echo "Running autoconf-2.59 in \`$dir'"
	echo "# aclocal.m4 for \`$dir' using autoconf-2.59 versions of KPSE macros" > aclocal.m4
	for f in $rdir/*.m4; do
		echo "m4_include([$f])"
	done >> aclocal.m4
	PATH=/usr/local/bin:$PATH \
	/usr/local/bin/autoconf "$@" && rm -rf autom4te.cache
}

fi	# trynew

# Autoconf in .
dir=. rdir=texk/m4
acnew

# Autoconf in all other directories
for dir in `find utils libs texk -name configure.in | sed 's,/configure.in$,,'`; do
	case $dir in
		*/texi*)	# texinfo and texi2html are automade
		;;
		*/ncurses)	# ncurses has it's own special configure
		;;
		texk)	rdir=m4
			(cd $dir; acnew)
		;;
		texk/*)	rdir=`echo $dir | sed -e 's,^texk/,,' -e 's,[^/]*,..,g'`/m4
			case $dir in
				*/dvipdfm|*/dvipng|*xdvik)
					# These come with a nontrivial aclocal.m4 and
					# do not yet work with autoconf-2.59
					(cd $dir; acold);;
				*)	(cd $dir; acnew);;
			esac
		;;
		*)	rdir=`echo $dir | sed 's,[^/]*,..,g'`/texk/m4
			(cd $dir; acnew)
		;;
	esac
done

-------------- next part --------------
========================================
(cd tetex-src-3.0 && ../reautoconf old)
Running autoconf-2.13 in `.'
Running autoconf-2.13 in `libs'
Running autoconf-2.13 in `texk'
Running autoconf-2.13 in `utils/dialog'
Running autoconf-2.13 in `libs/gd'
Running autoconf-2.13 in `libs/t1lib'
configure.in:63: warning: AC_TRY_RUN called without default to allow cross compiling
configure.in:161: warning: AC_TRY_RUN called without default to allow cross compiling
Running autoconf-2.13 in `libs/type1'
Running autoconf-2.13 in `libs/xpdf'
Running autoconf-2.13 in `texk/dviljk'
configure.in:14: warning: AC_TRY_RUN called without default to allow cross compiling
configure.in:15: warning: AC_TRY_RUN called without default to allow cross compiling
Running autoconf-2.13 in `texk/dvipdfm'
Running autoconf-2.13 in `texk/dvipng'
Running autoconf-2.13 in `texk/dvipsk'
configure.in:22: warning: AC_TRY_RUN called without default to allow cross compiling
Running autoconf-2.13 in `texk/gsftopk'
Running autoconf-2.13 in `texk/kpathsea'
Running autoconf-2.13 in `texk/makeindexk'
Running autoconf-2.13 in `texk/ps2pkm'
Running autoconf-2.13 in `texk/tetex'
Running autoconf-2.13 in `texk/web2c'
configure.in:78: warning: AC_TRY_RUN called without default to allow cross compiling
configure.in:79: warning: AC_TRY_RUN called without default to allow cross compiling
configure.in:80: warning: AC_TRY_RUN called without default to allow cross compiling
Running autoconf-2.13 in `texk/xdvik'
configure.in:35: warning: AC_TRY_RUN called without default to allow cross compiling
configure.in:44: warning: AC_TRY_RUN called without default to allow cross compiling
rc=0
-------------- next part --------------
========================================
(cd tetex-src-3.0 && ../reautoconf new --force)
Running autoconf-2.59 in `.'
configure.in:202: warning: AC_CONFIG_SUBDIRS: you should use literals
autoconf/status.m4:1077: AC_CONFIG_SUBDIRS is expanded from...
configure.in:202: the top level
Running autoconf-2.59 in `utils/dialog'
Running autoconf-2.59 in `libs'
Running autoconf-2.59 in `libs/gd'
Running autoconf-2.59 in `libs/t1lib'
Running autoconf-2.59 in `libs/type1'
Running autoconf-2.59 in `libs/xpdf'
Running autoconf-2.59 in `texk'
configure.in:65: warning: AC_CONFIG_SUBDIRS: you should use literals
autoconf/status.m4:1077: AC_CONFIG_SUBDIRS is expanded from...
configure.in:65: the top level
Running autoconf-2.59 in `texk/dviljk'
Running autoconf-2.13 in `texk/dvipdfm'
Running autoconf-2.13 in `texk/dvipng'
Running autoconf-2.59 in `texk/dvipsk'
Running autoconf-2.59 in `texk/gsftopk'
Running autoconf-2.59 in `texk/kpathsea'
Running autoconf-2.59 in `texk/makeindexk'
Running autoconf-2.59 in `texk/ps2pkm'
Running autoconf-2.59 in `texk/tetex'
Running autoconf-2.59 in `texk/web2c'
configure.in:47: warning: AC_PROG_LEX invoked multiple times
autoconf/programs.m4:438: AC_DECL_YYTEXT is expanded from...
configure.in:47: the top level
Running autoconf-2.13 in `texk/xdvik'
configure.in:35: warning: AC_TRY_RUN called without default to allow cross compiling
configure.in:44: warning: AC_TRY_RUN called without default to allow cross compiling
rc=0


More information about the tex-k mailing list