=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl 2000/12/21 02:44:16 1.14 +++ OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl 2000/12/22 10:03:29 1.15 @@ -2,7 +2,7 @@ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED * All rights reserved. * - * $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.13 2000/12/05 01:24:53 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.14 2000/12/21 02:44:16 murao Exp $ */ #include "config.h" @@ -10,6 +10,7 @@ /* #define USE_MPI */ /* #define USE_FFT_FLOAT */ /* #define USE_LAPACK */ +/* #define USE_FEP */ #if defined(LinuxArchitecture) #if LinuxCLibMajorVersion >= 6 || \ @@ -45,7 +46,7 @@ CC= gcc CC= cc #endif -CDEBUGFLAGS= -O +CDEBUGFLAGS= -O2 #if defined(SunArchitecture) #if SystemV4 @@ -89,7 +90,10 @@ PARIFLAGS = -DLONG_IS_32BIT #ifdef USE_PARI PARI=1 PARIINC = $(ROOTDIR)/include/pari +/* PARILIB = $(ROOTDIR)/lib/libpari.a +*/ +PARILIB = -L/usr/local/lib -lpari #else PARI=0 PARIINC = . @@ -126,9 +130,25 @@ MPILIB= MPIINC=. #endif +#ifdef USE_FEP +FEP=1 +FEPLIB = -lreadline -ltermcap +#else +FEP=0 +FEPLIB = +#endif + + #if !defined(NullParameter) #define NullParameter #endif +#ifdef USE_INTERVAL +INTERVALDEF = -DINTERVAL -DITVDEBUG +INTERVALDEF = -DINTERVAL +#else +INTERVALDEF = +#endif + INCLUDES= -I$(TOP)/include -I$(TOP)/parse -I$(TOP)/io -I$(PARIINC) -I$(MPIINC) -DEFINES= -DPARI=$(PARI) -DLAPACK=$(LAPACK) -DDO_PLOT=$(DO_PLOT) -DUSE_FLOAT=$(USE_FLOAT) $(PARIFLAGS) -DMPI=$(MPI) $(LINUX_EXTRA_DEFINES) +DEFINES= $(INTERVALDEF) -DINET=$(INET) -DPARI=$(PARI) -DLAPACK=$(LAPACK) -DDO_PLOT=$(DO_PLOT) -DUSE_FLOAT=$(USE_FLOAT) $(PARIFLAGS) -DHMEXT -DMPI=$(MPI) -DFEP=$(FEP) $(LINUX_EXTRA_DEFINES)