=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/configure.in,v retrieving revision 1.34 retrieving revision 1.51 diff -u -p -r1.34 -r1.51 --- OpenXM_contrib2/asir2000/configure.in 2009/02/23 16:51:06 1.34 +++ OpenXM_contrib2/asir2000/configure.in 2019/03/26 08:10:13 1.51 @@ -1,10 +1,10 @@ -dnl $OpenXM: OpenXM_contrib2/asir2000/configure.in,v 1.33 2009/02/13 13:24:16 ohara Exp $ +dnl $OpenXM: OpenXM_contrib2/asir2000/configure.in,v 1.50 2017/03/12 04:51:49 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,7 +34,7 @@ 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]) @@ -53,25 +51,13 @@ GC_CONFIGURE_ARGS="--disable-threads --enable-large-co 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_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]]], @@ -88,9 +74,6 @@ 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 @@ -126,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]) @@ -197,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*]) @@ -220,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}" @@ -227,16 +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_CONFIG_FILES([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