=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl,v retrieving revision 1.12 retrieving revision 1.16 diff -u -p -r1.12 -r1.16 --- OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl 2000/08/22 01:30:25 1.12 +++ OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl 2000/12/23 08:04:16 1.16 @@ -2,15 +2,15 @@ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED * All rights reserved. * - * $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.11 2000/08/21 08:31:35 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.15 2000/12/22 10:03:29 saito Exp $ */ #include "config.h" #define USE_GCC -#define USE_INET /* #define USE_MPI */ /* #define USE_FFT_FLOAT */ /* #define USE_LAPACK */ +/* #define USE_FEP */ #if defined(LinuxArchitecture) #if LinuxCLibMajorVersion >= 6 || \ @@ -46,7 +46,7 @@ CC= gcc CC= cc #endif -CDEBUGFLAGS= -O +CDEBUGFLAGS= -O2 #if defined(SunArchitecture) #if SystemV4 @@ -91,18 +91,15 @@ PARIFLAGS = -DLONG_IS_32BIT PARI=1 PARIINC = $(ROOTDIR)/include/pari PARILIB = $(ROOTDIR)/lib/libpari.a +/* +PARILIB = -L/usr/local/lib -lpari +*/ #else PARI=0 PARIINC = . PARILIB = #endif -#ifdef USE_INET -INET=1 -#else -INET=0 -#endif - #ifdef USE_LAPACK LAPACK=1 LAPACKLIB = -llapack -lblas -lI77 -lF77 @@ -133,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= -DINET=$(INET) -DPARI=$(PARI) -DLAPACK=$(LAPACK) -DDO_PLOT=$(DO_PLOT) -DUSE_FLOAT=$(USE_FLOAT) $(PARIFLAGS) -DHMEXT -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)