diff options
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r-- | Build/source/texk/web2c/ChangeLog | 11 | ||||
-rw-r--r-- | Build/source/texk/web2c/acconfig.h | 51 | ||||
-rw-r--r-- | Build/source/texk/web2c/c-auto.in | 233 | ||||
-rwxr-xr-x | Build/source/texk/web2c/configure | 78 | ||||
-rw-r--r-- | Build/source/texk/web2c/configure.in | 32 | ||||
-rw-r--r-- | Build/source/texk/web2c/mpware/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/mpware/makempx.c | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/mpware/newer.c | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/stamp-aclocal | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/stamp-auto.in | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/window/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/window/x11-Xt.c | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/withenable.ac | 39 |
13 files changed, 291 insertions, 174 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 5b0b89df157..19ddb114271 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,14 @@ +2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.in: replace PACKAGE_... by WEB2C_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 ... + * withenable.ac: use AC_DEFINE's third argument to provide + autoheader templates ... + * acconfig.h: ... removed. + 2008-02-22 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.in: remove AC_DECL_YYTEXT to avoid autoconf warning. diff --git a/Build/source/texk/web2c/acconfig.h b/Build/source/texk/web2c/acconfig.h deleted file mode 100644 index a97a0853282..00000000000 --- a/Build/source/texk/web2c/acconfig.h +++ /dev/null @@ -1,51 +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. */ - -/* Guard against double inclusion. */ -#ifndef WEB2C_C_AUTO_H -#define WEB2C_C_AUTO_H - -/* web2c: the version string. */ -#define WEB2CVERSION "REPLACE-WITH-WEB2CVERSION" - -@TOP@ - -/* Define if you get clashes concerning wchar_t, between X's include - files and system includes. */ -#undef FOIL_X_WCHAR_T - -/* tex: Define to enable --ipc. */ -#undef IPC - -/* web2c: Define if gcc asm needs _ on external symbols. */ -#undef ASM_NEEDS_UNDERSCORE - -/* web2c: Define when using system-specific files for arithmetic. */ -#undef ASM_SCALED_FRACTION - -/* web2c: Define to enable HackyInputFileNameForCoreDump.tex. */ -#undef FUNNY_CORE_DUMP - -/* web2c: Define to disable architecture-independent dump files. - Faster on LittleEndian architectures. */ -#undef NO_DUMP_SHARE - -/* web2c: Default editor for interactive `e' option. */ -#define EDITOR "vi +%d %s" - -/* web2c: Window system support for Metafont. */ -#undef EPSFWIN -#undef HP2627WIN -#undef MFTALKWIN -#undef NEXTWIN -#undef REGISWIN -#undef SUNWIN -#undef TEKTRONIXWIN -#undef UNITERMWIN -#undef X11WIN - -@BOTTOM@ -#endif /* !WEB2C_C_AUTO_H */ diff --git a/Build/source/texk/web2c/c-auto.in b/Build/source/texk/web2c/c-auto.in index 57cda6c0ef2..61b721ca28f 100644 --- a/Build/source/texk/web2c/c-auto.in +++ b/Build/source/texk/web2c/c-auto.in @@ -1,9 +1,22 @@ -/* 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 web2c, as determined by configure. + + Copyright 1994-97, 2008 Karl Berry. + Copyright 1997-99, 2002, 2005 Olaf Weber. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* Guard against double inclusion. */ #ifndef WEB2C_C_AUTO_H @@ -12,102 +25,178 @@ /* web2c: the version string. */ #define WEB2CVERSION "REPLACE-WITH-WEB2CVERSION" +/* web2c: Define if gcc asm needs _ on external symbols. */ +#undef ASM_NEEDS_UNDERSCORE -/* Define if type char is unsigned and you are not using gcc. */ -#ifndef __CHAR_UNSIGNED__ -#undef __CHAR_UNSIGNED__ -#endif +/* web2c: Default editor for interactive `e' option. */ +#undef EDITOR -/* Define as __inline if that's what the C compiler calls it. */ -#undef inline +/* metafont: Define to include EPSF pseudo-window support */ +#undef EPSFWIN -/* Define as the return type of signal handlers (int or void). */ -#undef RETSIGTYPE +/* web2c: Define to enable HackyInputFileNameForCoreDump.tex. */ +#undef FUNNY_CORE_DUMP -/* Define if your processor stores words with the most significant - byte first (like Motorola and SPARC, unlike Intel and VAX). */ -#undef WORDS_BIGENDIAN +/* Define if you have Carbon */ +#undef HAVE_CARBON -/* Define if the X Window System is missing or not being used. */ -#undef X_DISPLAY_MISSING +/* Define to 1 if you have the <ft2build.h> header file. */ +#undef HAVE_FT2BUILD_H -/* Define if lex declares yytext as a char [] by default. */ -#undef YYTEXT_CHAR +/* Define to 1 if you have the `ftime' function. */ +#undef HAVE_FTIME -/* Define if lex declares yytext as a char * by default, not a char[]. */ -#undef YYTEXT_POINTER +/* Define to 1 if you have the `gettimeofday' function. */ +#undef HAVE_GETTIMEOFDAY -/* Define if lex declares yytext as a unsigned char [] by default. */ -#undef YYTEXT_UCHAR +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H -/* tex: Define to enable --ipc. */ -#undef IPC +/* Define if you have libfontconfig */ +#undef HAVE_LIBFONTCONFIG -/* web2c: Define if gcc asm needs _ on external symbols. */ -#undef ASM_NEEDS_UNDERSCORE +/* Define to 1 if you have the `freetype' library (-lfreetype). */ +#undef HAVE_LIBFREETYPE -/* web2c: Define to enable HackyInputFileNameForCoreDump.tex. */ -#undef FUNNY_CORE_DUMP +/* Define to 1 if you have the `icuuc' library (-licuuc). */ +#undef HAVE_LIBICUUC -/* web2c: Define to disable architecture-independent dump files. - Faster on LittleEndian architectures. */ -#undef NO_DUMP_SHARE +/* Define to 1 if you have the `m' library (-lm). */ +#undef HAVE_LIBM -/* web2c: Default editor for interactive `e' option. Although we'd like - to use ${VISUAL-${EDITOR-foo}} here, chances are a user's editor - won't understand +lineno, so they'll just have to override - TEXEDIT/MFEDIT/MPEDIT to get what they want. No particular reason - for emacs vs. vi, just historical. */ -#ifdef WIN32 -#define EDITOR "emacs +%d \"%s\"" -#else -#define EDITOR "vi +%d '%s'" -#endif +/* Define to 1 if you have the `posix' library (-lposix). */ +#undef HAVE_LIBPOSIX -/* web2c: Window system support for Metafont. */ -#undef EPSFWIN +/* Define to 1 if you have the `z' library (-lz). */ +#undef HAVE_LIBZ + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `mkstemp' function. */ +#undef HAVE_MKSTEMP + +/* Define to 1 if you have the `mktemp' function. */ +#undef HAVE_MKTEMP + +/* Define if you have POSIX threads libraries and header files. */ +#undef HAVE_PTHREAD + +/* 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 `strerror' function. */ +#undef HAVE_STRERROR + +/* 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 <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/timeb.h> header file. */ +#undef HAVE_SYS_TIMEB_H + +/* Define to 1 if you have the <sys/time.h> header file. */ +#undef HAVE_SYS_TIME_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <ubidi.h> header file. */ +#undef HAVE_UBIDI_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the <zlib.h> header file. */ +#undef HAVE_ZLIB_H + +/* metafont: Define to include HP 2627 window support */ #undef HP2627WIN + +/* tex: Define to enable --ipc. */ +#undef IPC + +/* metafont: Define to include mftalk (generic server) window support */ #undef MFTALKWIN + +/* metafont: Define to include NeXT window support */ #undef NEXTWIN + +/* web2c: Define to disable architecture-independent dump files. Faster on + LittleEndian architectures. */ +#undef NO_DUMP_SHARE + +/* 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 necessary symbol if this constant uses a non-standard name on + your system. */ +#undef PTHREAD_CREATE_JOINABLE + +/* metafont: Define to include Regis window support */ #undef REGISWIN -#undef SUNWIN -#undef TEKTRONIXWIN -#undef UNITERMWIN -#undef X11WIN -/* The number of bytes in a long. */ +/* Define as the return type of signal handlers (`int' or `void'). */ +#undef RETSIGTYPE + +/* The size of `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* Define if you have the ftime function. */ -#undef HAVE_FTIME +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS -/* Define if you have the gettimeofday function. */ -#undef HAVE_GETTIMEOFDAY +/* metafont: Define to include old Suntools window support (this is not X) */ +#undef SUNWIN -/* Define if you have the mkstemp function. */ -#undef HAVE_MKSTEMP +/* metafont: Define to include Tektronix window support */ +#undef TEKTRONIXWIN -/* Define if you have the mktemp function. */ -#undef HAVE_MKTEMP +/* metafont: Define to include Uniterm window support */ +#undef UNITERMWIN -/* Define if you have the strerror function. */ -#undef HAVE_STRERROR +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +#undef WORDS_BIGENDIAN -/* Define if you have the <sys/time.h> header file. */ -#undef HAVE_SYS_TIME_H +/* Define to include X11 window in Metafont. */ +#undef X11WIN -/* Define if you have the <sys/timeb.h> header file. */ -#undef HAVE_SYS_TIMEB_H +/* Define to 1 if the X Window System is missing or not being used. */ +#undef X_DISPLAY_MISSING -/* Define if you have the <zlib.h> header file. */ -#undef HAVE_ZLIB_H +/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a + `char[]'. */ +#undef YYTEXT_POINTER -/* Define if you have the m library (-lm). */ -#undef HAVE_LIBM +/* Define to 1 if type `char' is unsigned and you are not using gcc. */ +#ifndef __CHAR_UNSIGNED__ +# undef __CHAR_UNSIGNED__ +#endif -/* Define if you have the posix library (-lposix). */ -#undef HAVE_LIBPOSIX +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline +#endif -/* Define if you have the z library (-lz). */ -#undef HAVE_LIBZ #endif /* !WEB2C_C_AUTO_H */ diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index fffcc82771d..08a90a15f7a 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -5255,19 +5255,23 @@ fi # Check whether --with-editor was given. if test "${with_editor+set}" = set; then - withval=$with_editor; cat >>confdefs.h <<_ACEOF -#define EDITOR "$with_editor" -_ACEOF + withval=$with_editor; +else + with_editor="vi +%d %s" +fi -fi +cat >>confdefs.h <<_ACEOF +#define EDITOR "$with_editor" +_ACEOF # Check whether --enable-ipc was given. if test "${enable_ipc+set}" = set; then enableval=$enable_ipc; if test "x$enableval" = xyes; then - cat >>confdefs.h <<\_ACEOF -#define IPC 1 + +cat >>confdefs.h <<\_ACEOF +#define IPC _ACEOF # -lsocket is needed on Solaris, at least. Maybe -lnsl on SCO, too? @@ -5429,18 +5433,21 @@ fi # Check whether --enable-auto-core was given. if test "${enable_auto_core+set}" = set; then - enableval=$enable_auto_core; cat >>confdefs.h <<\_ACEOF -#define FUNNY_CORE_DUMP 1 + enableval=$enable_auto_core; +cat >>confdefs.h <<\_ACEOF +#define FUNNY_CORE_DUMP _ACEOF + fi # Check whether --enable-dump-share was given. if test "${enable_dump_share+set}" = set; then enableval=$enable_dump_share; if test "x$enableval" = xno; then - cat >>confdefs.h <<\_ACEOF -#define NO_DUMP_SHARE 1 + +cat >>confdefs.h <<\_ACEOF +#define NO_DUMP_SHARE _ACEOF fi @@ -5466,8 +5473,9 @@ fi # Check whether --with-epsfwin was given. if test "${with_epsfwin+set}" = set; then withval=$with_epsfwin; if test "x$withval" = xyes; then - cat >>confdefs.h <<\_ACEOF -#define EPSFWIN 1 + +cat >>confdefs.h <<\_ACEOF +#define EPSFWIN _ACEOF fi @@ -5478,8 +5486,9 @@ fi # Check whether --with-hp2627win was given. if test "${with_hp2627win+set}" = set; then withval=$with_hp2627win; if test "x$withval" = xyes; then - cat >>confdefs.h <<\_ACEOF -#define HP2627WIN 1 + +cat >>confdefs.h <<\_ACEOF +#define HP2627WIN _ACEOF fi @@ -5490,8 +5499,9 @@ fi # Check whether --with-mftalkwin was given. if test "${with_mftalkwin+set}" = set; then withval=$with_mftalkwin; if test "x$withval" = xyes; then - cat >>confdefs.h <<\_ACEOF -#define MFTALKWIN 1 + +cat >>confdefs.h <<\_ACEOF +#define MFTALKWIN _ACEOF fi @@ -5502,8 +5512,9 @@ fi # Check whether --with-nextwin was given. if test "${with_nextwin+set}" = set; then withval=$with_nextwin; if test "x$withval" = xyes; then - cat >>confdefs.h <<\_ACEOF -#define NEXTWIN 1 + +cat >>confdefs.h <<\_ACEOF +#define NEXTWIN _ACEOF fi @@ -5514,8 +5525,9 @@ fi # Check whether --with-regiswin was given. if test "${with_regiswin+set}" = set; then withval=$with_regiswin; if test "x$withval" = xyes; then - cat >>confdefs.h <<\_ACEOF -#define REGISWIN 1 + +cat >>confdefs.h <<\_ACEOF +#define REGISWIN _ACEOF fi @@ -5527,8 +5539,9 @@ fi if test "${with_suntoolswin+set}" = set; then withval=$with_suntoolswin; if test "x$withval" = xyes; then wlibs="-lsuntool -lsunwindow -lpixrect $wlibs" - cat >>confdefs.h <<\_ACEOF -#define SUNWIN 1 + +cat >>confdefs.h <<\_ACEOF +#define SUNWIN _ACEOF fi @@ -5539,8 +5552,9 @@ fi # Check whether --with-tektronixwin was given. if test "${with_tektronixwin+set}" = set; then withval=$with_tektronixwin; if test "x$withval" = xyes; then - cat >>confdefs.h <<\_ACEOF -#define TEKTRONIXWIN 1 + +cat >>confdefs.h <<\_ACEOF +#define TEKTRONIXWIN _ACEOF fi @@ -5551,8 +5565,9 @@ fi # Check whether --with-unitermwin was given. if test "${with_unitermwin+set}" = set; then withval=$with_unitermwin; if test "x$withval" = xyes; then - cat >>confdefs.h <<\_ACEOF -#define UNITERMWIN 1 + +cat >>confdefs.h <<\_ACEOF +#define UNITERMWIN _ACEOF fi @@ -10112,7 +10127,8 @@ fi *) wfile=../$srcdir/window/$wfile;; esac (cd window && (rm -f x11.c; $LN_S $wfile x11.c)) - cat >>confdefs.h <<\_ACEOF + +cat >>confdefs.h <<\_ACEOF #define X11WIN 1 _ACEOF @@ -10598,6 +10614,11 @@ else fi fi + + + + + ac_config_files="$ac_config_files Makefile.aux:Makefile.in" ac_config_files="$ac_config_files Makefile:Makefile.aux" ac_config_files="$ac_config_files doc/Makefile.aux:doc/Makefile.in" @@ -11840,7 +11861,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 WEB2C_PACKAGE_/' c-auto.h >c-auto.tmp && mv -f c-auto.tmp c-auto.h + date >stamp-auto ;; "omegafonts/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's kpse_input=`case omegafonts/Makefile.in in [\\/$]*) # Absolute diff --git a/Build/source/texk/web2c/configure.in b/Build/source/texk/web2c/configure.in index 9671603b042..d91600af948 100644 --- a/Build/source/texk/web2c/configure.in +++ b/Build/source/texk/web2c/configure.in @@ -21,7 +21,9 @@ AC_SUBST(WEB2CVERSION) AC_DEFINE_UNQUOTED(WEB2CVERSION," (Web2C $WEB2CVERSION)") 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_CONFIG_HEADERS([c-auto.h:c-auto.in], + [sed 's/^#define PACKAGE_/#define WEB2C_PACKAGE_/' c-auto.h >c-auto.tmp && mv -f c-auto.tmp c-auto.h + date >stamp-auto]) AC_PROG_CC AC_PROG_INSTALL @@ -378,7 +380,7 @@ if test "x$with_x" = xyes; then *) wfile=../$srcdir/window/$wfile;; esac (cd window && (rm -f x11.c; $LN_S $wfile x11.c)) - AC_DEFINE(X11WIN) + AC_DEFINE([X11WIN], 1, [Define to include X11 window in Metafont.]) fi AC_SUBST(x_ext_lib) AC_SUBST(x_tool_libs) @@ -426,6 +428,32 @@ if test "x$with_omega" = xyes || test "x$with_aleph" = xyes || test "x$with_xete KPSE_CROSS_PATH_PROG(OTANGLE, otangle, ./otangle) fi +AH_TOP([/* c-auto.h: defines for web2c, as determined by configure. + + Copyright 1994-97, 2008 Karl Berry. + Copyright 1997-99, 2002, 2005 Olaf Weber. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +/* Guard against double inclusion. */ +#ifndef WEB2C_C_AUTO_H +#define WEB2C_C_AUTO_H + +/* web2c: the version string. */ +#define WEB2CVERSION "REPLACE-WITH-WEB2CVERSION"]) +AH_BOTTOM([#endif /* !WEB2C_C_AUTO_H */]) + dnl Generate `Makefile's, `config.status', and our header file. KPSE_CONFIG_FILES([Makefile doc/Makefile lib/Makefile man/Makefile mpware/Makefile mpdir/Makefile web2c/Makefile window/Makefile]) diff --git a/Build/source/texk/web2c/mpware/ChangeLog b/Build/source/texk/web2c/mpware/ChangeLog index 09912135bfe..cc5eeb2ccaf 100644 --- a/Build/source/texk/web2c/mpware/ChangeLog +++ b/Build/source/texk/web2c/mpware/ChangeLog @@ -1,3 +1,8 @@ +2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de> + + * newer.c, makempx.c: replace `#if HAVE_ST_MTIM' by + `#ifdef HAVE_STRUCT_STAT_ST_MTIM' (from AC_CHECK_MEMBERS). + 2008-01-29 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.in: Add @configure_input@ line. diff --git a/Build/source/texk/web2c/mpware/makempx.c b/Build/source/texk/web2c/mpware/makempx.c index a04aaacc405..51350126f9b 100644 --- a/Build/source/texk/web2c/mpware/makempx.c +++ b/Build/source/texk/web2c/mpware/makempx.c @@ -71,7 +71,7 @@ #define INLINE_NEWER 1 /* We may have high-res timers in struct stat. If we do, use them. */ -#if HAVE_ST_MTIM +#ifdef HAVE_STRUCT_STAT_ST_MTIM #define ISNEWER(S,T) (S.st_mtim.tv_sec > T.st_mtim.tv_sec || \ (S.st_mtim.tv_sec == T.st_mtim.tv_sec && \ S.st_mtim.tv_nsec >= T.st_mtim.tv_nsec)) diff --git a/Build/source/texk/web2c/mpware/newer.c b/Build/source/texk/web2c/mpware/newer.c index 951575cfb75..749c091a7c7 100644 --- a/Build/source/texk/web2c/mpware/newer.c +++ b/Build/source/texk/web2c/mpware/newer.c @@ -24,7 +24,7 @@ #define exit_true 0 /* We may have high-res timers in struct stat. If we do, use them. */ -#if HAVE_ST_MTIM +#ifdef HAVE_STRUCT_STAT_ST_MTIM #define NEWER(S,T) (S.st_mtim.tv_sec > T.st_mtim.tv_sec || \ (S.st_mtim.tv_sec == T.st_mtim.tv_sec && \ S.st_mtim.tv_nsec >= T.st_mtim.tv_nsec)) diff --git a/Build/source/texk/web2c/stamp-aclocal b/Build/source/texk/web2c/stamp-aclocal new file mode 100644 index 00000000000..7aecc65552b --- /dev/null +++ b/Build/source/texk/web2c/stamp-aclocal @@ -0,0 +1 @@ +Fri Feb 29 13:37:36 CET 2008 diff --git a/Build/source/texk/web2c/stamp-auto.in b/Build/source/texk/web2c/stamp-auto.in index ffe8a99f2a5..f020904ad46 100644 --- a/Build/source/texk/web2c/stamp-auto.in +++ b/Build/source/texk/web2c/stamp-auto.in @@ -1 +1 @@ -Mo Aug 22 08:26:24 CEST 2005 +Fri Feb 29 13:37:38 CET 2008 diff --git a/Build/source/texk/web2c/window/ChangeLog b/Build/source/texk/web2c/window/ChangeLog index 37b7f73099d..f4cbc778bfc 100644 --- a/Build/source/texk/web2c/window/ChangeLog +++ b/Build/source/texk/web2c/window/ChangeLog @@ -1,3 +1,7 @@ +2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de> + + * x11-Xt.c: remove unused preprocessor stuff (FOIL...). + 2008-01-29 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.in: Add @configure_input@ line. diff --git a/Build/source/texk/web2c/window/x11-Xt.c b/Build/source/texk/web2c/window/x11-Xt.c index c22a586fb92..00f9f0924c4 100644 --- a/Build/source/texk/web2c/window/x11-Xt.c +++ b/Build/source/texk/web2c/window/x11-Xt.c @@ -9,11 +9,6 @@ /* For wchar_t et al., that the X files might want. */ #include <kpathsea/systypes.h> -/* See xdvik/xdvi.h for the purpose of the FOIL... */ -#ifdef FOIL_X_WCHAR_T -#define wchar_t foil_x_defining_wchar_t -#define X_WCHAR -#endif #undef input /* the XWMHints structure has a field named `input' */ #undef output #include <X11/Xlib.h> diff --git a/Build/source/texk/web2c/withenable.ac b/Build/source/texk/web2c/withenable.ac index 17cc777f564..1a276873754 100644 --- a/Build/source/texk/web2c/withenable.ac +++ b/Build/source/texk/web2c/withenable.ac @@ -41,13 +41,14 @@ AC_ARG_WITH([cxx-runtime-hack], AC_ARG_WITH([editor], [ --with-editor=CMD invoke CMD from the e option [vi +%d %s]], - [AC_DEFINE_UNQUOTED(EDITOR, "$with_editor") -]) + [], [with_editor="vi +%d %s"]) +AC_DEFINE_UNQUOTED([EDITOR], ["$with_editor"], + [web2c: Default editor for interactive `e' option.]) AC_ARG_ENABLE([ipc], [ --enable-ipc enable TeX's --ipc option, i.e., pipe to a program], [if test "x$enableval" = xyes; then - AC_DEFINE(IPC) + AC_DEFINE([IPC], , [tex: Define to enable --ipc.]) # -lsocket is needed on Solaris, at least. Maybe -lnsl on SCO, too? # See ac_path_xtra. AC_CHECK_FUNC(connect) @@ -60,12 +61,16 @@ AC_SUBST(socketlibs) 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], , + [web2c: Define to enable HackyInputFileNameForCoreDump.tex.]) +]) AC_ARG_ENABLE([dump-share], [ --disable-dump-share make fmt/base/mem files architecture-dependent], [if test "x$enableval" = xno; then - AC_DEFINE(NO_DUMP_SHARE) + AC_DEFINE([NO_DUMP_SHARE], , + [web2c: Define to disable architecture-independent dump files. + Faster on LittleEndian architectures.]) fi ]) @@ -82,50 +87,58 @@ AC_ARG_WITH([mf-nowin], AC_ARG_WITH([epsfwin], [ --with-epsfwin include EPSF pseudo-window support], [if test "x$withval" = xyes; then - AC_DEFINE(EPSFWIN) + AC_DEFINE([EPSFWIN], , + [metafont: Define to include EPSF pseudo-window support]) fi ]) AC_ARG_WITH([hp2627win], [ --with-hp2627win include HP 2627 window support in Metafont], [if test "x$withval" = xyes; then - AC_DEFINE(HP2627WIN) + AC_DEFINE([HP2627WIN], , + [metafont: Define to include HP 2627 window support]) fi ]) AC_ARG_WITH([mftalkwin], [ --with-mftalkwin include mftalk (generic server) window support], [if test "x$withval" = xyes; then - AC_DEFINE(MFTALKWIN) + AC_DEFINE([MFTALKWIN], , + [metafont: Define to include mftalk (generic server) window support]) fi ]) AC_ARG_WITH([nextwin], [ --with-nextwin include NeXT window support], [if test "x$withval" = xyes; then - AC_DEFINE(NEXTWIN) + AC_DEFINE([NEXTWIN], , + [metafont: Define to include NeXT window support]) fi ]) AC_ARG_WITH([regiswin], [ --with-regiswin include Regis window support], [if test "x$withval" = xyes; then - AC_DEFINE(REGISWIN) + AC_DEFINE([REGISWIN], , + [metafont: Define to include Regis window support]) fi ]) AC_ARG_WITH([suntoolswin], [ --with-suntoolswin include old Suntools window support (this is not X)], [if test "x$withval" = xyes; then wlibs="-lsuntool -lsunwindow -lpixrect $wlibs" - AC_DEFINE(SUNWIN) + AC_DEFINE([SUNWIN], , + [metafont: Define to include old Suntools window support (this is not X)]) fi ]) AC_ARG_WITH([tektronixwin], [ --with-tektronixwin include Tektronix window support], [if test "x$withval" = xyes; then - AC_DEFINE(TEKTRONIXWIN) + AC_DEFINE([TEKTRONIXWIN], , + [metafont: Define to include Tektronix window support]) fi ]) AC_ARG_WITH([unitermwin], [ --with-unitermwin include Uniterm window support], [if test "x$withval" = xyes; then - AC_DEFINE(UNITERMWIN) + AC_DEFINE([UNITERMWIN], , + [metafont: Define to include Uniterm window support]) fi ]) |