diff options
Diffstat (limited to 'Build/source/configure')
-rwxr-xr-x | Build/source/configure | 205 |
1 files changed, 193 insertions, 12 deletions
diff --git a/Build/source/configure b/Build/source/configure index c00d55b1633..2768dae035c 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 2014-04-01. +# Generated by GNU Autoconf 2.69 for TeX Live 2014-06-16. # # Report bugs to <tex-k@tug.org>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='TeX Live' PACKAGE_TARNAME='tex-live' -PACKAGE_VERSION='2014-04-01' -PACKAGE_STRING='TeX Live 2014-04-01' +PACKAGE_VERSION='2014-06-16' +PACKAGE_STRING='TeX Live 2014-06-16' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -899,6 +899,12 @@ with_system_graphite2 with_system_zziplib with_system_xpdf with_system_poppler +with_system_mpfr +with_mpfr_includes +with_mpfr_libdir +with_system_gmp +with_gmp_includes +with_gmp_libdir with_system_cairo with_system_pixman with_system_potrace @@ -1499,7 +1505,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 2014-04-01 to adapt to many kinds of systems. +\`configure' configures TeX Live 2014-06-16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1573,7 +1579,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of TeX Live 2014-04-01:";; + short | recursive ) echo "Configuration of TeX Live 2014-06-16:";; esac cat <<\_ACEOF @@ -1760,6 +1766,13 @@ Optional Packages: xpdf library from TL (requires pkg-config) --with-system-poppler use installed poppler headers and library (requires pkg-config) + --with-system-mpfr use installed mpfr headers and library + --with-mpfr-includes=DIR + mpfr headers installed in DIR + --with-mpfr-libdir=DIR mpfr library installed in DIR + --with-system-gmp use installed gmp headers and library + --with-gmp-includes=DIR gmp headers installed in DIR + --with-gmp-libdir=DIR gmp library installed in DIR --with-system-cairo use installed cairo headers and library (requires pkg-config) --with-system-pixman use installed pixman headers and library (requires @@ -1883,7 +1896,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -TeX Live configure 2014-04-01 +TeX Live configure 2014-06-16 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2614,7 +2627,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 2014-04-01, which was +It was created by TeX Live $as_me 2014-06-16, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -5772,6 +5785,100 @@ test "x$need_poppler" = xyes && { need_zlib=yes } +## libs/mpfr/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/mpfr/ +## configure options and TL libraries required for mpfr + +# Check whether --with-system-mpfr was given. +if test "${with_system_mpfr+set}" = set; then : + withval=$with_system_mpfr; +fi + +# Check whether --with-mpfr-includes was given. +if test "${with_mpfr_includes+set}" = set; then : + withval=$with_mpfr_includes; +fi + +# Check whether --with-mpfr-libdir was given. +if test "${with_mpfr_libdir+set}" = set; then : + withval=$with_mpfr_libdir; +fi +if test "x$with_system_mpfr" = x; then + if test -f $srcdir/libs/mpfr/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`mpfr' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`mpfr' headers and library from TL tree" >&6;} + with_system_mpfr=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`mpfr' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`mpfr' headers and library" >&6;} + with_system_mpfr=yes + fi + ac_configure_args="$ac_configure_args '--with-system-mpfr=$with_system_mpfr'" +elif test "x$with_system_mpfr" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`mpfr' headers and library" >&5 +$as_echo "$as_me: Using installed \`mpfr' headers and library" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`mpfr' headers and library from TL tree" >&5 +$as_echo "$as_me: Using \`mpfr' headers and library from TL tree" >&6;} + if test "x$with_system_mpfr" != xno; then + with_system_mpfr=no + ac_configure_args="$ac_configure_args '--without-system-mpfr'" + fi +fi +if test "x$with_system_mpfr" = xyes; then + if test "x$with_system_gmp" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`gmp' headers and library" >&5 +$as_echo "$as_me: -> installed \`gmp' headers and library" >&6;} + with_system_gmp=yes + ac_configure_args="$ac_configure_args '--with-system-gmp'" + elif test "x$with_system_gmp" != xyes; then + as_fn_error $? "Sorry, \`--with-system-mpfr' requires \`--with-system-gmp'" "$LINENO" 5 + fi +fi + +test "x$need_mpfr" = xyes && { + need_gmp=yes +} + +## libs/gmp/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gmp/ +## configure options and TL libraries required for gmp + +# Check whether --with-system-gmp was given. +if test "${with_system_gmp+set}" = set; then : + withval=$with_system_gmp; +fi + +# Check whether --with-gmp-includes was given. +if test "${with_gmp_includes+set}" = set; then : + withval=$with_gmp_includes; +fi + +# Check whether --with-gmp-libdir was given. +if test "${with_gmp_libdir+set}" = set; then : + withval=$with_gmp_libdir; +fi +if test "x$with_system_gmp" = x; then + if test -f $srcdir/libs/gmp/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`gmp' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`gmp' headers and library from TL tree" >&6;} + with_system_gmp=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`gmp' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`gmp' headers and library" >&6;} + with_system_gmp=yes + fi + ac_configure_args="$ac_configure_args '--with-system-gmp=$with_system_gmp'" +elif test "x$with_system_gmp" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`gmp' headers and library" >&5 +$as_echo "$as_me: Using installed \`gmp' headers and library" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`gmp' headers and library from TL tree" >&5 +$as_echo "$as_me: Using \`gmp' headers and library from TL tree" >&6;} + if test "x$with_system_gmp" != xno; then + with_system_gmp=no + ac_configure_args="$ac_configure_args '--without-system-gmp'" + fi +fi + ## libs/cairo/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/cairo/ ## configure options and TL libraries required for cairo @@ -10311,7 +10418,7 @@ fi # Define the identity of the package. PACKAGE='tex-live' - VERSION='2014-04-01' + VERSION='2014-06-16' cat >>confdefs.h <<_ACEOF @@ -20493,6 +20600,22 @@ elif test "x$need_cairo:$with_system_cairo" = xyes:yes; then as_fn_error $? "did not find cairo-1.12 or better" "$LINENO" 5 fi +if test "x$with_gmp_includes" != x && test "x$with_gmp_includes" != xyes; then + GMP_INCLUDES="-I$with_gmp_includes" +fi +GMP_LIBS="-lgmp" +if test "x$with_gmp_libdir" != x && test "x$with_gmp_libdir" != xyes; then + GMP_LIBS="-L$with_gmp_libdir $GMP_LIBS" +fi + +if test "x$with_mpfr_includes" != x && test "x$with_mpfr_includes" != xyes; then + MPFR_INCLUDES="-I$with_mpfr_includes" +fi +MPFR_LIBS="-lmpfr" +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 POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' POPPLER_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`" @@ -20942,6 +21065,64 @@ rm -f core conftest.err conftest.$ac_objext \ $as_echo "$kpse_res" >&6; } fi +## libs/gmp/ac/gmp.ac: configure.ac fragment for the TeX Live subdirectory libs/gmp/ +## basic check of system gmp +if test "x$need_gmp:$with_system_gmp" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`gmp' library" >&5 +$as_echo_n "checking requested system \`gmp' library... " >&6; } + CPPFLAGS="$GMP_INCLUDES $CPPFLAGS" + LIBS="$GMP_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <gmp.h> +int +main () +{ +const char *s = gmp_version; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + syslib_used=yes kpse_res=ok +else + syslib_status=no kpse_res=failed +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 +$as_echo "$kpse_res" >&6; } +fi + +## libs/mpfr/ac/mpfr.ac: configure.ac fragment for the TeX Live subdirectory libs/mpfr/ +## basic check of system mpfr +if test "x$need_mpfr:$with_system_mpfr" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`mpfr' library" >&5 +$as_echo_n "checking requested system \`mpfr' library... " >&6; } + CPPFLAGS="$MPFR_INCLUDES $CPPFLAGS" + LIBS="$MPFR_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <mpfr.h> +int +main () +{ +const char *s = mpfr_get_version(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + syslib_used=yes kpse_res=ok +else + syslib_status=no kpse_res=failed +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 +$as_echo "$kpse_res" >&6; } +fi + ## libs/poppler/ac/poppler.ac: configure.ac fragment for the TeX Live subdirectory libs/poppler/ ## basic check of system poppler ac_ext=cpp @@ -21793,7 +21974,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 2014-04-01, which was +This file was extended by TeX Live $as_me 2014-06-16, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21850,7 +22031,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 2014-04-01 +TeX Live config.status 2014-06-16 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -23887,11 +24068,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 (2014$with_banner_add): +** Configuration summary for $PACKAGE_STRING (2015/dev$with_banner_add): $msg_compiling" >&5 $as_echo " -** Configuration summary for $PACKAGE_STRING (2014$with_banner_add): +** Configuration summary for $PACKAGE_STRING (2015/dev$with_banner_add): $msg_compiling" >&6; } case $kpse_src$kpse_bld in |