next step in autotools update

  add autoheader in reautoconf script and maintainer rules
    (maintainer mode still has some problems)
  remove need for acconfig.h (templates via AC_DEFINE)
  svn:ignore atom4te.cache directories
  reautoconf of the whole tree


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

10 files changed, 445 insertions, 231 deletions

diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 422da3f67fb..c872b197d4a 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,11 +1,33 @@
+2008-01-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* common.ac: replace the private macro KPSE_STRUCT_ST_MTIM
+	by AC_CHECK_MEMBERS([struct stat.st_mtim]).
+
+	* common.ac: use AC_CHECK_DECLS([strstr]) and ...
+	* lib.h: ... replace `#ifndef HAVE_STRSTR' by
+	`#if !HAVE_DECL_STRSTR'.
+
+	* common.ac: Move AC_CONFIG_HEADERS from here ...
+	* configure.in: ... to here and replace PACKAGE_... by
+	KPSE_PACKAGE_... in c-auto.h, to avoid conflicts with other
+	packages.
+
+	* configure.in: use AH_TOP, AH_BOTTOM, and AC_DEFINE's third
+	argument to provide autoheader templates ...
+	* common.ac: m4 code to generate AC_DEFINE with a third argument
+	for MAKE_..._BY_DEFAULT and set them to 0 or 1 ...
+	* withenable.ac: use AC_DEFINE's third argument to provide
+	autoheader templates ...
+	* acconfig.h: ... removed.
+
 2008-02-24  Martin Schröder <martin@pdftex.org>
-        * lib.h: systypes.h instaed of c-std.h
+        * lib.h: systypes.h instead of c-std.h
 
 2008-02-23  Martin Schröder <martin@pdftex.org>
         * lib.h: include c-std.h to get off_t from stdio.h
 
 2008-02-21  Martin Schröder <martin@pdftex.org>
-        * lib.h, xfseek.c, xftell.c: LFS support: use off_t instead off long
+        * lib.h, xfseek.c, xftell.c: LFS support: use off_t instead of long
         and fseeko instead of fseek
 
 2008-02-14  Karl Berry  <karl@tug.org>
diff --git a/Build/source/texk/kpathsea/acconfig.h b/Build/source/texk/kpathsea/acconfig.h
deleted file mode 100644
index 09111d47bdd..00000000000
--- a/Build/source/texk/kpathsea/acconfig.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* acconfig.h -- used by autoheader when generating c-auto.in.
-
-   If you're thinking of editing acconfig.h to fix a configuration
-   problem, don't. Edit the c-auto.h file created by configure,
-   instead.  Even better, fix configure to give the right answer.
-
-   Copyright 1994-97, 2008 Karl Berry.
-   Copyright 1997-99, 2002, 2005 Olaf Weber.
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public License
-   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
-
-/* Guard against double inclusion. */
-#ifndef KPATHSEA_C_AUTO_H
-#define KPATHSEA_C_AUTO_H
-
-/* kpathsea: the version string. */
-#define KPSEVERSION "REPLACE-WITH-KPSEVERSION"
-
-/* kpathsea/configure.in tests for these functions with
-   kb_AC_KLIBTOOL_REPLACE_FUNCS, and naturally Autoheader doesn't know
-   about that macro.  Since the shared library stuff is all preliminary
-   anyway, I decided not to change Autoheader, but rather to hack them
-   in here.  */
-#undef HAVE_PUTENV
-#undef HAVE_STRCASECMP
-#undef HAVE_STRTOL
-#undef HAVE_STRSTR
-
-@TOP@
-
-/* Define if your compiler understands prototypes.  */
-#undef HAVE_PROTOTYPES
-
-/* Define if getcwd if implemented using fork or vfork.  Let me know
-   if you have to add this by hand because configure failed to detect
-   it. */
-#undef GETCWD_FORKS
-
-/* Define if you are using GNU libc or otherwise have global variables
-   `program_invocation_name' and `program_invocation_short_name'.  */
-#undef HAVE_PROGRAM_INVOCATION_NAME
-
-/* all: Define to enable running scripts when missing input files.  */
-#define MAKE_TEX_MF_BY_DEFAULT 0
-#define MAKE_TEX_PK_BY_DEFAULT 0
-#define MAKE_TEX_TEX_BY_DEFAULT 0
-#define MAKE_TEX_TFM_BY_DEFAULT 0
-#define MAKE_TEX_FMT_BY_DEFAULT 0
-#define MAKE_OMEGA_OFM_BY_DEFAULT 0
-#define MAKE_OMEGA_OCP_BY_DEFAULT 0
-
-@BOTTOM@
-#endif /* !KPATHSEA_C_AUTO_H */
diff --git a/Build/source/texk/kpathsea/aclocal.m4 b/Build/source/texk/kpathsea/aclocal.m4
index 0a76462785b..83822405e5d 100644
--- a/Build/source/texk/kpathsea/aclocal.m4
+++ b/Build/source/texk/kpathsea/aclocal.m4
@@ -14,4 +14,3 @@
 m4_include([../m4/kpse_cross.m4])
 m4_include([../m4/kpse_inc.m4])
 m4_include([../m4/kpse_maint.m4])
-m4_include([../m4/kpse_mtim.m4])
diff --git a/Build/source/texk/kpathsea/c-auto.in b/Build/source/texk/kpathsea/c-auto.in
index 60dc58dc7dd..e4a68316f35 100644
--- a/Build/source/texk/kpathsea/c-auto.in
+++ b/Build/source/texk/kpathsea/c-auto.in
@@ -1,12 +1,9 @@
-/* c-auto.in.  Generated automatically from configure.in by autoheader 2.13.  */
-/* acconfig.h -- used by autoheader when generating c-auto.in.
+/* c-auto.in.  Generated from configure.in by autoheader.  */
 
-   If you're thinking of editing acconfig.h to fix a configuration
-   problem, don't. Edit the c-auto.h file created by configure,
-   instead.  Even better, fix configure to give the right answer.
+/* c-auto.h: defines for kpathsea, as determined by configure.
 
+   Copyright 1994-97, 2008 Karl Berry.
    Copyright 1997-99, 2002, 2005 Olaf Weber.
-   Copyright 1994-97 Karl Berry.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -18,11 +15,8 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 /* Guard against double inclusion. */
 #ifndef KPATHSEA_C_AUTO_H
@@ -31,137 +25,192 @@
 /* kpathsea: the version string. */
 #define KPSEVERSION "REPLACE-WITH-KPSEVERSION"
 
-/* These came from klibtool's kb_AC_KLIBTOOL_REPLACE_FUNCS, probably no
-   longer needed, doesn't hurt to leave them in, though.  */
+/* kpathsea/configure.in tests for these functions with
+   kb_AC_KLIBTOOL_REPLACE_FUNCS, and naturally Autoheader doesn't know
+   about that macro.  Since the shared library stuff is all preliminary
+   anyway, I decided not to change Autoheader, but rather to hack them
+   in here.  */
 #undef HAVE_PUTENV
 #undef HAVE_STRCASECMP
 #undef HAVE_STRTOL
 #undef HAVE_STRSTR
 
-
-/* Define if the closedir function returns void instead of int.  */
+/* Define to 1 if the `closedir' function returns void instead of `int'. */
 #undef CLOSEDIR_VOID
 
-/* Define to empty if the keyword does not work.  */
-#undef const
-
-/* Define if your struct stat has st_mtim.  */
-#undef HAVE_ST_MTIM
-
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
-
-/* Define if your compiler understands prototypes.  */
-#undef HAVE_PROTOTYPES
-
-/* Define if getcwd if implemented using fork or vfork.  Let me know
-   if you have to add this by hand because configure failed to detect
-   it. */
+/* Define to 1 if getcwd is implemented using fork or vfork. Let me know if
+   you have to add this by hand because configure failed to detect it. */
 #undef GETCWD_FORKS
 
-/* Define if you are using GNU libc or otherwise have global variables
-   `program_invocation_name' and `program_invocation_short_name'.  */
-#undef HAVE_PROGRAM_INVOCATION_NAME
-
-/* all: Define to enable running scripts when missing input files.  */
-#define MAKE_TEX_MF_BY_DEFAULT 0
-#define MAKE_TEX_PK_BY_DEFAULT 0
-#define MAKE_TEX_TEX_BY_DEFAULT 0
-#define MAKE_TEX_TFM_BY_DEFAULT 0
-#define MAKE_TEX_FMT_BY_DEFAULT 0
-#define MAKE_OMEGA_OFM_BY_DEFAULT 0
-#define MAKE_OMEGA_OCP_BY_DEFAULT 0
+/* Define to 1 if you have the <assert.h> header file. */
+#undef HAVE_ASSERT_H
 
-/* Define if you have the bcmp function.  */
+/* Define to 1 if you have the `bcmp' function. */
 #undef HAVE_BCMP
 
-/* Define if you have the bcopy function.  */
+/* Define to 1 if you have the `bcopy' function. */
 #undef HAVE_BCOPY
 
-/* Define if you have the bzero function.  */
+/* Define to 1 if you have the `bzero' function. */
 #undef HAVE_BZERO
 
-/* Define if you have the getcwd function.  */
+/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't.
+   */
+#undef HAVE_DECL_STRSTR
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_DIRENT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <float.h> header file. */
+#undef HAVE_FLOAT_H
+
+/* Define to 1 if you have the `getcwd' function. */
 #undef HAVE_GETCWD
 
-/* Define if you have the getwd function.  */
+/* Define to 1 if you have the `getwd' function. */
 #undef HAVE_GETWD
 
-/* Define if you have the index function.  */
+/* Define to 1 if you have the `index' function. */
 #undef HAVE_INDEX
 
-/* Define if you have the memcmp function.  */
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
+/* Define to 1 if you have the `memcmp' function. */
 #undef HAVE_MEMCMP
 
-/* Define if you have the memcpy function.  */
+/* Define to 1 if you have the `memcpy' function. */
 #undef HAVE_MEMCPY
 
-/* Define if you have the putenv function.  */
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
+
+/* Define to 1 if you are using GNU libc or otherwise have global variables
+   `program_invocation_name' and `program_invocation_short_name'. */
+#undef HAVE_PROGRAM_INVOCATION_NAME
+
+/* Define to 1 if your compiler understands prototypes. */
+#undef HAVE_PROTOTYPES
+
+/* Define to 1 if you have the `putenv' function. */
 #undef HAVE_PUTENV
 
-/* Define if you have the rindex function.  */
+/* Define to 1 if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
+
+/* Define to 1 if you have the `rindex' function. */
 #undef HAVE_RINDEX
 
-/* Define if you have the strcasecmp function.  */
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strcasecmp' function. */
 #undef HAVE_STRCASECMP
 
-/* Define if you have the strchr function.  */
+/* Define to 1 if you have the `strchr' function. */
 #undef HAVE_STRCHR
 
-/* Define if you have the strrchr function.  */
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strrchr' function. */
 #undef HAVE_STRRCHR
 
-/* Define if you have the strstr function.  */
+/* Define to 1 if you have the `strstr' function. */
 #undef HAVE_STRSTR
 
-/* Define if you have the strtol function.  */
+/* Define to 1 if you have the `strtol' function. */
 #undef HAVE_STRTOL
 
-/* Define if you have the <assert.h> header file.  */
-#undef HAVE_ASSERT_H
+/* Define to 1 if `st_mtim' is member of `struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_MTIM
 
-/* Define if you have the <dirent.h> header file.  */
-#undef HAVE_DIRENT_H
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_DIR_H
 
-/* Define if you have the <dlfcn.h> header file.  */
-#undef HAVE_DLFCN_H
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_NDIR_H
 
-/* Define if you have the <float.h> header file.  */
-#undef HAVE_FLOAT_H
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
 
-/* Define if you have the <limits.h> header file.  */
-#undef HAVE_LIMITS_H
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
 
-/* Define if you have the <memory.h> header file.  */
-#undef HAVE_MEMORY_H
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
 
-/* Define if you have the <ndir.h> header file.  */
-#undef HAVE_NDIR_H
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
 
-/* Define if you have the <pwd.h> header file.  */
-#undef HAVE_PWD_H
+/* Define to 1 if you want to run mkocp if OCP file missing, and to 0 if you
+   don't. */
+#undef MAKE_OMEGA_OCP_BY_DEFAULT
 
-/* Define if you have the <stdlib.h> header file.  */
-#undef HAVE_STDLIB_H
+/* Define to 1 if you want to run mkofm if OFM file missing, and to 0 if you
+   don't. */
+#undef MAKE_OMEGA_OFM_BY_DEFAULT
 
-/* Define if you have the <string.h> header file.  */
-#undef HAVE_STRING_H
+/* Define to 1 if you want to run mktexfmt if format file missing, and to 0 if
+   you don't. */
+#undef MAKE_TEX_FMT_BY_DEFAULT
 
-/* Define if you have the <strings.h> header file.  */
-#undef HAVE_STRINGS_H
+/* Define to 1 if you want to run mktexmf if MF source missing, and to 0 if
+   you don't. */
+#undef MAKE_TEX_MF_BY_DEFAULT
 
-/* Define if you have the <sys/dir.h> header file.  */
-#undef HAVE_SYS_DIR_H
+/* Define to 1 if you want to run mktexpk if PK font missing, and to 0 if you
+   don't. */
+#undef MAKE_TEX_PK_BY_DEFAULT
 
-/* Define if you have the <sys/ndir.h> header file.  */
-#undef HAVE_SYS_NDIR_H
+/* Define to 1 if you want to run mktextex if TeX source missing, and to 0 if
+   you don't. */
+#undef MAKE_TEX_TEX_BY_DEFAULT
 
-/* Define if you have the <sys/param.h> header file.  */
-#undef HAVE_SYS_PARAM_H
+/* Define to 1 if you want to run mktextfm if TFM file missing, and to 0 if
+   you don't. */
+#undef MAKE_TEX_TFM_BY_DEFAULT
 
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
 
-/* Define if you have the m library (-lm).  */
-#undef HAVE_LIBM
 #endif /* !KPATHSEA_C_AUTO_H */
diff --git a/Build/source/texk/kpathsea/common.ac b/Build/source/texk/kpathsea/common.ac
index 0580e4c5d9b..f2e73b6f7e9 100644
--- a/Build/source/texk/kpathsea/common.ac
+++ b/Build/source/texk/kpathsea/common.ac
@@ -5,12 +5,6 @@ dnl Common Autoconf sinclude file for kpathsea-using programs.  (Have to
 dnl use the m4 `sinclude' builtin instead of `include', since Autoconf
 dnl disables `include'.)
 
-dnl These configure scripts won't work with anything else.
-AC_PREREQ(2.12.1)
-
-dnl Write output here, instead of putting a zillion -D's on the command line.
-AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
-
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -23,8 +17,9 @@ AC_PROG_LIBTOOL
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_FUNC_CLOSEDIR_VOID
-AC_CHECK_HEADERS(assert.h float.h limits.h memory.h pwd.h stdlib.h \
-                 string.h strings.h sys/param.h unistd.h)
+AC_CHECK_HEADERS([assert.h float.h limits.h memory.h pwd.h stdlib.h \
+                  string.h strings.h sys/param.h unistd.h])
+AC_CHECK_DECLS([strstr])
 
 dnl Libtool supporting objects that may be required on ancient broken system.
 AC_CHECK_FUNCS(putenv,, LTLIBOBJS="$LTLIBOBJS putenv.lo")
@@ -38,7 +33,7 @@ AC_CHECK_FUNCS(bcmp bcopy bzero getcwd getwd index memcmp memcpy rindex strchr s
 AC_C_CONST
 
 # Check whether struct stat provides high-res time.
-KPSE_STRUCT_ST_MTIM
+AC_CHECK_MEMBERS([struct stat.st_mtim])
 
 # Check whether prototypes work.
 AC_MSG_CHECKING(whether the compiler accepts prototypes)
@@ -47,24 +42,27 @@ AC_CACHE_VAL(kb_cv_c_prototypes,
   kb_cv_c_prototypes=yes, kb_cv_c_prototypes=no)])dnl
 AC_MSG_RESULT($kb_cv_c_prototypes)
 if test "$kb_cv_c_prototypes" = yes; then
-  AC_DEFINE(HAVE_PROTOTYPES)
+  AC_DEFINE([HAVE_PROTOTYPES], 1,
+    [Define to 1 if your compiler understands prototypes.])
 fi
 
 # This is a GNU libc invention.
-AC_MSG_CHECKING(whether program_invocation_name is predefined)
-AC_CACHE_VAL(kb_cv_var_program_inv_name,
+AC_MSG_CHECKING([whether program_invocation_name is predefined])
+AC_CACHE_VAL([kb_cv_var_program_inv_name],
 [AC_TRY_LINK(,
   [extern char *program_invocation_name; program_invocation_name = "love";],
-  kb_cv_var_program_inv_name=yes, kb_cv_var_program_inv_name=no)])dnl
-AC_MSG_RESULT($kb_cv_var_program_inv_name)
+  [kb_cv_var_program_inv_name=yes], [kb_cv_var_program_inv_name=no])])dnl
+AC_MSG_RESULT([$kb_cv_var_program_inv_name])
 if test "$kb_cv_var_program_inv_name" = yes; then
-  AC_DEFINE(HAVE_PROGRAM_INVOCATION_NAME)
+  AC_DEFINE([HAVE_PROGRAM_INVOCATION_NAME], 1,
+    [Define to 1 if you are using GNU libc or otherwise have global
+     variables `program_invocation_name' and `program_invocation_short_name'.])
 fi
 
 if test $ac_cv_func_getcwd = yes; then
 # We only need to run this if we have getcwd.
-AC_MSG_CHECKING(whether getcwd uses fork or vfork)
-AC_CACHE_VAL(kb_cv_func_getcwd_forks,
+AC_MSG_CHECKING([whether getcwd uses fork or vfork])
+AC_CACHE_VAL([kb_cv_func_getcwd_forks],
 [AC_TRY_RUN([
 int fork() { exit(1); }
 int vfork() { exit(1); }
@@ -73,11 +71,13 @@ char path[100];
 int main() {
 getcwd(path,100);
 return 0;
-}], kb_cv_func_getcwd_forks=no, kb_cv_func_getcwd_forks=yes,
-    kb_cv_func_getcwd_forks=no)])dnl
-AC_MSG_RESULT($kb_cv_func_getcwd_forks)
+}], [kb_cv_func_getcwd_forks=no], [kb_cv_func_getcwd_forks=yes],
+    [kb_cv_func_getcwd_forks=no])])dnl
+AC_MSG_RESULT([$kb_cv_func_getcwd_forks])
 if test $kb_cv_func_getcwd_forks = yes; then
-  AC_DEFINE(GETCWD_FORKS)
+  AC_DEFINE([GETCWD_FORKS], 1,
+    [Define to 1 if getcwd is implemented using fork or vfork.  Let me know
+     if you have to add this by hand because configure failed to detect it.])
 fi
 fi
 
@@ -85,27 +85,22 @@ fi
 sinclude(../../texk/kpathsea/withenable.ac)
 
 # Implementation of those options.
-if test "x$with_mktexmf_default" = xyes; then
-  AC_DEFINE(MAKE_TEX_MF_BY_DEFAULT)
-fi
-if test "x$with_mktexpk_default" = xyes; then
-  AC_DEFINE(MAKE_TEX_PK_BY_DEFAULT)
-fi
-if test "x$with_mktextex_default" = xyes; then
-  AC_DEFINE(MAKE_TEX_TEX_BY_DEFAULT)
-fi
-if test "x$with_mktexfmt_default" = xyes; then
-  AC_DEFINE(MAKE_TEX_FMT_BY_DEFAULT)
-fi
-if test "x$with_mktextfm_default" = xyes; then
-  AC_DEFINE(MAKE_TEX_TFM_BY_DEFAULT)
-fi
-if test "x$with_mkocp_default" = xyes; then
-  AC_DEFINE(MAKE_OMEGA_OCP_BY_DEFAULT)
-fi
-if test "x$with_mkofm_default" = xyes; then
-  AC_DEFINE(MAKE_OMEGA_OFM_BY_DEFAULT)
+AC_DEFUN([_KPSE_DEFINE_MAKE_BY_DEFAULT],
+[if test "x$with_$1_default" = xyes; then
+  AC_DEFINE([MAKE_$2_BY_DEFAULT], 1,
+    [Define to 1 if you want to run $1 if $3  missing, and to 0 if you don't.])
+else
+  AC_DEFINE([MAKE_$2_BY_DEFAULT], 0)
 fi
+])# _KPSE_DEFINE_MAKE_BY_DEFAULT
+
+_KPSE_DEFINE_MAKE_BY_DEFAULT([mktexmf], [TEX_MF], [MF source])
+_KPSE_DEFINE_MAKE_BY_DEFAULT([mktexpk], [TEX_PK], [PK font])
+_KPSE_DEFINE_MAKE_BY_DEFAULT([mktextex], [TEX_TEX], [TeX source])
+_KPSE_DEFINE_MAKE_BY_DEFAULT([mktexfmt], [TEX_FMT], [format file])
+_KPSE_DEFINE_MAKE_BY_DEFAULT([mktextfm], [TEX_TFM], [TFM file])
+_KPSE_DEFINE_MAKE_BY_DEFAULT([mkocp], [OMEGA_OCP], [OCP file])
+_KPSE_DEFINE_MAKE_BY_DEFAULT([mkofm], [OMEGA_OFM], [OFM file])
 
 # Is libm present.  FIXME: do we need it at all?
 AC_CHECK_LIB(m, main)
diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure
index d5a06e74da6..f5fd03e911c 100755
--- a/Build/source/texk/kpathsea/configure
+++ b/Build/source/texk/kpathsea/configure
@@ -1891,12 +1891,10 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-
-
-
 ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
 
 
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5067,7 +5065,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5070 "configure"' > conftest.$ac_ext
+  echo '#line 5068 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5629,7 +5627,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:5632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -7570,7 +7568,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 7573 "configure"
+#line 7571 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -7668,7 +7666,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 7671 "configure"
+#line 7669 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8902,7 +8900,7 @@ fi
 
 
 for ac_header in assert.h float.h limits.h memory.h pwd.h stdlib.h \
-                 string.h strings.h sys/param.h unistd.h
+                  string.h strings.h sys/param.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -9041,6 +9039,74 @@ fi
 
 done
 
+{ echo "$as_me:$LINENO: checking whether strstr is declared" >&5
+echo $ECHO_N "checking whether strstr is declared... $ECHO_C" >&6; }
+if test "${ac_cv_have_decl_strstr+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+#ifndef strstr
+  (void) strstr;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_strstr=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl_strstr=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strstr" >&5
+echo "${ECHO_T}$ac_cv_have_decl_strstr" >&6; }
+if test $ac_cv_have_decl_strstr = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 0
+_ACEOF
+
+
+fi
+
+
 
 
 for ac_func in putenv
@@ -9641,9 +9707,9 @@ fi
 
 
 # Check whether struct stat provides high-res time.
-{ echo "$as_me:$LINENO: checking for st_mtim in struct stat" >&5
-echo $ECHO_N "checking for st_mtim in struct stat... $ECHO_C" >&6; }
-if test "${ac_cv_struct_st_mtim+set}" = set; then
+{ echo "$as_me:$LINENO: checking for struct stat.st_mtim" >&5
+echo $ECHO_N "checking for struct stat.st_mtim... $ECHO_C" >&6; }
+if test "${ac_cv_member_struct_stat_st_mtim+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -9652,12 +9718,13 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/stat.h>
+$ac_includes_default
 int
 main ()
 {
-struct stat s; s.st_mtim;
+static struct stat ac_aggr;
+if (ac_aggr.st_mtim)
+return 0;
   ;
   return 0;
 }
@@ -9679,23 +9746,67 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_struct_st_mtim=yes
+  ac_cv_member_struct_stat_st_mtim=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_struct_st_mtim=no
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static struct stat ac_aggr;
+if (sizeof ac_aggr.st_mtim)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_member_struct_stat_st_mtim=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_member_struct_stat_st_mtim=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_st_mtim" >&5
-echo "${ECHO_T}$ac_cv_struct_st_mtim" >&6; }
-if test $ac_cv_struct_st_mtim = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_ST_MTIM 1
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim" >&5
+echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtim" >&6; }
+if test $ac_cv_member_struct_stat_st_mtim = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_MTIM 1
 _ACEOF
 
+
 fi
 
 
@@ -9750,7 +9861,8 @@ fi
 { echo "$as_me:$LINENO: result: $kb_cv_c_prototypes" >&5
 echo "${ECHO_T}$kb_cv_c_prototypes" >&6; }
 if test "$kb_cv_c_prototypes" = yes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_PROTOTYPES 1
 _ACEOF
 
@@ -9809,7 +9921,8 @@ fi
 { echo "$as_me:$LINENO: result: $kb_cv_var_program_inv_name" >&5
 echo "${ECHO_T}$kb_cv_var_program_inv_name" >&6; }
 if test "$kb_cv_var_program_inv_name" = yes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_PROGRAM_INVOCATION_NAME 1
 _ACEOF
 
@@ -9878,7 +9991,8 @@ fi
 { echo "$as_me:$LINENO: result: $kb_cv_func_getcwd_forks" >&5
 echo "${ECHO_T}$kb_cv_func_getcwd_forks" >&6; }
 if test $kb_cv_func_getcwd_forks = yes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define GETCWD_FORKS 1
 _ACEOF
 
@@ -10092,49 +10206,100 @@ fi
 
 
 # Implementation of those options.
+# _KPSE_DEFINE_MAKE_BY_DEFAULT
+
 if test "x$with_mktexmf_default" = xyes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define MAKE_TEX_MF_BY_DEFAULT 1
 _ACEOF
 
+else
+  cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_MF_BY_DEFAULT 0
+_ACEOF
+
 fi
+
 if test "x$with_mktexpk_default" = xyes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define MAKE_TEX_PK_BY_DEFAULT 1
 _ACEOF
 
+else
+  cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_PK_BY_DEFAULT 0
+_ACEOF
+
 fi
+
 if test "x$with_mktextex_default" = xyes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define MAKE_TEX_TEX_BY_DEFAULT 1
 _ACEOF
 
+else
+  cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TEX_BY_DEFAULT 0
+_ACEOF
+
 fi
+
 if test "x$with_mktexfmt_default" = xyes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define MAKE_TEX_FMT_BY_DEFAULT 1
 _ACEOF
 
+else
+  cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_FMT_BY_DEFAULT 0
+_ACEOF
+
 fi
+
 if test "x$with_mktextfm_default" = xyes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define MAKE_TEX_TFM_BY_DEFAULT 1
 _ACEOF
 
+else
+  cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TFM_BY_DEFAULT 0
+_ACEOF
+
 fi
+
 if test "x$with_mkocp_default" = xyes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define MAKE_OMEGA_OCP_BY_DEFAULT 1
 _ACEOF
 
+else
+  cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OCP_BY_DEFAULT 0
+_ACEOF
+
 fi
+
 if test "x$with_mkofm_default" = xyes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define MAKE_OMEGA_OFM_BY_DEFAULT 1
 _ACEOF
 
+else
+  cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OFM_BY_DEFAULT 0
+_ACEOF
+
 fi
 
+
 # Is libm present.  FIXME: do we need it at all?
 
 { echo "$as_me:$LINENO: checking for main in -lm" >&5
@@ -10281,6 +10446,11 @@ fi
 
 
 
+
+
+
+
+
 ac_config_files="$ac_config_files Makefile.aux:Makefile.in"
 ac_config_files="$ac_config_files Makefile:Makefile.aux"
 
@@ -11381,7 +11551,8 @@ echo "$as_me: $ac_file is unchanged" >&6;}
 
 
   case $ac_file$ac_mode in
-    "c-auto.h":H) date >stamp-auto ;;
+    "c-auto.h":H) sed 's/^#define PACKAGE_/#define KPSE_PACKAGE_/' c-auto.h >c-auto.tmp && mv -f c-auto.tmp c-auto.h
+  date >stamp-auto ;;
     "Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
   kpse_input=`case Makefile.in in
   [\\/$]*) # Absolute
diff --git a/Build/source/texk/kpathsea/configure.in b/Build/source/texk/kpathsea/configure.in
index 97994489585..212419e66a2 100644
--- a/Build/source/texk/kpathsea/configure.in
+++ b/Build/source/texk/kpathsea/configure.in
@@ -5,7 +5,48 @@ KPSEVERSION=3.5.6dev
 AC_SUBST(KPSEVERSION)
 AC_DEFINE_UNQUOTED(KPSEVERSION, "kpathsea version $KPSEVERSION")
 
+dnl Write output here, instead of putting a zillion -D's on the command line.
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in],
+ [sed 's/^#define PACKAGE_/#define KPSE_PACKAGE_/' c-auto.h >c-auto.tmp && mv -f c-auto.tmp c-auto.h
+  date >stamp-auto])
+
 sinclude(common.ac)
 
+AH_TOP([/* c-auto.h: defines for kpathsea, as determined by configure.
+
+   Copyright 1994-97, 2008 Karl Berry.
+   Copyright 1997-99, 2002, 2005 Olaf Weber.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
+
+/* Guard against double inclusion. */
+#ifndef KPATHSEA_C_AUTO_H
+#define KPATHSEA_C_AUTO_H
+
+/* kpathsea: the version string. */
+#define KPSEVERSION "REPLACE-WITH-KPSEVERSION"
+
+/* kpathsea/configure.in tests for these functions with
+   kb_AC_KLIBTOOL_REPLACE_FUNCS, and naturally Autoheader doesn't know
+   about that macro.  Since the shared library stuff is all preliminary
+   anyway, I decided not to change Autoheader, but rather to hack them
+   in here.  */
+#undef HAVE_PUTENV
+#undef HAVE_STRCASECMP
+#undef HAVE_STRTOL
+#undef HAVE_STRSTR])
+AH_BOTTOM([#endif /* !KPATHSEA_C_AUTO_H */])
+
 KPSE_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/Build/source/texk/kpathsea/lib.h b/Build/source/texk/kpathsea/lib.h
index 18b2339d863..2a246b19584 100644
--- a/Build/source/texk/kpathsea/lib.h
+++ b/Build/source/texk/kpathsea/lib.h
@@ -120,7 +120,7 @@ extern KPSEDLL const_string xbasename P1H(const_string name);
 /* Return directory part of NAME. This returns a new string. */
 extern KPSEDLL string xdirname P1H(const_string name);
 
-#ifndef HAVE_STRSTR
+#if !HAVE_DECL_STRSTR
 extern string strstr P2H(const_string haystack, const_string needle);
 #endif
 
diff --git a/Build/source/texk/kpathsea/stamp-aclocal b/Build/source/texk/kpathsea/stamp-aclocal
new file mode 100644
index 00000000000..286541c378d
--- /dev/null
+++ b/Build/source/texk/kpathsea/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:37:06 CET 2008
diff --git a/Build/source/texk/kpathsea/stamp-auto.in b/Build/source/texk/kpathsea/stamp-auto.in
index f40664acad8..c2b0ef9d9ff 100644
--- a/Build/source/texk/kpathsea/stamp-auto.in
+++ b/Build/source/texk/kpathsea/stamp-auto.in
@@ -1 +1 @@
-Mo Aug 22 08:26:05 CEST 2005
+Fri Feb 29 13:37:07 CET 2008