=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/configure.in,v retrieving revision 1.25 retrieving revision 1.29 diff -u -p -r1.25 -r1.29 --- OpenXM_contrib2/asir2000/configure.in 2007/11/11 08:44:12 1.25 +++ OpenXM_contrib2/asir2000/configure.in 2008/08/11 16:58:30 1.29 @@ -1,4 +1,4 @@ -dnl $OpenXM: OpenXM_contrib2/asir2000/configure.in,v 1.24 2007/02/18 05:36:27 ohara Exp $ +dnl $OpenXM: OpenXM_contrib2/asir2000/configure.in,v 1.28 2008/08/08 05:47:21 ohara Exp $ AC_INIT AC_CONFIG_SRCDIR([LICENSE]) @@ -42,8 +42,21 @@ GC_CONFIGURE_ARGS=--disable-threads if [ -n "${host_alias}" ]; then GC_CONFIGURE_ARGS="--host=${host_alias} ${GC_CONFIGURE_ARGS}" fi +AC_ARG_WITH([gc7], +[ --with-gc7 use Boehm's GC 7.x. [[no]]], +[with_gc7=${withval}],[with_gc7=no]) +if test ${with_gc7:=no} != no; then + case "${with_gc7}" in + [7*]) GC_VERSION=${with_gc7} ;; + *) GC_VERSION=7.0 ;; + esac + GC=gc-${GC_VERSION} + AC_DEFINE([GC7]) + USE_GC7="yes" +fi AC_SUBST([GC]) AC_SUBST([GC_CONFIGURE_ARGS]) +AM_CONDITIONAL([USE_GC7],[test "$with_gc7" != no]) AC_ARG_WITH([distdir], [ --with-distdir specify the spool for fetching. [[no]]], @@ -54,32 +67,21 @@ if test ${with_distdir:=no} != no -a ${with_distdir} ! fi AC_SUBST([GC_DISTDIR]) -AC_ARG_ENABLE([gc-zeropage], -[ --enable-gc-zeropage enable to avoid the kernel zeropage bug. [[no]]], -[enable_gc_zeropage=yes],[enable_gc_zeropage=no]) - -if test "${enable_gc_zeropage:=no}" != no ; then - USE_GC_ZEROPAGE="yes" -fi -AC_SUBST([USE_GC_ZEROPAGE]) - libasir_postfix="" AC_ARG_WITH([pari], [ --with-pari use the PARI library. [[no]]], [with_pari=${withval}],[with_pari=no]) if test ${with_pari:=no} != no ; then - libasir_postfix=${libasir_postfix}_pari - if test ${with_pari} = new ; then - libpari=pari-2.2 - else - libpari=pari + if test "${with_pari}" = new -o "${with_pari}" = 2.3 ; then + AC_DEFINE([PARI23]) fi + libasir_postfix=${libasir_postfix}_pari PARIINC='-I${prefix}/include/pari' if test "${enable_shared}" != yes ; then - PARILIB='${prefix}'"/lib/lib${libpari}.a" + PARILIB='${prefix}'"/lib/libpari.a" else - PARILIB='-L${prefix}/lib'" -l${libpari}" + PARILIB='-L${prefix}/lib'" -lpari" fi AC_DEFINE([PARI]) fi @@ -189,8 +191,6 @@ case "${host}" in ;; [i[3-6]86-*-interix*]) asm_obj="${i386_aout_obj}" - USE_GC_INTERIX="yes" - AC_SUBST([USE_GC_INTERIX]) AC_DEFINE([_ALL_SOURCE]) ;; sparc-sun-solaris2.*)