diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-03-21 09:37:04 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-03-21 09:37:04 +0000 |
commit | f2e484aceecf05d600322fdde8a4a4a8ed1893d9 (patch) | |
tree | 52c01f35966be2846c17fd98da7b79cc96b81626 /Build/source | |
parent | 7971b009460389521525040ffd874e9879bc0a7d (diff) |
Automatically disable LuaJITTeX for known unsupported systems
git-svn-id: svn://tug.org/texlive/trunk@33248 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rwxr-xr-x | Build/source/configure | 23 | ||||
-rwxr-xr-x | Build/source/libs/configure | 23 | ||||
-rw-r--r-- | Build/source/m4/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/m4/kpse-setup.m4 | 9 | ||||
-rwxr-xr-x | Build/source/texk/configure | 23 | ||||
-rwxr-xr-x | Build/source/utils/configure | 23 |
6 files changed, 84 insertions, 21 deletions
diff --git a/Build/source/configure b/Build/source/configure index bfd94585bf0..6ce81f4bd87 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -3005,11 +3005,6 @@ specify the configure option \`--enable-build-in-source-tree', but then do not ask for help -- you have been warned." "$LINENO" 5 fi -# Check whether --enable-missing was given. -if test "${enable_missing+set}" = set; then : - enableval=$enable_missing; -fi - # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 @@ -3081,6 +3076,11 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +# Check whether --enable-missing was given. +if test "${enable_missing+set}" = set; then : + enableval=$enable_missing; +fi + # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -4102,6 +4102,19 @@ $as_echo "$as_me: Assuming \`--with-x'" >&6;} $as_echo "$as_me: WIN32 -> \`--without-x'" >&6;} ac_configure_args="$ac_configure_args '--without-x'" ;; esac +case $enable_luajittex in #( + yes | no) : + : ;; #( + *) : + case $host in #( + alpha* | sparc* | x86_64-*-cygwin) : + { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajittex'" >&5 +$as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;} + ac_configure_args="$ac_configure_args '--disable-luajittex'" ;; #( + *) : + ;; +esac ;; +esac ## utils/biber/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/biber/ ## configure options and TL libraries required for biber # Check whether --enable-biber was given. diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 0f639beee7d..498c0712241 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -2255,11 +2255,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -# Check whether --enable-missing was given. -if test "${enable_missing+set}" = set; then : - enableval=$enable_missing; -fi - # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 @@ -2331,6 +2326,11 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +# Check whether --enable-missing was given. +if test "${enable_missing+set}" = set; then : + enableval=$enable_missing; +fi + # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -3352,6 +3352,19 @@ $as_echo "$as_me: Assuming \`--with-x'" >&6;} $as_echo "$as_me: WIN32 -> \`--without-x'" >&6;} ac_configure_args="$ac_configure_args '--without-x'" ;; esac +case $enable_luajittex in #( + yes | no) : + : ;; #( + *) : + case $host in #( + alpha* | sparc* | x86_64-*-cygwin) : + { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajittex'" >&5 +$as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;} + ac_configure_args="$ac_configure_args '--disable-luajittex'" ;; #( + *) : + ;; +esac ;; +esac ## utils/biber/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/biber/ ## configure options and TL libraries required for biber # Check whether --enable-biber was given. diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index 9825a74dca1..7cea39fe751 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,7 @@ +2014-03-21 Peter Breitenlohner <peb@mppmu.mpg.de> + + * kpse-setup.m4: Disable LuaJITTeX for known unsupported systems. + 2014-03-13 Peter Breitenlohner <peb@mppmu.mpg.de> * kpse-luajit-flags.m4 (KPSE_LUAJIT_DEFINES): Set LUAJIT_LDEXTRA diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4 index 73913d38159..59a883e2e41 100644 --- a/Build/source/m4/kpse-setup.m4 +++ b/Build/source/m4/kpse-setup.m4 @@ -1,5 +1,5 @@ # Private macros for the TeX Live (TL) tree. -# Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, @@ -15,6 +15,7 @@ # additional program specific configure options (if any) # library dependencies for programs and libraries AC_DEFUN([KPSE_SETUP], [dnl +AC_REQUIRE([AC_CANONICAL_HOST])[]dnl AC_REQUIRE([_KPSE_MSG_WARN_PREPARE])[]dnl m4_define([kpse_TL], [$1])[]dnl m4_define([kpse_indent_26], [28])[]dnl @@ -80,6 +81,12 @@ AS_CASE([$with_x:$kpse_cv_have_win32], [with_x=no AC_MSG_NOTICE([WIN32 -> `--without-x']) ac_configure_args="$ac_configure_args '--without-x'"]) +AS_CASE([$enable_luajittex], + [yes | no], [:], + [AS_CASE([$host], + [alpha* | sparc* | x86_64-*-cygwin], + [AC_MSG_NOTICE([$host -> `--disable-luajittex']) + ac_configure_args="$ac_configure_args '--disable-luajittex'"])]) KPSE_FOR_PKGS([utils], [m4_sinclude(kpse_TL[utils/]Kpse_Pkg[/ac/withenable.ac])]) KPSE_FOR_PKGS([texk], [m4_sinclude(kpse_TL[texk/]Kpse_Pkg[/ac/withenable.ac])]) KPSE_FOR_PKGS([libs], [m4_sinclude(kpse_TL[libs/]Kpse_Pkg[/ac/withenable.ac])]) diff --git a/Build/source/texk/configure b/Build/source/texk/configure index c93bcd46e25..6b5846249d7 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -2268,11 +2268,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -# Check whether --enable-missing was given. -if test "${enable_missing+set}" = set; then : - enableval=$enable_missing; -fi - # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 @@ -2344,6 +2339,11 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +# Check whether --enable-missing was given. +if test "${enable_missing+set}" = set; then : + enableval=$enable_missing; +fi + # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -3365,6 +3365,19 @@ $as_echo "$as_me: Assuming \`--with-x'" >&6;} $as_echo "$as_me: WIN32 -> \`--without-x'" >&6;} ac_configure_args="$ac_configure_args '--without-x'" ;; esac +case $enable_luajittex in #( + yes | no) : + : ;; #( + *) : + case $host in #( + alpha* | sparc* | x86_64-*-cygwin) : + { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajittex'" >&5 +$as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;} + ac_configure_args="$ac_configure_args '--disable-luajittex'" ;; #( + *) : + ;; +esac ;; +esac ## utils/biber/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/biber/ ## configure options and TL libraries required for biber # Check whether --enable-biber was given. diff --git a/Build/source/utils/configure b/Build/source/utils/configure index a99c1711298..3f1a56887ff 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -2248,11 +2248,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -# Check whether --enable-missing was given. -if test "${enable_missing+set}" = set; then : - enableval=$enable_missing; -fi - # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 @@ -2324,6 +2319,11 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +# Check whether --enable-missing was given. +if test "${enable_missing+set}" = set; then : + enableval=$enable_missing; +fi + # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -3345,6 +3345,19 @@ $as_echo "$as_me: Assuming \`--with-x'" >&6;} $as_echo "$as_me: WIN32 -> \`--without-x'" >&6;} ac_configure_args="$ac_configure_args '--without-x'" ;; esac +case $enable_luajittex in #( + yes | no) : + : ;; #( + *) : + case $host in #( + alpha* | sparc* | x86_64-*-cygwin) : + { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajittex'" >&5 +$as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;} + ac_configure_args="$ac_configure_args '--disable-luajittex'" ;; #( + *) : + ;; +esac ;; +esac ## utils/biber/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/biber/ ## configure options and TL libraries required for biber # Check whether --enable-biber was given. |