===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/configure.in,v
retrieving revision 1.25
retrieving revision 1.31
diff -u -p -r1.25 -r1.31
--- OpenXM_contrib2/asir2000/configure.in	2007/11/11 08:44:12	1.25
+++ OpenXM_contrib2/asir2000/configure.in	2009/02/11 21:48:15	1.31
@@ -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.30 2009/02/06 10:11:12 ohara Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([LICENSE])
@@ -37,13 +37,41 @@ elif test `basename ./"${CC}"` = "icc" ; then
 fi
 
 GC=gc6.8
+AC_ARG_WITH([asir-gc],
+[  --with-asir-gc          modify Boehm's GC [[yes]]],
+[with_asir_gc=${withval}],[with_asir_gc=yes])
+if test ${with_asir_gc:=yes} != no; then
+   ASIR_GCLIB=libasir-gc.a
+   GCINC='-I${top_srcdir}/${GC}/include'
+else
+   GCLIB='-L${prefix}/lib -lgc'
+   GCINC='-I${prefix}/include'
+   AC_DEFINE([NO_ASIR_GC])
+fi
 dnl GC_CONFIGURE_ARGS=--disable-threads --enable-shared=no
 GC_CONFIGURE_ARGS=--disable-threads
-if [ -n "${host_alias}" ]; then
+if test -n "${host_alias}" ; then
     GC_CONFIGURE_ARGS="--host=${host_alias} ${GC_CONFIGURE_ARGS}"
 fi
+AC_ARG_WITH([gc7],
+[  --with-gc7              use GC 7.x (if --with-asir-gc=yes) [[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])
+fi
+
+AC_SUBST([ASIR_GCLIB])
+AC_SUBST([GCLIB])
+AC_SUBST([GCINC])
+
 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 +82,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='${libdir}/libpari.a'
     else
-        PARILIB='-L${prefix}/lib'" -l${libpari}"
+        PARILIB='-L${libdir} -lpari'
     fi
     AC_DEFINE([PARI])
 fi
@@ -189,8 +206,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.*)