=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl,v retrieving revision 1.15 retrieving revision 1.23 diff -u -p -r1.15 -r1.23 --- OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl 2000/12/22 10:03:29 1.15 +++ OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl 2001/06/04 02:49:46 1.23 @@ -2,15 +2,17 @@ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED * All rights reserved. * - * $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.14 2000/12/21 02:44:16 murao Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.22 2001/03/19 04:17:39 noro Exp $ */ #include "config.h" -#define USE_GCC +/* #define USE_GCC */ /* #define USE_MPI */ /* #define USE_FFT_FLOAT */ /* #define USE_LAPACK */ /* #define USE_FEP */ +/* #undef OpenXM_HOME */ +/* #define USE_INTERVAL */ #if defined(LinuxArchitecture) #if LinuxCLibMajorVersion >= 6 || \ @@ -23,7 +25,7 @@ EXTRA_LDOPTIONS=-static #endif #endif -#if defined(AlphaArchitecture) +#if defined(AlphaArchitecture) || defined(DarwinArchitecture) #undef USE_GCC #endif @@ -46,7 +48,7 @@ CC= gcc CC= cc #endif -CDEBUGFLAGS= -O2 +CDEBUGFLAGS= -O #if defined(SunArchitecture) #if SystemV4 @@ -82,18 +84,24 @@ CC= cc -Wl,-D -Wl,$(HEAP_START_ADDR) #endif #if defined(AlphaArchitecture) +CCOPTIONS = PARIFLAGS = -DLONG_IS_64BIT #else PARIFLAGS = -DLONG_IS_32BIT #endif +#if defined(DarwinArchitecture) +CCOPTIONS = +#endif + #ifdef USE_PARI PARI=1 PARIINC = $(ROOTDIR)/include/pari -/* +#if defined(OpenXM_HOME) PARILIB = $(ROOTDIR)/lib/libpari.a -*/ +#else PARILIB = -L/usr/local/lib -lpari +#endif #else PARI=0 PARIINC = . @@ -132,7 +140,11 @@ MPIINC=. #ifdef USE_FEP FEP=1 +#if defined(OpenXM_HOME) +FEPLIB= $(ROOTDIR)/lib/libreadline.a +#else FEPLIB = -lreadline -ltermcap +#endif #else FEP=0 FEPLIB =