summaryrefslogtreecommitdiff
path: root/Build/source/utils/asymptote/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/utils/asymptote/configure.ac')
-rw-r--r--Build/source/utils/asymptote/configure.ac37
1 files changed, 18 insertions, 19 deletions
diff --git a/Build/source/utils/asymptote/configure.ac b/Build/source/utils/asymptote/configure.ac
index 91ed875ff1d..94d3f622ff6 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.23],[http://sourceforge.net/projects/asymptote])
+AC_INIT([Asymptote],[2.25],[http://sourceforge.net/projects/asymptote])
VERSION=$PACKAGE_VERSION
AC_SUBST(VERSION)
m4_include([ax_pthread.m4])
@@ -52,7 +52,7 @@ fi
])
AC_CHECK_PROGS(TEXI2DVI,[texi2dvi texi2dvi4a2ps],
-[echo texi2dvi is missing! Please put http://asymptote.sourceforge.net/asymptote.pdf in the doc directory and touch doc/asymptote.pdf; exit 1;])
+[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;])
AC_SUBST(TEXI2DVI)
@@ -118,11 +118,12 @@ fi
AC_CHECK_HEADER(tr1/unordered_map,,
[AC_CHECK_HEADER(ext/hash_map,,OPTIONS=$OPTIONS"-DNOHASH ")])
-GCVERSION=gc-7.2d
+GCVERSION=7.4.0
+GCFILE=gc-$GCVERSION
-AC_CHECK_FILE($GCVERSION.tar.gz,
+AC_CHECK_FILE($GCFILE.tar.gz,
ac_cv_use_gc=$GCVERSION,
-[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"])
AC_ARG_ENABLE(gc,
[AS_HELP_STRING(--enable-gc[[[=system]]],
@@ -158,18 +159,19 @@ if test "x$ac_cv_use_gc" != "xno" ; then
AC_CHECK_LIB([gc],[GC_malloc],[
LIBS=$LIBS"-lgc "
AC_MSG_NOTICE([enabling system $GCNAME])],[
- GCDIR=$GCVERSION
+ GCDIR=$GCFILE
INCL="-I\$(GC)/include"
GCLIB="\$(GC)/.libs/libgc.a"
AC_MSG_NOTICE($GCNAME library not found)]),
- GCDIR=$GCVERSION
+ GCDIR=$GCFILE
GCLIB="\$(GC)/.libs/libgc.a"
INCL="-I\$(GC)/include"
AC_MSG_NOTICE($GCNAME header file not found))
CPPFLAGS=$CPPFLAGS_SAVE
;;
*)
- GCDIR=$ac_cv_use_gc
+ GCVERSION=$ac_cv_use_gc
+ GCDIR=gc-$GCVERSION
AC_MSG_NOTICE([enabling local $GCNAME $GCDIR])
GCLIB="\$(GC)/.libs/libgc.a"
INCL="-I\$(GC)/include"
@@ -211,7 +213,7 @@ AC_CHECK_FUNC(getopt_long_only, AC_DEFINE(HAVE_GNU_GETOPT_H, 1,
getopt="getopt getopt1",)
AC_SUBST(getopt)
-AC_SUBST(GCDIR)
+AC_SUBST(GCVERSION)
AC_SUBST(GCOPTIONS)
AC_SUBST(GCLIB)
AC_SUBST(GCPPLIB)
@@ -225,7 +227,7 @@ AC_CHECK_LIB([ncurses], [setupterm], [AC_DEFINE(HAVE_LIBCURSES)
AC_CHECK_LIB([m], [sqrt],,
AC_MSG_ERROR([*** Please install libm on your system ***]))
AC_CHECK_LIB([z], [deflate],,
-AC_MSG_ERROR([*** Please install libz on your system ***]))
+AC_MSG_ERROR([*** Please install libz or zlib-devel on your system ***]))
AX_PTHREAD
AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler])
AC_CHECK_LIB([rt], [sched_yield])
@@ -331,12 +333,7 @@ void f(void) {
AC_MSG_NOTICE([*** Could not find libglut: will compile without GLUT support ***]))
esac
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_CHECK_LIB([OSMesa],OSMesaCreateContext,,
AC_MSG_NOTICE([*** Could not find libOSMesa: will compile without offscreen rendering support ***]))
fi
fi
@@ -371,10 +368,12 @@ AC_OUTPUT
if test "x$GCDIR" != "x" ; then
AC_CHECK_FILE($GCDIR.tar.gz,,[
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