summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/web2c
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-06-12 08:45:07 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-06-12 08:45:07 +0000
commit4403160cd26a0ba4eb014d69bfb9dcd568f64fc6 (patch)
tree0a036c9b3654e6e7b2e73753225598980d25c54f /Build/source/texk/web2c/web2c
parent1dde8ab4578f370c597332ff3421097d7cb39a1a (diff)
Integrate MFLua and MFLuaJIT
git-svn-id: svn://tug.org/texlive/trunk@37504 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/web2c')
-rw-r--r--Build/source/texk/web2c/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/web2c/coerce.h3
-rwxr-xr-xBuild/source/texk/web2c/web2c/configure130
-rwxr-xr-xBuild/source/texk/web2c/web2c/convert14
-rw-r--r--Build/source/texk/web2c/web2c/splitup.c8
5 files changed, 93 insertions, 67 deletions
diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog
index e43657a3a20..3bf48558545 100644
--- a/Build/source/texk/web2c/web2c/ChangeLog
+++ b/Build/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Integrate MFLua and MFLuaJIT.
+ * coerce.h, convert, splitup.c: Adapted.
+
2015-04-17 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Test if isascii is declared.
diff --git a/Build/source/texk/web2c/web2c/coerce.h b/Build/source/texk/web2c/web2c/coerce.h
index 6b36130ad21..c309dcccf95 100644
--- a/Build/source/texk/web2c/web2c/coerce.h
+++ b/Build/source/texk/web2c/web2c/coerce.h
@@ -36,6 +36,9 @@ extern void calledit (packedASCIIcode *, poolpointer, integer, integer);
#ifdef MF
extern void blankrectangle (screencol, screencol, screenrow, screenrow);
extern void paintrow (screenrow, pixelcolor, transspec, screencol);
+#if defined(MFLua) || defined(MFLuaJIT)
+#include <mfluadir/mfluac.h>
+#endif
#endif
extern strnumber makefullnamestring(void);
diff --git a/Build/source/texk/web2c/web2c/configure b/Build/source/texk/web2c/web2c/configure
index 37613c1771b..ebed28d902d 100755
--- a/Build/source/texk/web2c/web2c/configure
+++ b/Build/source/texk/web2c/web2c/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Web2C Tools 2015.
+# Generated by GNU Autoconf 2.69 for Web2C Tools 2016/dev.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Web2C Tools'
PACKAGE_TARNAME='web2c-tools'
-PACKAGE_VERSION='2015'
-PACKAGE_STRING='Web2C Tools 2015'
+PACKAGE_VERSION='2016/dev'
+PACKAGE_STRING='Web2C Tools 2016/dev'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -1328,7 +1328,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Web2C Tools 2015 to adapt to many kinds of systems.
+\`configure' configures Web2C Tools 2016/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1398,7 +1398,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Web2C Tools 2015:";;
+ short | recursive ) echo "Configuration of Web2C Tools 2016/dev:";;
esac
cat <<\_ACEOF
@@ -1521,7 +1521,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Web2C Tools configure 2015
+Web2C Tools configure 2016/dev
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2071,6 +2071,52 @@ $as_echo "$ac_res" >&6; }
} # ac_fn_c_find_uintX_t
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ as_decl_name=`echo $2|sed 's/ *(.*//'`
+ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+ (void) $as_decl_use;
+#else
+ (void) $as_decl_name;
+#endif
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_decl
+
# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
# ----------------------------------------------------
# Tries to find if the field MEMBER exists in type AGGR, after including
@@ -2310,57 +2356,11 @@ rm -f conftest.val
as_fn_set_status $ac_retval
} # ac_fn_c_compute_int
-
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_c_check_decl ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- as_decl_name=`echo $2|sed 's/ *(.*//'`
- as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-#ifndef $as_decl_name
-#ifdef __cplusplus
- (void) $as_decl_use;
-#else
- (void) $as_decl_name;
-#endif
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_decl
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Web2C Tools $as_me 2015, which was
+It was created by Web2C Tools $as_me 2016/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8045,7 +8045,7 @@ fi
# Define the identity of the package.
PACKAGE='web2c-tools'
- VERSION='2015'
+ VERSION='2016/dev'
cat >>confdefs.h <<_ACEOF
@@ -8200,13 +8200,13 @@ else
if test "x$enable_compiler_warnings" != xno; then
kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
case `$CC -dumpversion` in #(
- 3.4.* | 4.*) :
+ 3.4.* | 4.* | 5.*) :
kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
*) :
;;
esac
case `$CC -dumpversion` in #(
- 3.[234].* | 4.*) :
+ 3.[234].* | 4.* | 5.*) :
kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
*) :
;;
@@ -8218,7 +8218,7 @@ esac
kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
case `$CC -dumpversion` in #(
- 3.4.* | 4.*) :
+ 3.4.* | 4.* | 5.*) :
kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
*) :
;;
@@ -13625,6 +13625,18 @@ case :$ac_cv_c_int64_t:$ac_cv_c_int64_t: in #(
*) :
;;
esac
+ac_fn_c_check_decl "$LINENO" "isascii" "ac_cv_have_decl_isascii" "#include <ctype.h>
+"
+if test "x$ac_cv_have_decl_isascii" = xyes; then :
+ ac_have_decl=1
+else
+ ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ISASCII $ac_have_decl
+_ACEOF
+
ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim" "ac_cv_member_struct_stat_st_mtim" "$ac_includes_default"
if test "x$ac_cv_member_struct_stat_st_mtim" = xyes; then :
@@ -14562,7 +14574,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Web2C Tools $as_me 2015, which was
+This file was extended by Web2C Tools $as_me 2016/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14628,7 +14640,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Web2C Tools config.status 2015
+Web2C Tools config.status 2016/dev
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/texk/web2c/web2c/convert b/Build/source/texk/web2c/web2c/convert
index 4e3c2cdfd68..36c5c13c94c 100755
--- a/Build/source/texk/web2c/web2c/convert
+++ b/Build/source/texk/web2c/web2c/convert
@@ -64,9 +64,9 @@ case $basefile in
midcmd="| sed -f $srcdir/web2c/cvtbib.sed"
;;
- mf|tex|aleph|etex|pdftex|ptex|eptex|euptex|uptex|xetex)
+ mf|mflua|mfluajit|tex|aleph|etex|pdftex|ptex|eptex|euptex|uptex|xetex)
case $basefile in
- mf)
+ mf*)
more_defines="$srcdir/web2c/texmf.defines $srcdir/web2c/mfmp.defines"
precmd="| sed -f $srcdir/web2c/cvtmf1.sed"
web2c_options="-m -c${basefile}coerce"
@@ -75,14 +75,14 @@ case $basefile in
*)
more_defines="$srcdir/web2c/texmf.defines $srcdir/synctexdir/synctex.defines"
- prog_defines="$srcdir/${basefile}dir/$basefile.defines"
- if test -f $prog_defines; then
- more_defines="$more_defines $prog_defines"
- fi
web2c_options="-t -c${basefile}coerce"
fixwrites_options=-t
;;
esac
+ prog_defines="$srcdir/${basefile}dir/$basefile.defines"
+ if test -f $prog_defines; then
+ more_defines="$more_defines $prog_defines"
+ fi
hfile=texmfmp.h
postcmd="| ./web2c/splitup $splitup_options $basefile"
cfile=${basefile}0.c # last output file, or thereabouts
@@ -121,7 +121,7 @@ case $basefile in
sed -e 's/(buftype)//g' -e 's/(pdstype)//g' <$basefile.h >x$basefile.h
mv x$basefile.h $basefile.h
;;
- mf|tex|aleph|etex|pdftex|ptex|eptex|euptex|uptex|xetex)
+ mf|mflua|mfluajit|tex|aleph|etex|pdftex|ptex|eptex|euptex|uptex|xetex)
sleep 2 # so timestamps are definitely later, to avoid make weirdness
cat $srcdir/web2c/coerce.h >>${basefile}coerce.h
touch ${basefile}d.h
diff --git a/Build/source/texk/web2c/web2c/splitup.c b/Build/source/texk/web2c/web2c/splitup.c
index eb3442eacf9..8288a516cf7 100644
--- a/Build/source/texk/web2c/web2c/splitup.c
+++ b/Build/source/texk/web2c/web2c/splitup.c
@@ -118,8 +118,14 @@ main (int argc, string *argv)
fputs ("#define STAT\n#define INI\n", out);
if (STREQ (output_name, "mf")) {
- fputs ("#define INIMF\n#define MF\n", out);
+ fputs ("#define INIMF\n#define MF\n#define onlyMF\n", out);
coerce = "mfcoerce.h";
+ } else if (STREQ (output_name, "mflua")) {
+ fputs ("#define INIMF\n#define MF\n#define MFLua\n", out);
+ coerce = "mfluacoerce.h";
+ } else if (STREQ (output_name, "mfluajit")) {
+ fputs ("#define INIMF\n#define MF\n#define MFLuaJIT\n", out);
+ coerce = "mfluajitcoerce.h";
} else if (STREQ (output_name, "tex")) {
fputs ("#define INITEX\n#define TeX\n#define onlyTeX\n", out);
coerce = "texcoerce.h";