From 9121faed0cf54a08882acf41120cf28fc3a32998 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 27 Mar 2019 22:27:57 +0000 Subject: asy 2.48 sources git-svn-id: svn://tug.org/texlive/trunk@50622 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/asymptote/configure | 244 ++++++++++++--------------------- 1 file changed, 86 insertions(+), 158 deletions(-) (limited to 'Build/source/utils/asymptote/configure') diff --git a/Build/source/utils/asymptote/configure b/Build/source/utils/asymptote/configure index dd96c036f7b..ceafb9ada4c 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.47. +# Generated by GNU Autoconf 2.69 for Asymptote 2.48. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Asymptote' PACKAGE_TARNAME='asymptote' -PACKAGE_VERSION='2.47' -PACKAGE_STRING='Asymptote 2.47' +PACKAGE_VERSION='2.48' +PACKAGE_STRING='Asymptote 2.48' PACKAGE_BUGREPORT='http://sourceforge.net/projects/asymptote' PACKAGE_URL='' @@ -1283,7 +1283,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.47 to adapt to many kinds of systems. +\`configure' configures Asymptote 2.48 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1348,7 +1348,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Asymptote 2.47:";; + short | recursive ) echo "Configuration of Asymptote 2.48:";; esac cat <<\_ACEOF @@ -1367,8 +1367,8 @@ Optional Features: --enable-gsl[=yes] enable GNU Scientific Library --enable-fftw[=yes] enable FFTW Library --enable-gl[=yes] enable OpenGL Library - --enable-offscreen[=yes] - enable offscreen rendering using OSMesa library + --enable-offscreen[=no] enable experimental offscreen rendering using OSMesa + library Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1462,7 +1462,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Asymptote configure 2.47 +Asymptote configure 2.48 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2048,7 +2048,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.47, which was +It was created by Asymptote $as_me 2.48, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -5837,16 +5837,8 @@ fi -case "${host_os}" in - darwin*) - GCVERSION=7.6.0 - ATOMICVERSION=7.6.0 - ;; - *) - GCVERSION=7.6.2 - ATOMICVERSION=7.6.2 - ;; -esac +GCVERSION=8.0.2 +ATOMICVERSION=7.6.8 GCFILE=gc-$GCVERSION ac_cv_use_gc="system" @@ -5885,6 +5877,7 @@ fi OPTIONS="-D_FILE_OFFSET_BITS=64 " GCLIB= GCPPLIB= +INCL="-I." GCNAME="Boehm Garbage Collector" GCOPTIONS="--disable-shared" if test "x$ac_cv_use_gc" != "xno" ; then @@ -5892,7 +5885,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then case _$ac_cv_use_gc in _|_system|_*[\\/]*) if test "x$ac_cv_use_gc" = "xsystem" ; then - INCL="-I$prefix/include/gc -I/usr/include/gc" + INCL="-I. -I$prefix/include/gc -I/usr/include/gc" LIBS=$LIBS"-L$prefix/lib " else INCL="-I$ac_cv_use_gc/include/gc" @@ -5946,7 +5939,7 @@ $as_echo "$as_me: enabling system $GCNAME" >&6;} else GCDIR=$GCFILE - INCL="-I\$(GC)/include" + INCL="-I. -I\$(GC)/include" GCLIB="\$(GC)/.libs/libgc.a" { $as_echo "$as_me:${as_lineno-$LINENO}: $GCNAME library not found" >&5 $as_echo "$as_me: $GCNAME library not found" >&6;} @@ -5955,7 +5948,7 @@ fi else GCDIR=$GCFILE GCLIB="\$(GC)/.libs/libgc.a" - INCL="-I\$(GC)/include" + INCL="-I. -I\$(GC)/include" { $as_echo "$as_me:${as_lineno-$LINENO}: $GCNAME header file not found" >&5 $as_echo "$as_me: $GCNAME header file not found" >&6;} fi @@ -5970,7 +5963,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: enabling local $GCNAME $GCDIR" >&5 $as_echo "$as_me: enabling local $GCNAME $GCDIR" >&6;} GCLIB="\$(GC)/.libs/libgc.a" - INCL="-I\$(GC)/include" + INCL="-I. -I\$(GC)/include" ;; esac else @@ -6010,7 +6003,7 @@ fi INCL=$INCL" -I/usr/include/tirpc" if test "$OSTYPE" = "msdos"; then -CPPFLAGS=$CPPFLAGS" -D__MSDOS__ $INCL" +CPPFLAGS=$CPPFLAGS" -D__MSDOS__ -DCALLBACK=__stdcall $INCL" else CPPFLAGS=$CPPFLAGS" $INCL" fi @@ -7108,89 +7101,65 @@ fi if test "x$enable_gl" != "xno"; then case "$OSTYPE" in msdos) - ac_fn_cxx_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" -if test "x$ac_cv_header_GL_gl_h" = xyes; then : + 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_LIBGL 1" >>confdefs.h +$as_echo "#define HAVE_LIBGLM 1" >>confdefs.h - LIBS=$LIBS"-lopengl32 " -else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libopengl32: will compile without OpenGL support ***" >&5 -$as_echo "$as_me: *** Could not find libopengl32: will compile without OpenGL support ***" >&6;} fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluNewNurbsRenderer in -lGLU" >&5 -$as_echo_n "checking for gluNewNurbsRenderer in -lGLU... " >&6; } -if ${ac_cv_lib_GLU_gluNewNurbsRenderer+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lGLU $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default" +if test "x$ac_cv_header_GL_glut_h" = xyes; then : -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gluNewNurbsRenderer (); -int -main () -{ -return gluNewNurbsRenderer (); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_GLU_gluNewNurbsRenderer=yes +$as_echo "#define HAVE_LIBGLUT 1" >>confdefs.h + + LIBS=$LIBS"-lfreeglut " else - ac_cv_lib_GLU_gluNewNurbsRenderer=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libfreeglut: will compile without OpenGL support ***" >&5 +$as_echo "$as_me: *** Could not find libfreeglut: will compile without OpenGL support ***" >&6;} fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluNewNurbsRenderer" >&5 -$as_echo "$ac_cv_lib_GLU_gluNewNurbsRenderer" >&6; } -if test "x$ac_cv_lib_GLU_gluNewNurbsRenderer" = xyes; then : -$as_echo "#define HAVE_LIBGLU 1" >>confdefs.h - LIBS=$LIBS"-lglu32 " + + ac_fn_cxx_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" +if test "x$ac_cv_header_GL_gl_h" = xyes; then : + +$as_echo "#define HAVE_LIBGL 1" >>confdefs.h + + LIBS=$LIBS"-lopengl32 " else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libglu32: will compile without OpenGL support ***" >&5 -$as_echo "$as_me: *** Could not find libglu32: will compile without OpenGL support ***" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libopengl32: will compile without OpenGL support ***" >&5 +$as_echo "$as_me: *** Could not find libopengl32: will compile without OpenGL support ***" >&6;} fi - ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default" -if test "x$ac_cv_header_GL_glut_h" = xyes; then : -$as_echo "#define HAVE_LIBGLUT 1" >>confdefs.h + ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glew.h" "ac_cv_header_GL_glew_h" "$ac_includes_default" +if test "x$ac_cv_header_GL_glew_h" = xyes; then : - LIBS=$LIBS"-lfreeglut " +$as_echo "#define HAVE_LIBGLEW 1" >>confdefs.h + + LIBS="-lGLEW "$LIBS else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libfreeglut: will compile without GLUT support ***" >&5 -$as_echo "$as_me: *** Could not find libfreeglut: will compile without GLUT support ***" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libGLEW: will compile without OpenGL support ***" >&5 +$as_echo "$as_me: *** Could not find libGLEW: will compile without OpenGL support ***" >&6;} fi ;; darwin*) - ac_fn_cxx_check_header_mongrel "$LINENO" "OpenGL/gl.h" "ac_cv_header_OpenGL_gl_h" "$ac_includes_default" -if test "x$ac_cv_header_OpenGL_gl_h" = xyes; then : + LIBS=$LIBS"-lgccpp " + 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_LIBGL 1" >>confdefs.h +$as_echo "#define HAVE_LIBGLM 1" >>confdefs.h fi - ac_fn_cxx_check_header_mongrel "$LINENO" "OpenGL/glu.h" "ac_cv_header_OpenGL_glu_h" "$ac_includes_default" -if test "x$ac_cv_header_OpenGL_glu_h" = xyes; then : + ac_fn_cxx_check_header_mongrel "$LINENO" "OpenGL/gl.h" "ac_cv_header_OpenGL_gl_h" "$ac_includes_default" +if test "x$ac_cv_header_OpenGL_gl_h" = xyes; then : -$as_echo "#define HAVE_LIBGLU 1" >>confdefs.h +$as_echo "#define HAVE_LIBGL 1" >>confdefs.h fi @@ -7200,41 +7169,36 @@ if test "x$ac_cv_header_GLUT_glut_h" = xyes; then : $as_echo "#define HAVE_LIBGLUT 1" >>confdefs.h -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -#ifndef GLU_TESS_CALLBACK_TRIPLEDOT -typedef GLvoid (* _GLUfuncptr)(...); -void f(void) { - gluNurbsCallback(gluNewNurbsRenderer(),GLU_NURBS_BEGIN,(_GLUfuncptr) glBegin); -} -#endif + LIBS=$LIBS"-framework GLUT -framework OpenGL -framework Cocoa " +else + { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find glut: will compile without OpenGLLUT support ***" >&5 +$as_echo "$as_me: *** Could not find glut: will compile without OpenGLLUT support ***" >&6;} +fi -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : + ac_fn_cxx_check_header_mongrel "$LINENO" "OpenGL/glew.h" "ac_cv_header_OpenGL_glew_h" "$ac_includes_default" +if test "x$ac_cv_header_OpenGL_glew_h" = xyes; then : -$as_echo "#define GLU_TESS_CALLBACK_TRIPLEDOT 1" >>confdefs.h +$as_echo "#define HAVE_LIBGLEW 1" >>confdefs.h -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - LIBS=$LIBS"-framework GLUT -framework OpenGL -framework Cocoa" + LIBS="-lGLEW "$LIBS else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find glut: will compile without GLUT support ***" >&5 -$as_echo "$as_me: *** Could not find glut: will compile without GLUT support ***" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libGLEW: will compile without OpenGL support ***" >&5 +$as_echo "$as_me: *** Could not find libGLEW: will compile without OpenGL support ***" >&6;} fi ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glDepthMask in -lGL" >&5 + *) + 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 + +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glDepthMask in -lGL" >&5 $as_echo_n "checking for glDepthMask in -lGL... " >&6; } if ${ac_cv_lib_GL_glDepthMask+:} false; then : $as_echo_n "(cached) " >&6 @@ -7277,54 +7241,6 @@ _ACEOF LIBS="-lGL $LIBS" -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluNewNurbsRenderer in -lGLU" >&5 -$as_echo_n "checking for gluNewNurbsRenderer in -lGLU... " >&6; } -if ${ac_cv_lib_GLU_gluNewNurbsRenderer+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lGLU $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gluNewNurbsRenderer (); -int -main () -{ -return gluNewNurbsRenderer (); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_GLU_gluNewNurbsRenderer=yes -else - ac_cv_lib_GLU_gluNewNurbsRenderer=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluNewNurbsRenderer" >&5 -$as_echo "$ac_cv_lib_GLU_gluNewNurbsRenderer" >&6; } -if test "x$ac_cv_lib_GLU_gluNewNurbsRenderer" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLU 1 -_ACEOF - - LIBS="-lGLU $LIBS" - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libGLU: will compile without OpenGL support ***" >&5 -$as_echo "$as_me: *** Could not find libGLU: will compile without OpenGL support ***" >&6;} fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glutMainLoop in -lglut" >&5 @@ -7375,8 +7291,20 @@ else $as_echo "$as_me: *** Could not find libglut: will compile without GLUT support ***" >&6;} fi + ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glew.h" "ac_cv_header_GL_glew_h" "$ac_includes_default" +if test "x$ac_cv_header_GL_glew_h" = xyes; then : + +$as_echo "#define HAVE_LIBGLEW 1" >>confdefs.h + + LIBS="-lGLEW "$LIBS +else + { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libGLEW: will compile without OpenGL support ***" >&5 +$as_echo "$as_me: *** Could not find libGLEW: will compile without OpenGL support ***" >&6;} +fi + + esac - if test "x$enable_offscreen" != "xno"; then + if test "x$enable_offscreen" == "xyes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSMesaCreateContext in -lOSMesa" >&5 $as_echo_n "checking for OSMesaCreateContext in -lOSMesa... " >&6; } if ${ac_cv_lib_OSMesa_OSMesaCreateContext+:} false; then : @@ -8550,7 +8478,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.47, which was +This file was extended by Asymptote $as_me 2.48, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8612,7 +8540,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.47 +Asymptote config.status 2.48 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -- cgit v1.2.3