=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/configure.in,v retrieving revision 1.36 retrieving revision 1.42 diff -u -p -r1.36 -r1.42 --- OpenXM_contrib2/asir2000/configure.in 2009/03/16 16:08:05 1.36 +++ OpenXM_contrib2/asir2000/configure.in 2013/02/12 09:40:41 1.42 @@ -1,4 +1,4 @@ -dnl $OpenXM: OpenXM_contrib2/asir2000/configure.in,v 1.35 2009/03/04 06:51:41 ohara Exp $ +dnl $OpenXM: OpenXM_contrib2/asir2000/configure.in,v 1.41 2012/12/17 07:20:44 noro Exp $ AC_INIT AC_CONFIG_SRCDIR([LICENSE]) @@ -34,7 +34,7 @@ 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]) @@ -51,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.1 ;; - 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]]], @@ -86,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 @@ -218,6 +203,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}"