From 4403160cd26a0ba4eb014d69bfb9dcd568f64fc6 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 12 Jun 2015 08:45:07 +0000 Subject: Integrate MFLua and MFLuaJIT git-svn-id: svn://tug.org/texlive/trunk@37504 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/configure | 172 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 154 insertions(+), 18 deletions(-) (limited to 'Build/source/configure') diff --git a/Build/source/configure b/Build/source/configure index ce0b359ab3f..7b59e6de2e3 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for TeX Live 2015-03-07. +# Generated by GNU Autoconf 2.69 for TeX Live 2015-06-12. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='TeX Live' PACKAGE_TARNAME='tex-live' -PACKAGE_VERSION='2015-03-07' -PACKAGE_STRING='TeX Live 2015-03-07' +PACKAGE_VERSION='2015-06-12' +PACKAGE_STRING='TeX Live 2015-06-12' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -829,6 +829,10 @@ enable_xetex enable_xetex_synctex enable_mf enable_mf_nowin +enable_mflua +enable_mflua_nowin +enable_mfluajit +enable_mfluajit_nowin with_mf_x_toolkit enable_epsfwin enable_hp2627win @@ -1504,7 +1508,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 TeX Live 2015-03-07 to adapt to many kinds of systems. +\`configure' configures TeX Live 2015-06-12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1578,7 +1582,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of TeX Live 2015-03-07:";; + short | recursive ) echo "Configuration of TeX Live 2015-06-12:";; esac cat <<\_ACEOF @@ -1639,6 +1643,10 @@ Optional Features: --disable-mf do not compile and install METAFONT --disable-mf-nowin do not build a separate non-window-capable METAFONT + --disable-mflua do not compile and install MFLua + --enable-mflua-nowin build a separate non-window-capable MFLua + --disable-mfluajit do not compile and install MFLuaJIT + --enable-mfluajit-nowin build a separate non-window-capable MFLuaJIT --enable-epsfwin include EPSF pseudo window support --enable-hp2627win include HP 2627 window support --enable-mftalkwin include mftalk (generic server) window support @@ -1891,7 +1899,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -TeX Live configure 2015-03-07 +TeX Live configure 2015-06-12 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2441,6 +2449,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 @@ -2622,7 +2676,7 @@ 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 TeX Live $as_me 2015-03-07, which was +It was created by TeX Live $as_me 2015-06-12, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4121,6 +4175,20 @@ $as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;} ;; esac ;; esac +case $enable_mfluajit in #( + yes | no) : + : ;; #( + *) : + case $host in #( + alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) : + { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-mfluajit'" >&5 +$as_echo "$as_me: $host -> \`--disable-mfluajit'" >&6;} + ac_configure_args="$ac_configure_args '--disable-mfluajit'" ;; #( + *) : + ;; +esac ;; +esac + ## utils/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/devnag/ ## configure options and TL libraries required for devnag # Check whether --enable-devnag was given. @@ -4693,6 +4761,62 @@ esac if test "${enable_mf_nowin+set}" = set; then : enableval=$enable_mf_nowin; fi +case $enable_mf_nowin in #( + yes | no) : + ;; #( + *) : + enable_mf_nowin=yes ;; +esac +# Check whether --enable-mflua was given. +if test "${enable_mflua+set}" = set; then : + enableval=$enable_mflua; +fi +case $enable_mflua in #( + yes | no) : + ;; #( + *) : + enable_mflua=yes ;; +esac + +# Check whether --enable-mflua-nowin was given. +if test "${enable_mflua_nowin+set}" = set; then : + enableval=$enable_mflua_nowin; +fi +case $enable_mflua_nowin in #( + yes | no) : + ;; #( + *) : + enable_mflua_nowin=no ;; +esac + +test "x$enable_web2c:$enable_mflua" = xyes:yes && { + need_lua52=yes +} +# Check whether --enable-mfluajit was given. +if test "${enable_mfluajit+set}" = set; then : + enableval=$enable_mfluajit; +fi +case $enable_mfluajit in #( + yes | no) : + ;; #( + *) : + enable_mfluajit=yes ;; +esac + +# Check whether --enable-mfluajit-nowin was given. +if test "${enable_mfluajit_nowin+set}" = set; then : + enableval=$enable_mfluajit_nowin; +fi +case $enable_mfluajit_nowin in #( + yes | no) : + ;; #( + *) : + enable_mfluajit_nowin=no ;; +esac + +test "x$enable_web2c:$enable_mfluajit" = xyes:yes && { + need_luajit=yes +} # Check whether --with-mf-x-toolkit was given. if test "${with_mf_x_toolkit+set}" = set; then : @@ -10646,7 +10770,7 @@ fi # Define the identity of the package. PACKAGE='tex-live' - VERSION='2015-03-07' + VERSION='2015-06-12' cat >>confdefs.h <<_ACEOF @@ -11014,13 +11138,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" ;; #( *) : ;; @@ -11032,7 +11156,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" ;; #( *) : ;; @@ -16439,6 +16563,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 +" +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 : @@ -17543,7 +17679,7 @@ if test "x$enable_compiler_warnings" != xno; then ;; esac case `$CXX -dumpversion` in #( - 3.[234].* | 4.*) : + 3.[234].* | 4.* | 5.*) : kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #( *) : ;; @@ -21250,11 +21386,11 @@ if test "x$with_mpfr_libdir" != x && test "x$with_mpfr_libdir" != xyes; then MPFR_LIBS="-L$with_mpfr_libdir $MPFR_LIBS" fi -if $PKG_CONFIG poppler --atleast-version=0.18; then +if $PKG_CONFIG poppler --atleast-version=0.30; then POPPLER_INCLUDES=`$PKG_CONFIG poppler --cflags` POPPLER_LIBS=`$PKG_CONFIG poppler --libs` elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then - as_fn_error $? "did not find poppler 0.18 or better" "$LINENO" 5 + as_fn_error $? "did not find poppler 0.30 or better" "$LINENO" 5 fi POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' @@ -22609,7 +22745,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 TeX Live $as_me 2015-03-07, which was +This file was extended by TeX Live $as_me 2015-06-12, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22666,7 +22802,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="\\ -TeX Live config.status 2015-03-07 +TeX Live config.status 2015-06-12 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -24622,11 +24758,11 @@ msg_compiling="$msg_compiling test "x$srcdir" = x. || msg_compiling="$msg_compiling from sources in $kpse_src" { $as_echo "$as_me:${as_lineno-$LINENO}: result: -** Configuration summary for $PACKAGE_STRING (2015$with_banner_add): +** Configuration summary for $PACKAGE_STRING (2016/dev$with_banner_add): $msg_compiling" >&5 $as_echo " -** Configuration summary for $PACKAGE_STRING (2015$with_banner_add): +** Configuration summary for $PACKAGE_STRING (2016/dev$with_banner_add): $msg_compiling" >&6; } case $kpse_src$kpse_bld in -- cgit v1.2.3