=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/configure.in,v retrieving revision 1.29 retrieving revision 1.50 diff -u -p -r1.29 -r1.50 --- OpenXM_contrib2/asir2000/configure.in 2008/08/11 16:58:30 1.29 +++ OpenXM_contrib2/asir2000/configure.in 2017/03/12 04:51:49 1.50 @@ -1,10 +1,10 @@ -dnl $OpenXM: OpenXM_contrib2/asir2000/configure.in,v 1.28 2008/08/08 05:47:21 ohara Exp $ +dnl $OpenXM: OpenXM_contrib2/asir2000/configure.in,v 1.49 2016/09/23 03:03:39 ohara Exp $ -AC_INIT +AC_INIT(asir,1.15) AC_CONFIG_SRCDIR([LICENSE]) -AC_PREREQ(2.61) +AC_PREREQ(2.69) AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(asir, 20030307) +AM_INIT_AUTOMAKE AM_MAINTAINER_MODE dnl AM_PROG_AS @@ -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.4.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]]], @@ -73,15 +74,12 @@ AC_ARG_WITH([pari], [with_pari=${withval}],[with_pari=no]) if test ${with_pari:=no} != no ; then - 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/libpari.a" + PARILIB='${libdir}/libpari.a' else - PARILIB='-L${prefix}/lib'" -lpari" + PARILIB='-L${libdir} -lpari' fi AC_DEFINE([PARI]) fi @@ -111,6 +109,15 @@ if test ${enable_plot:=no} != no ; then fi AM_CONDITIONAL([USE_PLOT],[test "$enable_plot" = yes]) +GMPLIB="-L${libdir} -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]) @@ -141,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]]], @@ -186,7 +189,7 @@ 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*]) @@ -209,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}" @@ -216,13 +222,19 @@ 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)])