diff options
Diffstat (limited to 'Build/source/utils/asymptote/configure')
-rwxr-xr-x | Build/source/utils/asymptote/configure | 98 |
1 files changed, 31 insertions, 67 deletions
diff --git a/Build/source/utils/asymptote/configure b/Build/source/utils/asymptote/configure index 9a95356caa3..fa56ba5da44 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.23. +# Generated by GNU Autoconf 2.69 for Asymptote 2.25. # # Report bugs to <http://sourceforge.net/projects/asymptote>. # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Asymptote' PACKAGE_TARNAME='asymptote' -PACKAGE_VERSION='2.23' -PACKAGE_STRING='Asymptote 2.23' +PACKAGE_VERSION='2.25' +PACKAGE_STRING='Asymptote 2.25' PACKAGE_BUGREPORT='http://sourceforge.net/projects/asymptote' PACKAGE_URL='' @@ -641,7 +641,7 @@ INCL GCPPLIB GCLIB GCOPTIONS -GCDIR +GCVERSION getopt CXXCPP YFLAGS @@ -1281,7 +1281,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.23 to adapt to many kinds of systems. +\`configure' configures Asymptote 2.25 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1346,7 +1346,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Asymptote 2.23:";; + short | recursive ) echo "Configuration of Asymptote 2.25:";; esac cat <<\_ACEOF @@ -1459,7 +1459,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Asymptote configure 2.23 +Asymptote configure 2.25 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2045,7 +2045,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.23, which was +It was created by Asymptote $as_me 2.25, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4117,7 +4117,7 @@ fi test -n "$TEXI2DVI" && break done -test -n "$TEXI2DVI" || TEXI2DVI="echo texi2dvi is missing! Please put http://asymptote.sourceforge.net/asymptote.pdf in the doc directory and touch doc/asymptote.pdf; exit 1;" +test -n "$TEXI2DVI" || TEXI2DVI="echo texi2dvi is missing! Please put http://asymptote.sourceforge.net/asymptote.pdf in the doc directory, touch doc/asymptote.pdf, and run configure again; exit 1;" @@ -5750,17 +5750,18 @@ fi -GCVERSION=gc-7.2d +GCVERSION=7.4.0 +GCFILE=gc-$GCVERSION -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 -$as_echo_n "checking for $GCVERSION.tar.gz... " >&6; } +as_ac_File=`$as_echo "ac_cv_file_$GCFILE.tar.gz" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $GCFILE.tar.gz" >&5 +$as_echo_n "checking for $GCFILE.tar.gz... " >&6; } if eval \${$as_ac_File+:} false; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "$GCVERSION.tar.gz"; then +if test -r "$GCFILE.tar.gz"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" @@ -5772,7 +5773,7 @@ $as_echo "$ac_res" >&6; } if eval test \"x\$"$as_ac_File"\" = x"yes"; then : ac_cv_use_gc=$GCVERSION else - GC_SYSTEM="$GCVERSION.tar.gz not found: using system Boehm garbage collector" + GC_SYSTEM="$GCFILE.tar.gz not found: using system Boehm garbage collector" ac_cv_use_gc="system" fi @@ -5850,7 +5851,7 @@ if test "x$ac_cv_lib_gc_GC_malloc" = xyes; then : $as_echo "$as_me: enabling system $GCNAME" >&6;} else - GCDIR=$GCVERSION + GCDIR=$GCFILE INCL="-I\$(GC)/include" GCLIB="\$(GC)/.libs/libgc.a" { $as_echo "$as_me:${as_lineno-$LINENO}: $GCNAME library not found" >&5 @@ -5858,7 +5859,7 @@ $as_echo "$as_me: $GCNAME library not found" >&6;} fi else - GCDIR=$GCVERSION + GCDIR=$GCFILE GCLIB="\$(GC)/.libs/libgc.a" INCL="-I\$(GC)/include" { $as_echo "$as_me:${as_lineno-$LINENO}: $GCNAME header file not found" >&5 @@ -5869,7 +5870,8 @@ fi CPPFLAGS=$CPPFLAGS_SAVE ;; *) - GCDIR=$ac_cv_use_gc + GCVERSION=$ac_cv_use_gc + GCDIR=gc-$GCVERSION { $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" @@ -6113,7 +6115,7 @@ _ACEOF LIBS="-lz $LIBS" else - as_fn_error $? "*** Please install libz on your system ***" "$LINENO" 5 + as_fn_error $? "*** Please install libz or zlib-devel on your system ***" "$LINENO" 5 fi # Make sure we can run config.sub. @@ -7359,51 +7361,11 @@ 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 : - { $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; -} + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBOSMESA 1 _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 : -$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 + LIBS="-lOSMesa $LIBS" else { $as_echo "$as_me:${as_lineno-$LINENO}: *** Could not find libOSMesa: will compile without offscreen rendering support ***" >&5 @@ -8535,7 +8497,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.23, which was +This file was extended by Asymptote $as_me 2.25, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8597,7 +8559,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.23 +Asymptote config.status 2.25 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -9333,10 +9295,12 @@ if eval test \"x\$"$as_ac_File"\" = x"yes"; then : else echo - echo Please put the Boehm garbage collector tar.gz file in the current directory. - echo FOR EXAMPLE, USE THE COMMAND: + echo Please put the Boehm garbage collector tar.gz files in the current directory. + echo FOR EXAMPLE, USE THE COMMANDS: + echo + echo wget http://hboehm.info/gc/gc_source/$GCFILE.tar.gz + echo wget http://hboehm.info/gc/gc_source/libatomic_ops-$GCVERSION.tar.gz echo - echo wget http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/$GCDIR.tar.gz exit 1 fi |