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.ac | |
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.ac')
-rw-r--r-- | Build/source/utils/asymptote/configure.ac | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/Build/source/utils/asymptote/configure.ac b/Build/source/utils/asymptote/configure.ac index e438112730e..1930886e361 100644 --- a/Build/source/utils/asymptote/configure.ac +++ b/Build/source/utils/asymptote/configure.ac @@ -3,7 +3,7 @@ # this file. AC_PREREQ(2) -AC_INIT([Asymptote],[2.16],[http://sourceforge.net/projects/asymptote]) +AC_INIT([Asymptote],[2.21],[http://sourceforge.net/projects/asymptote]) VERSION=$PACKAGE_VERSION AC_SUBST(VERSION) m4_include([ax_pthread.m4]) @@ -118,7 +118,7 @@ fi AC_CHECK_HEADER(tr1/unordered_map,, [AC_CHECK_HEADER(ext/hash_map,,OPTIONS=$OPTIONS"-DNOHASH ")]) -GCVERSION=gc-7.2b +GCVERSION=gc-7.2d AC_CHECK_FILE($GCVERSION.tar.gz, ac_cv_use_gc=$GCVERSION, @@ -242,7 +242,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #ifndef RL_READLINE_VERSION abort #endif -])],AC_CHECK_LIB([readline], [rl_completion_matches],, +])],AC_CHECK_LIB([readline], [history_list],, AC_MSG_NOTICE(*** Could not find GNU readline 4.3 or later: will compile without readline support ***))) fi @@ -283,22 +283,16 @@ AC_ARG_ENABLE(gl, [AS_HELP_STRING(--enable-gl[[[=yes]]],enable OpenGL Library)]) AC_ARG_ENABLE(offscreen, -[AS_HELP_STRING(--enable-offscreen[[[=no]]],enable offscreen rendering using OSMesa library)]) - -# First check if GL is enabled. If so, then: -# onscreen rendering requires GL, glut, and GLU libraries -# offscreen rendering require OSMesa and GLU libraries +[AS_HELP_STRING(--enable-offscreen[[[=yes]]],enable offscreen rendering using OSMesa library)]) if test "x$enable_gl" != "xno"; then case "$OSTYPE" in msdos) - if test "x$enable_offscreen" != "xyes"; then - AC_CHECK_HEADER(GL/gl.h, + AC_CHECK_HEADER(GL/gl.h, [AC_DEFINE(HAVE_LIBGL, 1, [Define if you have the `opengl32' library (-lopengl32).]) LIBS=$LIBS"-lopengl32 "], AC_MSG_NOTICE([*** Could not find libopengl32: will compile without OpenGL support ***])) - fi AC_CHECK_LIB([GLU], [gluNewNurbsRenderer],[AC_DEFINE(HAVE_LIBGLU, 1, [Define to 1 if you have the `glu32' library (-lglu32).]) LIBS=$LIBS"-lglu32 "], AC_MSG_NOTICE([*** Could not find libglu32: will compile without OpenGL support ***])) @@ -309,11 +303,9 @@ case "$OSTYPE" in AC_MSG_NOTICE([*** Could not find libfreeglut: will compile without GLUT support ***])) ;; darwin*) - if test "x$enable_offscreen" != "xyes"; then - AC_CHECK_HEADER(OpenGL/gl.h, - [AC_DEFINE(HAVE_LIBGL, 1, - [Define if you have the `OpenGL' library.])]) - fi + AC_CHECK_HEADER(OpenGL/gl.h, + [AC_DEFINE(HAVE_LIBGL, 1, + [Define if you have the `OpenGL' library.])]) AC_CHECK_HEADER(OpenGL/glu.h, [AC_DEFINE(HAVE_LIBGLU, 1, [Define if you have the `GLU' library.])]) @@ -332,16 +324,19 @@ void f(void) { LIBS=$LIBS"-framework GLUT -framework OpenGL -framework Cocoa"], AC_MSG_NOTICE([*** Could not find glut: will compile without GLUT support ***])) ;; - *) if test "x$enable_offscreen" != "xyes"; then - AC_CHECK_LIB([GL], [glDepthMask]) - fi + *) AC_CHECK_LIB([GL], [glDepthMask]) AC_CHECK_LIB([GLU], [gluNewNurbsRenderer],, AC_MSG_NOTICE([*** Could not find libGLU: will compile without OpenGL support ***])) AC_CHECK_LIB([glut], [glutMainLoop],, AC_MSG_NOTICE([*** Could not find libglut: will compile without GLUT support ***])) esac - if test "x$enable_offscreen" == "xyes"; then - AC_CHECK_LIB([OSMesa],OSMesaCreateContext,, + if test "x$enable_offscreen" != "xno"; then + AC_CHECK_LIB([OSMesa],OSMesaCreateContext, + AC_CHECK_LIB([glapi],_glapi_get_context, + [AC_DEFINE(HAVE_LIBOSMESA, 1, + [Define if you have the `OSMesa' library (-lOSMesa).]) + LIBS=$LIBS"-lOSMesa -lglapi"], + AC_MSG_NOTICE([*** Could not find libglapi: will compile without offscreen rendering support ***])), AC_MSG_NOTICE([*** Could not find libOSMesa: will compile without offscreen rendering support ***])) fi fi |