From 7f9f7dad00ea5f025578c491005835740f9ffd90 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 6 Oct 2019 17:17:34 +0000 Subject: asy 2.56 sources git-svn-id: svn://tug.org/texlive/trunk@52300 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/asymptote/configure | 133 +++++++++++++++++++++------------ 1 file changed, 87 insertions(+), 46 deletions(-) (limited to 'Build/source/utils/asymptote/configure') diff --git a/Build/source/utils/asymptote/configure b/Build/source/utils/asymptote/configure index e438e540a72..f97b2fdf74b 100755 --- a/Build/source/utils/asymptote/configure +++ b/Build/source/utils/asymptote/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Asymptote 2.52. +# Generated by GNU Autoconf 2.69 for Asymptote 2.56. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Asymptote' PACKAGE_TARNAME='asymptote' -PACKAGE_VERSION='2.52' -PACKAGE_STRING='Asymptote 2.52' +PACKAGE_VERSION='2.56' +PACKAGE_STRING='Asymptote 2.56' PACKAGE_BUGREPORT='http://sourceforge.net/projects/asymptote' PACKAGE_URL='' @@ -728,6 +728,7 @@ enable_fftw enable_gsl enable_gl enable_offscreen +enable_OpenImageIO ' ac_precious_vars='build_alias host_alias @@ -1284,7 +1285,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 Asymptote 2.52 to adapt to many kinds of systems. +\`configure' configures Asymptote 2.56 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1349,7 +1350,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Asymptote 2.52:";; + short | recursive ) echo "Configuration of Asymptote 2.56:";; esac cat <<\_ACEOF @@ -1371,6 +1372,8 @@ Optional Features: --enable-gl[=yes] enable OpenGL Library --enable-offscreen[=no] enable experimental offscreen rendering using OSMesa library + --enable-openimageio[=no] + enable experimental OpenImageIO Library Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1464,7 +1467,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Asymptote configure 2.52 +Asymptote configure 2.56 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2050,7 +2053,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 Asymptote $as_me 2.52, which was +It was created by Asymptote $as_me 2.56, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -5816,17 +5819,36 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_fn_cxx_check_header_mongrel "$LINENO" "unordered_map" "ac_cv_header_unordered_map" "$ac_includes_default" -if test "x$ac_cv_header_unordered_map" = xyes; then : +ac_fn_cxx_check_header_mongrel "$LINENO" "tr1/unordered_map" "ac_cv_header_tr1_unordered_map" "$ac_includes_default" +if test "x$ac_cv_header_tr1_unordered_map" = xyes; then : -$as_echo "#define HAVE_UNORDERED_MAP 1" >>confdefs.h +fi -else - ac_fn_cxx_check_header_mongrel "$LINENO" "tr1/unordered_map" "ac_cv_header_tr1_unordered_map" "$ac_includes_default" -if test "x$ac_cv_header_tr1_unordered_map" = xyes; then : + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + std::tr1::unordered_map map; + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : $as_echo "#define HAVE_TR1_UNORDERED_MAP 1" >>confdefs.h +else + + ac_fn_cxx_check_header_mongrel "$LINENO" "unordered_map" "ac_cv_header_unordered_map" "$ac_includes_default" +if test "x$ac_cv_header_unordered_map" = xyes; then : + +$as_echo "#define HAVE_UNORDERED_MAP 1" >>confdefs.h + else ac_fn_cxx_check_header_mongrel "$LINENO" "ext/hash_map" "ac_cv_header_ext_hash_map" "$ac_includes_default" if test "x$ac_cv_header_ext_hash_map" = xyes; then : @@ -5840,8 +5862,7 @@ fi fi - - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext GCVERSION=8.0.4 ATOMICVERSION=7.6.10 @@ -6008,8 +6029,8 @@ fi INCL=$INCL" -I/usr/include/tirpc" -if test "$OSTYPE" = "msdos"; then -CPPFLAGS=$CPPFLAGS" -D__MSDOS__ -DCALLBACK=__stdcall $INCL" +if test "$OSTYPE" = "cygwin"; then +CPPFLAGS=$CPPFLAGS" -D__MSDOS__ -I/usr/include/w32api -I/usr/include -DCALLBACK=__stdcall $INCL" else CPPFLAGS=$CPPFLAGS" $INCL" fi @@ -6034,13 +6055,12 @@ fi # Checks for libraries. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gamma in -lm" >&5 -$as_echo_n "checking for gamma in -lm... " >&6; } -if ${ac_cv_lib_m_gamma+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing lgamma" >&5 +$as_echo_n "checking for library containing lgamma... " >&6; } +if ${ac_cv_search_lgamma+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6050,32 +6070,44 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char gamma (); +char lgamma (); int main () { -return gamma (); +return lgamma (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_m_gamma=yes -else - ac_cv_lib_m_gamma=no +for ac_lib in '' m c; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_search_lgamma=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + conftest$ac_exeext + if ${ac_cv_search_lgamma+:} false; then : + break fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_gamma" >&5 -$as_echo "$ac_cv_lib_m_gamma" >&6; } -if test "x$ac_cv_lib_m_gamma" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -_ACEOF +done +if ${ac_cv_search_lgamma+:} false; then : - LIBS="-lm $LIBS" +else + ac_cv_search_lgamma=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_lgamma" >&5 +$as_echo "$ac_cv_search_lgamma" >&6; } +ac_res=$ac_cv_search_lgamma +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" else as_fn_error $? "*** Please install libm on your system ***" "$LINENO" 5 @@ -7472,18 +7504,25 @@ if test "${enable_offscreen+set}" = set; then : fi -if test "x$enable_gl" != "xno"; then +# Check whether --enable-OpenImageIO was given. +if test "${enable_OpenImageIO+set}" = set; then : + enableval=$enable_OpenImageIO; +fi + + ac_fn_cxx_check_header_mongrel "$LINENO" "glm/glm.hpp" "ac_cv_header_glm_glm_hpp" "$ac_includes_default" if test "x$ac_cv_header_glm_glm_hpp" = xyes; then : $as_echo "#define HAVE_LIBGLM 1" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find glm header files: will compile without OpenGL support ***" >&5 -$as_echo "$as_me: *** Could not find glm header files: will compile without OpenGL support ***" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find glm header files: will compile without WebGL or OpenGL support ***" >&5 +$as_echo "$as_me: *** Could not find glm header files: will compile without WebGL or OpenGL support ***" >&6;} fi + +if test "x$enable_gl" != "xno"; then for ac_header in ncurses/curses.h ncurses.h curses.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -7497,6 +7536,7 @@ fi done +if test "x$enable_openimageio" = "xyes"; then ac_fn_cxx_check_header_mongrel "$LINENO" "OpenEXR/ImathVec.h" "ac_cv_header_OpenEXR_ImathVec_h" "$ac_includes_default" if test "x$ac_cv_header_OpenEXR_ImathVec_h" = xyes; then : ac_fn_cxx_check_header_mongrel "$LINENO" "OpenImageIO/imageio.h" "ac_cv_header_OpenImageIO_imageio_h" "$ac_includes_default" @@ -7552,9 +7592,10 @@ fi fi +fi case "$OSTYPE" in - msdos) + cygwin) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_throw_bad_alloc in -lgccpp" >&5 $as_echo_n "checking for GC_throw_bad_alloc in -lgccpp... " >&6; } if ${ac_cv_lib_gccpp_GC_throw_bad_alloc+:} false; then : @@ -7782,8 +7823,8 @@ _ACEOF LIBS="-lglut $LIBS" else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libglut: will compile without GLUT support ***" >&5 -$as_echo "$as_me: *** Could not find libglut: will compile without GLUT support ***" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libglut: will compile without OpenGL support ***" >&5 +$as_echo "$as_me: *** Could not find libglut: will compile without OpenGL support ***" >&6;} fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glDepthMask in -lGL" >&5 @@ -8311,7 +8352,7 @@ $as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h fi -for ac_func in dup2 floor memset pow sqrt strchr tgamma memrchr +for ac_func in dup2 floor memset strchr tgamma lgamma memrchr do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -9007,7 +9048,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 Asymptote $as_me 2.52, which was +This file was extended by Asymptote $as_me 2.56, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9069,7 +9110,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="\\ -Asymptote config.status 2.52 +Asymptote config.status 2.56 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -- cgit v1.2.3