=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/configure.in,v retrieving revision 1.14 retrieving revision 1.26 diff -u -p -r1.14 -r1.26 --- OpenXM_contrib2/asir2000/configure.in 2003/09/07 16:49:37 1.14 +++ OpenXM_contrib2/asir2000/configure.in 2007/11/11 15:54:02 1.26 @@ -1,12 +1,12 @@ -dnl $OpenXM: OpenXM_contrib2/asir2000/configure.in,v 1.13 2003/03/19 08:27:47 ohara Exp $ +dnl $OpenXM: OpenXM_contrib2/asir2000/configure.in,v 1.25 2007/11/11 08:44:12 ohara Exp $ -AC_INIT([LICENSE]) -AC_PREREQ(2.53) +AC_INIT +AC_CONFIG_SRCDIR([LICENSE]) +AC_PREREQ(2.61) +AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(asir, 20030307) AM_MAINTAINER_MODE -AC_CANONICAL_SYSTEM - dnl AM_PROG_AS AC_PROG_CC AC_PROG_INSTALL @@ -32,8 +32,41 @@ if test "${ac_test_CFLAGS}" != set -a "${GCC}" = yes ; else CFLAGS="-O" fi +elif test `basename ./"${CC}"` = "icc" ; then + CFLAGS="-g -O" fi +GC=gc6.8 +dnl GC_CONFIGURE_ARGS=--disable-threads --enable-shared=no +GC_CONFIGURE_ARGS=--disable-threads +if [ -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_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]]], +[with_distdir=${withval}],[with_distdir=no]) +GC_DISTDIR='${prefix}/../OpenXM_dist' +if test ${with_distdir:=no} != no -a ${with_distdir} != yes ; then + GC_DISTDIR=${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]) @@ -68,7 +101,7 @@ AC_SUBST([PARILIB]) AC_CHECK_TYPES([unsigned long long]) AC_CHECK_SIZEOF(long) -if test SIZEOF_LONG = 8; then +if test "${ac_cv_sizeof_long}" = 8; then AC_DEFINE([LONG_IS_64BIT]) else AC_DEFINE([LONG_IS_32BIT]) @@ -136,7 +169,7 @@ dnl [ --with-lapack use the LAPACK library. dnl [with_lapack=${withval}],[with_lapack=no]) if test "${with_lapack:=no}" != no ; then - LAPACKLIB="-llapack -lblas -lI77 -lF77" + LAPACKLIB="-llapack -lblas -lg2c" AC_DEFINE([LAPACK]) fi AC_SUBST([LAPACKLIB]) @@ -153,7 +186,7 @@ dnl generic_obj: for 32bits/64bits generic micro pro i386_elf_obj=asmi_l.o i386_aout_obj=asmi.o sparc_v8_obj="sparc-2.o asm4-2.o edr-2.o" -sparc_v9_obj="sparc-2.o asm5-2.o edr-2.o" +sparc_v9_obj=asmalpha.o generic_obj=asmalpha.o case "${host}" in @@ -167,15 +200,26 @@ case "${host}" in *-*-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.*) case "`uname -m`" in [sun4[dm]]) asm_obj="${sparc_v8_obj}" ;; - sun4u*) asm_obj="${sparc_v9_obj}" ;; + sun4u*) asm_obj="${sparc_v9_obj}" + if test "${ac_test_CFLAGS}" != set -a "${GCC}" = yes ; then + CFLAGS="${CFLAGS} -m64" + fi + AC_SUBST([USE_GC_SPARC64]) + ;; *) asm_obj="${generic_obj}" ;; esac AC_DEFINE([SYSV]) ;; -powerpc-apple-darwin*) +*-apple-darwin*) asm_obj="${generic_obj}" AC_DEFINE([__DARWIN__]) ;; @@ -196,4 +240,5 @@ 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]) +AC_OUTPUT