=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/configure.in,v retrieving revision 1.27 retrieving revision 1.39 diff -u -p -r1.27 -r1.39 --- OpenXM_contrib2/asir2000/configure.in 2008/03/19 07:05:55 1.27 +++ OpenXM_contrib2/asir2000/configure.in 2012/05/30 02:24:33 1.39 @@ -1,4 +1,4 @@ -dnl $OpenXM: OpenXM_contrib2/asir2000/configure.in,v 1.26 2007/11/11 15:54:02 ohara Exp $ +dnl $OpenXM: OpenXM_contrib2/asir2000/configure.in,v 1.38 2012/05/09 06:17:13 ohara Exp $ AC_INIT AC_CONFIG_SRCDIR([LICENSE]) @@ -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,27 +34,30 @@ elif test `basename ./"${CC}"` = "icc" ; then CFLAGS="-g -O" fi -GC=gc6.8 +GC=gc-7.2 +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 +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 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_DEFINE([GC7]) +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]]], @@ -74,16 +75,11 @@ AC_ARG_WITH([pari], 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 - fi 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 @@ -143,17 +139,13 @@ 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]]],