diff options
author | Karl Berry <karl@freefriends.org> | 2013-04-02 23:03:22 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-04-02 23:03:22 +0000 |
commit | 324efbd652f973cd70f42fe08c665c518995bcbe (patch) | |
tree | 818ae382dfa133f3dcceec8e12e4cbd42be8bcf4 /Build/source/utils/asymptote/configure | |
parent | bbf699abe485e707133ff3ba502119f261f27269 (diff) |
asy 2.21 sources (no runtime update)
git-svn-id: svn://tug.org/texlive/trunk@29618 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/asymptote/configure')
-rwxr-xr-x | Build/source/utils/asymptote/configure | 107 |
1 files changed, 69 insertions, 38 deletions
diff --git a/Build/source/utils/asymptote/configure b/Build/source/utils/asymptote/configure index a7d6ebe3bac..af719ea6d63 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.68 for Asymptote 2.16. +# Generated by GNU Autoconf 2.68 for Asymptote 2.21. # # Report bugs to <http://sourceforge.net/projects/asymptote>. # @@ -560,8 +560,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Asymptote' PACKAGE_TARNAME='asymptote' -PACKAGE_VERSION='2.16' -PACKAGE_STRING='Asymptote 2.16' +PACKAGE_VERSION='2.21' +PACKAGE_STRING='Asymptote 2.21' PACKAGE_BUGREPORT='http://sourceforge.net/projects/asymptote' PACKAGE_URL='' @@ -1263,7 +1263,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.16 to adapt to many kinds of systems. +\`configure' configures Asymptote 2.21 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1328,7 +1328,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Asymptote 2.16:";; + short | recursive ) echo "Configuration of Asymptote 2.21:";; esac cat <<\_ACEOF @@ -1346,7 +1346,8 @@ Optional Features: --enable-gsl[=yes] enable GNU Scientific Library --enable-fftw[=yes] enable FFTW Library --enable-gl[=yes] enable OpenGL Library - --enable-offscreen[=no] enable offscreen rendering using OSMesa library + --enable-offscreen[=yes] + enable offscreen rendering using OSMesa library Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1440,7 +1441,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Asymptote configure 2.16 +Asymptote configure 2.21 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2026,7 +2027,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.16, which was +It was created by Asymptote $as_me 2.21, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -5732,7 +5733,7 @@ fi -GCVERSION=gc-7.2b +GCVERSION=gc-7.2d as_ac_File=`$as_echo "ac_cv_file_$GCVERSION.tar.gz" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $GCVERSION.tar.gz" >&5 @@ -6683,9 +6684,9 @@ abort } _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5 -$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; } -if ${ac_cv_lib_readline_rl_completion_matches+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for history_list in -lreadline" >&5 +$as_echo_n "checking for history_list in -lreadline... " >&6; } +if ${ac_cv_lib_readline_history_list+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -6699,27 +6700,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char rl_completion_matches (); +char history_list (); int main () { -return rl_completion_matches (); +return history_list (); ; return 0; } _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_readline_rl_completion_matches=yes + ac_cv_lib_readline_history_list=yes else - ac_cv_lib_readline_rl_completion_matches=no + ac_cv_lib_readline_history_list=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_readline_rl_completion_matches" >&5 -$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; } -if test "x$ac_cv_lib_readline_rl_completion_matches" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_history_list" >&5 +$as_echo "$ac_cv_lib_readline_history_list" >&6; } +if test "x$ac_cv_lib_readline_history_list" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBREADLINE 1 _ACEOF @@ -7032,15 +7033,10 @@ if test "${enable_offscreen+set}" = set; then : fi -# First check if GL is enabled. If so, then: -# onscreen rendering requires GL, glut, and GLU libraries -# offscreen rendering require OSMesa and GLU libraries - if test "x$enable_gl" != "xno"; then case "$OSTYPE" in msdos) - if test "x$enable_offscreen" != "xyes"; then - ac_fn_cxx_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" + 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 @@ -7052,7 +7048,6 @@ $as_echo "$as_me: *** Could not find libopengl32: will compile without OpenGL su fi - 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 : @@ -7112,8 +7107,7 @@ fi ;; darwin*) - if test "x$enable_offscreen" != "xyes"; then - ac_fn_cxx_check_header_mongrel "$LINENO" "OpenGL/gl.h" "ac_cv_header_OpenGL_gl_h" "$ac_includes_default" + 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_LIBGL 1" >>confdefs.h @@ -7121,7 +7115,6 @@ $as_echo "#define HAVE_LIBGL 1" >>confdefs.h fi - 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 : @@ -7169,8 +7162,7 @@ fi ;; - *) if test "x$enable_offscreen" != "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glDepthMask in -lGL" >&5 + *) { $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 @@ -7215,7 +7207,6 @@ _ACEOF fi - 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 : @@ -7313,7 +7304,7 @@ $as_echo "$as_me: *** Could not find libglut: will compile without GLUT support fi esac - if test "x$enable_offscreen" == "xyes"; then + if test "x$enable_offscreen" != "xno"; 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 : @@ -7351,11 +7342,51 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_OSMesa_OSMesaCreateContext" >&5 $as_echo "$ac_cv_lib_OSMesa_OSMesaCreateContext" >&6; } if test "x$ac_cv_lib_OSMesa_OSMesaCreateContext" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBOSMESA 1 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _glapi_get_context in -lglapi" >&5 +$as_echo_n "checking for _glapi_get_context in -lglapi... " >&6; } +if ${ac_cv_lib_glapi__glapi_get_context+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lglapi $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 _glapi_get_context (); +int +main () +{ +return _glapi_get_context (); + ; + return 0; +} _ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_glapi__glapi_get_context=yes +else + ac_cv_lib_glapi__glapi_get_context=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_glapi__glapi_get_context" >&5 +$as_echo "$ac_cv_lib_glapi__glapi_get_context" >&6; } +if test "x$ac_cv_lib_glapi__glapi_get_context" = xyes; then : - LIBS="-lOSMesa $LIBS" +$as_echo "#define HAVE_LIBOSMESA 1" >>confdefs.h + + LIBS=$LIBS"-lOSMesa -lglapi" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libglapi: will compile without offscreen rendering support ***" >&5 +$as_echo "$as_me: *** Could not find libglapi: will compile without offscreen rendering support ***" >&6;} +fi else { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libOSMesa: will compile without offscreen rendering support ***" >&5 @@ -8498,7 +8529,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.16, which was +This file was extended by Asymptote $as_me 2.21, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8560,7 +8591,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.16 +Asymptote config.status 2.21 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" |