summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/configure
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-06-18 12:05:20 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-06-18 12:05:20 +0000
commit1c0abb83d537ef1e3b95ebd92c646a5d70793d93 (patch)
tree2160b7be9a4d3b5facf852176410dd70b43a0a99 /Build/source/texk/web2c/configure
parent862f90359ce158a261692c35129db2e48ebdeaa6 (diff)
texk/web2c: Better handling of native subdirectory web2c/web2c
Add gmp and mpfr libraries in preparation for Metapost 2.0 git-svn-id: svn://tug.org/texlive/trunk@34290 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/configure')
-rwxr-xr-xBuild/source/texk/web2c/configure157
1 files changed, 121 insertions, 36 deletions
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 2350513a978..70cf8f8a2d6 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/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 2014.
+# Generated by GNU Autoconf 2.69 for Web2C 2015/dev.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Web2C'
PACKAGE_TARNAME='web2c'
-PACKAGE_VERSION='2014'
-PACKAGE_STRING='Web2C 2014'
+PACKAGE_VERSION='2015/dev'
+PACKAGE_STRING='Web2C 2015/dev'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -673,6 +673,14 @@ POPPLER_RULE
POPPLER_DEPEND
POPPLER_LIBS
POPPLER_INCLUDES
+MPFR_RULE
+MPFR_DEPEND
+MPFR_LIBS
+MPFR_INCLUDES
+GMP_RULE
+GMP_DEPEND
+GMP_LIBS
+GMP_INCLUDES
CAIRO_RULE
CAIRO_DEPEND
CAIRO_LIBS
@@ -1007,6 +1015,12 @@ with_system_libpng
with_system_freetype2
with_system_pixman
with_system_cairo
+with_system_gmp
+with_gmp_includes
+with_gmp_libdir
+with_system_mpfr
+with_mpfr_includes
+with_mpfr_libdir
with_system_poppler
with_system_xpdf
with_system_zziplib
@@ -1575,7 +1589,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 2014 to adapt to many kinds of systems.
+\`configure' configures Web2C 2015/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1649,7 +1663,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Web2C 2014:";;
+ short | recursive ) echo "Configuration of Web2C 2015/dev:";;
esac
cat <<\_ACEOF
@@ -1756,6 +1770,13 @@ Optional Packages:
pkg-config)
--with-system-cairo use installed cairo headers and library (requires
pkg-config)
+ --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-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-poppler use installed poppler headers and library (requires
pkg-config)
--with-system-xpdf use installed poppler headers and library instead of
@@ -1862,7 +1883,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Web2C configure 2014
+Web2C configure 2015/dev
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2951,7 +2972,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 Web2C $as_me 2014, which was
+It was created by Web2C $as_me 2015/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3332,7 +3353,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-WEB2CVERSION=2014
+WEB2CVERSION=2015/dev
am__api_version='1.14'
@@ -8444,7 +8465,7 @@ fi
# Define the identity of the package.
PACKAGE='web2c'
- VERSION='2014'
+ VERSION='2015/dev'
cat >>confdefs.h <<_ACEOF
@@ -13743,11 +13764,6 @@ _ACEOF
fi
-if test "x$host_alias" != x && test "x$build_alias" = x; then :
- as_fn_error $? "when cross-compiling you must specify both --host and --build." "$LINENO" 5
-fi
-eval kpse_build_alias=\${build_alias-$build}
-
if test "x$cross_compiling" = xyes; then
cross_TRUE=
@@ -18403,14 +18419,6 @@ if test -z "$WIN32_TRUE"; then :
fi
-# A compilation variable for doing a TL build so we can
-# adjust the luatex banner, maybe others.
-if test "x$enable_native_texlive_build" = xyes; then :
-
-$as_echo "#define NATIVE_TEXLIVE_BUILD 1" >>confdefs.h
-
-fi
-
case $with_editor in #(
''|yes|no) :
if test "x$kpse_cv_have_win32" = xno; then :
@@ -18589,7 +18597,7 @@ fi
# and maybe -lresolv for inet_aton().
lua_socketlibs=$socketlibs
kpse_save_LIBS=$LIBS
-LUA52_DEFINES=-DLUA_COMPAT_MODULE
+LUA52_DEFINES='-DLUA_COMPAT_MODULE -DLUAI_HASHLIMIT=6'
if test "x$kpse_cv_have_win32" = xno; then
LUA52_DEFINES="$LUA52_DEFINES -DLUA_USE_POSIX"
@@ -18660,7 +18668,7 @@ fi
fi
fi
-LUAJIT_DEFINES=-DLUAJIT_ENABLE_LUA52COMPAT
+LUAJIT_DEFINES='-DLUAJIT_ENABLE_LUA52COMPAT -DLUAI_HASHLIMIT=6'
case $host_os:$host_cpu in #(
*darwin*:x86_64) :
@@ -21684,7 +21692,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-Web2C config.lt 2014
+Web2C config.lt 2015/dev
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -23321,6 +23329,76 @@ ${top_builddir}/../../libs/cairo/cairo/cairo.h:
cd ${top_builddir}/../../libs/cairo && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
+## _KPSE_LIB_FLAGS: Setup gmp (-lgmp) flags
+
+# 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" = xyes; then
+ 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
+else
+ GMP_INCLUDES="-I$kpse_BLD/libs/gmp/include"
+ GMP_LIBS="$kpse_BLD/libs/gmp/libgmp.a"
+ GMP_DEPEND='${top_builddir}/../../libs/gmp/libgmp.a'
+ GMP_RULE='# Rebuild libgmp
+$(GMP_DEPEND): ${top_builddir}/../../libs/gmp/include/gmp.h
+ cd ${top_builddir}/../../libs/gmp && $(MAKE) $(AM_MAKEFLAGS) rebuild
+${top_builddir}/../../libs/gmp/include/gmp.h:
+ cd ${top_builddir}/../../libs/gmp && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+fi
+
+## _KPSE_LIB_FLAGS: Setup mpfr (-lmpfr) flags
+
+# 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" = xyes; then
+ 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
+else
+ MPFR_INCLUDES="-I$kpse_BLD/libs/mpfr/include"
+ MPFR_LIBS="$kpse_BLD/libs/mpfr/libmpfr.a"
+ MPFR_DEPEND='${top_builddir}/../../libs/mpfr/libmpfr.a'
+ MPFR_RULE='# Rebuild libmpfr
+$(MPFR_DEPEND): ${top_builddir}/../../libs/mpfr/include/mpfr.h
+ cd ${top_builddir}/../../libs/mpfr && $(MAKE) $(AM_MAKEFLAGS) rebuild
+${top_builddir}/../../libs/mpfr/include/mpfr.h:
+ cd ${top_builddir}/../../libs/mpfr && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+fi
+
## _KPSE_LIB_FLAGS: Setup poppler (-lpoppler) flags
# Check whether --with-system-poppler was given.
@@ -24014,11 +24092,6 @@ $as_echo "$tool_ok" >&6; }
fi
fi
-
-
-subdirs="$subdirs web2c"
-
-
ac_config_files="$ac_config_files Makefile doc/Makefile lib/Makefile man/Makefile omegafonts/Makefile otps/Makefile otps/win32/Makefile window/Makefile"
ac_config_files="$ac_config_files web2c-sh"
@@ -24030,6 +24103,16 @@ ac_config_files="$ac_config_files ctangleboot-sh"
ac_config_files="$ac_config_files silent-sh"
+if test "x$host_alias" != x && test "x$build_alias" = x; then :
+ as_fn_error $? "when cross-compiling you must specify both --host and --build." "$LINENO" 5
+fi
+eval kpse_build_alias=\${build_alias-$build}
+
+
+
+subdirs="$subdirs web2c"
+
+
cat >confcache <<\_ACEOF
@@ -24715,7 +24798,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 $as_me 2014, which was
+This file was extended by Web2C $as_me 2015/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24785,7 +24868,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 config.status 2014
+Web2C config.status 2015/dev
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -26863,10 +26946,12 @@ test $ac_write_fail = 0 ||
as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
if test "x$cross_compiling" = xyes; then :
- cache_file=/dev/null
- ac_configure_args="$ac_configure_args --host='$kpse_build_alias' \
- CC='$BUILDCC' CPPFLAGS='$BUILDCPPFLAGS'\
- CFLAGS='$BUILDCFLAGS' LDFLAGS='$BUILDLDFLAGS'"
+ if test "x$cache_file" != x/dev/null; then :
+ cache_file=config.cache
+fi
+ac_configure_args="$ac_configure_args --host='$kpse_build_alias' \
+CC='$BUILDCC' CFLAGS='$BUILDCFLAGS' \
+CPPFLAGS='$BUILDCPPFLAGS' LDFLAGS='$BUILDLDFLAGS'"
fi
# configure is writing to config.log, and then calls config.status.