=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/configure,v retrieving revision 1.37 retrieving revision 1.40 diff -u -p -r1.37 -r1.40 --- OpenXM_contrib2/asir2000/configure 2007/11/11 08:44:12 1.37 +++ OpenXM_contrib2/asir2000/configure 2008/08/08 05:47:21 1.40 @@ -715,8 +715,9 @@ X_LIBS X_EXTRA_LIBS GC GC_CONFIGURE_ARGS +USE_GC7_TRUE +USE_GC7_FALSE GC_DISTDIR -USE_GC_ZEROPAGE PARIINC PARILIB GREP @@ -729,7 +730,6 @@ MPIINC MPILIB LAPACKLIB libasir_postfix -USE_GC_INTERIX USE_GC_SPARC64 asm_obj LIBOBJS @@ -1334,7 +1334,6 @@ Optional Features: --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-shared enable linking shared libraries. [no] - --enable-gc-zeropage enable to avoid the kernel zeropage bug. [no] --enable-plot enable plot feature. [no] --enable-interval enable interval feature. [no] --enable-fft-float enable FFT-FLOAT feature. [no] @@ -1343,6 +1342,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-x use the X Window System + --with-gc7 use Boehm's GC 7.x. [no] --with-distdir specify the spool for fetching. [no] --with-pari use the PARI library. [no] @@ -5318,9 +5318,37 @@ if -n "${host_alias}" ; then GC_CONFIGURE_ARGS="--host=${host_alias} ${GC_CONFIGURE_ARGS}" fi +# Check whether --with-gc7 was given. +if test "${with_gc7+set}" = set; then + withval=$with_gc7; with_gc7=${withval} +else + with_gc7=no +fi +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} + cat >>confdefs.h <<\_ACEOF +#define GC7 1 +_ACEOF + USE_GC7="yes" +fi + + if test "$with_gc7" != no; then + USE_GC7_TRUE= + USE_GC7_FALSE='#' +else + USE_GC7_TRUE='#' + USE_GC7_FALSE= +fi + + + # Check whether --with-distdir was given. if test "${with_distdir+set}" = set; then withval=$with_distdir; with_distdir=${withval} @@ -5334,19 +5362,6 @@ if test ${with_distdir:=no} != no -a ${with_distdir} ! fi -# Check whether --enable-gc-zeropage was given. -if test "${enable_gc_zeropage+set}" = set; then - enableval=$enable_gc_zeropage; enable_gc_zeropage=yes -else - enable_gc_zeropage=no -fi - - -if test "${enable_gc_zeropage:=no}" != no ; then - USE_GC_ZEROPAGE="yes" -fi - - libasir_postfix="" # Check whether --with-pari was given. @@ -5359,16 +5374,11 @@ fi 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='${prefix}'"/lib/libpari.a" else - PARILIB='-L${prefix}/lib'" -l${libpari}" + PARILIB='-L${prefix}/lib'" -lpari" fi cat >>confdefs.h <<\_ACEOF #define PARI 1 @@ -6385,8 +6395,6 @@ _ACEOF ;; i[3-6]86-*-interix*) asm_obj="${i386_aout_obj}" - USE_GC_INTERIX="yes" - cat >>confdefs.h <<\_ACEOF #define _ALL_SOURCE 1 _ACEOF @@ -6892,6 +6900,13 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${USE_GC7_TRUE}" && test -z "${USE_GC7_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"USE_GC7\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"USE_GC7\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${USE_PLOT_TRUE}" && test -z "${USE_PLOT_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"USE_PLOT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -7566,8 +7581,9 @@ X_LIBS!$X_LIBS$ac_delim X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim GC!$GC$ac_delim GC_CONFIGURE_ARGS!$GC_CONFIGURE_ARGS$ac_delim +USE_GC7_TRUE!$USE_GC7_TRUE$ac_delim +USE_GC7_FALSE!$USE_GC7_FALSE$ac_delim GC_DISTDIR!$GC_DISTDIR$ac_delim -USE_GC_ZEROPAGE!$USE_GC_ZEROPAGE$ac_delim PARIINC!$PARIINC$ac_delim PARILIB!$PARILIB$ac_delim GREP!$GREP$ac_delim @@ -7580,7 +7596,6 @@ MPIINC!$MPIINC$ac_delim MPILIB!$MPILIB$ac_delim LAPACKLIB!$LAPACKLIB$ac_delim libasir_postfix!$libasir_postfix$ac_delim -USE_GC_INTERIX!$USE_GC_INTERIX$ac_delim USE_GC_SPARC64!$USE_GC_SPARC64$ac_delim asm_obj!$asm_obj$ac_delim LIBOBJS!$LIBOBJS$ac_delim