===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/configure.in,v
retrieving revision 1.20
retrieving revision 1.36
diff -u -p -r1.20 -r1.36
--- OpenXM_contrib2/asir2000/configure.in	2004/06/25 13:41:33	1.20
+++ OpenXM_contrib2/asir2000/configure.in	2009/03/16 16:08:05	1.36
@@ -1,12 +1,12 @@
-dnl $OpenXM: OpenXM_contrib2/asir2000/configure.in,v 1.19 2004/06/25 09:37:19 noro Exp $
+dnl $OpenXM: OpenXM_contrib2/asir2000/configure.in,v 1.35 2009/03/04 06:51:41 ohara Exp $
 
-AC_INIT([LICENSE])
-AC_PREREQ(2.53)
+AC_INIT
+AC_CONFIG_SRCDIR([LICENSE])
+AC_PREREQ(2.61)
+AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(asir, 20030307)
 AM_MAINTAINER_MODE
 
-AC_CANONICAL_SYSTEM
-
 dnl AM_PROG_AS
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -16,8 +16,6 @@ AC_PROG_YACC
 
 AC_PATH_XTRA
 
-AC_DEFINE([HMEXT])
-
 AC_ARG_ENABLE([shared],
 [  --enable-shared         enable linking shared libraries.  [[no]]],
 [enable_shared=yes],[enable_shared=no])
@@ -36,32 +34,67 @@ elif test `basename ./"${CC}"` = "icc" ; then
     CFLAGS="-g -O"
 fi
 
-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"
+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
-AC_SUBST([USE_GC_ZEROPAGE])
+dnl GC_CONFIGURE_ARGS=--disable-threads --enable-shared=no
+GC_CONFIGURE_ARGS="--disable-threads --enable-large-config"
+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.1 ;;
+   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]]],
+[with_distdir=${withval}],[with_distdir=no])
+GC_DISTDIR='${prefix}/../OpenXM_dist'
+if test ${with_distdir:=no} != no -a ${with_distdir} != yes ; then
+    GC_DISTDIR=${with_distdir}
+fi   
+AC_SUBST([GC_DISTDIR])
+
 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
@@ -121,24 +154,20 @@ if test "${enable_fft_float:=no}" != no ; then
     AC_DEFINE([USE_FLOAT])
 fi
 
-dnl AC_ARG_WITH([mpi],
-dnl [  --with-mpi              use the MPI library. [[no]]],
-dnl [with_mpi=${withval}],[with_mpi=no])
+AC_ARG_WITH([mpi],
+[  --with-mpi              use the MPI library. [[no]]],
+[with_mpi=${withval}],[with_mpi=no])
 
 if test "${with_mpi:=no}" != no ; then
-    MPIINC="-I/opt/FJSVmpi2/include"
-    MPILIB="-L/opt/FJSVmpi2/lib -lmpi -L/opt/FSUNaprun/lib -lmpl -lemi -lthread"
     AC_DEFINE([MPI])
 fi
-AC_SUBST([MPIINC])
-AC_SUBST([MPILIB])
 
 dnl AC_ARG_WITH([lapack],
 dnl [  --with-lapack           use the LAPACK library. [[no]]],
 dnl [with_lapack=${withval}],[with_lapack=no])
 
 if test "${with_lapack:=no}" != no ; then
-    LAPACKLIB="-llapack -lblas -lI77 -lF77"
+    LAPACKLIB="-llapack -lblas -lg2c"
     AC_DEFINE([LAPACK])
 fi
 AC_SUBST([LAPACKLIB])
@@ -171,8 +200,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.*)
@@ -188,7 +215,7 @@ sparc-sun-solaris2.*)
     esac
     AC_DEFINE([SYSV])
     ;;
-powerpc-apple-darwin*)
+*-apple-darwin*)
     asm_obj="${generic_obj}"
     AC_DEFINE([__DARWIN__])
     ;;
@@ -209,4 +236,5 @@ dnl for Solaris 2.x
 AC_CHECK_FUNC(socket, , [AC_CHECK_LIB(socket,socket)])
 AC_CHECK_FUNC(gethostbyname, , [AC_CHECK_LIB(nsl,gethostbyname)])
 
-AC_OUTPUT([Makefile engine/Makefile asm/Makefile builtin/Makefile fft/Makefile include/Makefile io/Makefile lib/Makefile parse/Makefile plot/Makefile])
+AC_CONFIG_FILES([Makefile engine/Makefile asm/Makefile builtin/Makefile fft/Makefile include/Makefile io/Makefile lib/Makefile parse/Makefile plot/Makefile])
+AC_OUTPUT