=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/configure.in,v retrieving revision 1.24 retrieving revision 1.53 diff -u -p -r1.24 -r1.53 --- OpenXM_contrib2/asir2000/configure.in 2007/02/18 05:36:27 1.24 +++ OpenXM_contrib2/asir2000/configure.in 2021/03/24 18:27:09 1.53 @@ -1,12 +1,12 @@ -dnl $OpenXM: OpenXM_contrib2/asir2000/configure.in,v 1.23 2005/07/12 14:47:13 ohara Exp $ +dnl $OpenXM: OpenXM_contrib2/asir2000/configure.in,v 1.52 2019/11/12 10:52:04 kondoh Exp $ -AC_INIT([LICENSE]) -AC_PREREQ(2.53) -AM_INIT_AUTOMAKE(asir, 20030307) +AC_INIT(asir,1.15) +AC_CONFIG_SRCDIR([LICENSE]) +AC_PREREQ(2.69) +AC_CANONICAL_TARGET +AM_INIT_AUTOMAKE 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,6 +34,31 @@ elif test `basename ./"${CC}"` = "icc" ; then CFLAGS="-g -O" fi +GC=gc-7.4.18 +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 --enable-large-config" +if test -n "${host_alias}" ; then + GC_CONFIGURE_ARGS="--host=${host_alias} ${GC_CONFIGURE_ARGS}" +fi + +AC_DEFINE([GC7]) +AC_SUBST([ASIR_GCLIB]) +AC_SUBST([GCLIB]) +AC_SUBST([GCINC]) +AC_SUBST([GC]) +AC_SUBST([GC_CONFIGURE_ARGS]) + AC_ARG_WITH([distdir], [ --with-distdir specify the spool for fetching. [[no]]], [with_distdir=${withval}],[with_distdir=no]) @@ -45,15 +68,6 @@ 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]]], @@ -61,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 @@ -100,6 +109,15 @@ if test ${enable_plot:=no} != no ; then fi AM_CONDITIONAL([USE_PLOT],[test "$enable_plot" = yes]) +GMPLIB="-L${libdir} -lmpfi -lmpc -lmpfr -lgmp" +AC_ARG_ENABLE([static_gmp], +[ --enable-static-gmp force to link statically with gmp. [[no]]], +[enable_static_gmp=yes],[enable_static_gmp=no]) +if test ${enable_static_gmp:=no} != no ; then + GMPLIB='${libdir}/libmpc.a ${libdir}/libmpfr.a ${libdir}/libgmp.a' +fi +AC_SUBST([GMPLIB]) + AC_ARG_ENABLE([interval], [ --enable-interval enable interval feature. [[no]]], [enable_interval=${enableval}],[enable_interval=no]) @@ -130,17 +148,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]]], @@ -175,13 +189,11 @@ case "${host}" in asm_obj="${i386_elf_obj}" AC_DEFINE([_BSD_SOURCE]) ;; -*-*-cygwin*) +[i[3-6]86-*-cygwin*]|x86-*-cygwin*) asm_obj="${i386_aout_obj}" ;; [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.*) @@ -200,6 +212,9 @@ sparc-sun-solaris2.*) *-apple-darwin*) asm_obj="${generic_obj}" AC_DEFINE([__DARWIN__]) + if test -d /usr/X11/include -a x"${X_CFLAGS}" = x ; then + X_CFLAGS=-I/usr/X11/include + fi ;; arm*-*-linux*) asm_obj="${generic_obj}" @@ -207,15 +222,22 @@ arm*-*-linux*) CFLAGS="${CFLAGS} -fsigned-char" fi ;; +*-*-mingw*) + WSLIB="-lws2_32" + asm_obj="${generic_obj}" + ;; *) asm_obj="${generic_obj}" ;; esac AC_SUBST([asm_obj]) +AC_SUBST([WSLIB]) +AC_CHECK_FUNCS(sigaction) 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 asir2000]) +AC_OUTPUT