diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-06-18 11:56:23 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-06-18 11:56:23 +0000 |
commit | 081d7946faa61fc306f13b99d8e6af921d1af111 (patch) | |
tree | f2febc9b4dd87f26e62fdad37390e7e1d49ddb1b /Build/source/texk/configure | |
parent | 508bffe4408ab137d9057b15075c94e1578b619d (diff) |
texk/*/: Drop the obsolete ACLOCAL_AMFLAGS
git-svn-id: svn://tug.org/texlive/trunk@34287 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/configure')
-rwxr-xr-x | Build/source/texk/configure | 107 |
1 files changed, 97 insertions, 10 deletions
diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 9f99ce0727c..a8349f4ccd0 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/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 texk 2014. +# Generated by GNU Autoconf 2.69 for TeX Live texk 2015/dev. # # Report bugs to <peb@mppmu.mpg.de>. # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='TeX Live texk' PACKAGE_TARNAME='tex-live-texk' -PACKAGE_VERSION='2014' -PACKAGE_STRING='TeX Live texk 2014' +PACKAGE_VERSION='2015/dev' +PACKAGE_STRING='TeX Live texk 2015/dev' PACKAGE_BUGREPORT='peb@mppmu.mpg.de' PACKAGE_URL='' @@ -811,6 +811,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 @@ -1422,7 +1428,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 texk 2014 to adapt to many kinds of systems. +\`configure' configures TeX Live texk 2015/dev to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1492,7 +1498,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of TeX Live texk 2014:";; + short | recursive ) echo "Configuration of TeX Live texk 2015/dev:";; esac cat <<\_ACEOF @@ -1673,6 +1679,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 @@ -1784,7 +1797,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -TeX Live texk configure 2014 +TeX Live texk configure 2015/dev generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1885,7 +1898,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 texk $as_me 2014, which was +It was created by TeX Live texk $as_me 2015/dev, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4965,6 +4978,80 @@ 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'" +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'" +fi + ## libs/cairo/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/cairo/ ## configure options and TL libraries required for cairo @@ -5908,7 +5995,7 @@ fi # Define the identity of the package. PACKAGE='tex-live-texk' - VERSION='2014' + VERSION='2015/dev' cat >>confdefs.h <<_ACEOF @@ -7061,7 +7148,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 texk $as_me 2014, which was +This file was extended by TeX Live texk $as_me 2015/dev, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7118,7 +7205,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 texk config.status 2014 +TeX Live texk config.status 2015/dev configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" |