===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl,v
retrieving revision 1.14
retrieving revision 1.22
diff -u -p -r1.14 -r1.22
--- OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl	2000/12/21 02:44:16	1.14
+++ OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl	2001/03/19 04:17:39	1.22
@@ -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.21 2001/03/19 04:02:04 noro Exp $ 
 */
 #include "config.h"
 
@@ -10,6 +10,9 @@
 /* #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 || \
@@ -81,6 +84,7 @@ CC= cc -Wl,-D -Wl,$(HEAP_START_ADDR)
 #endif
 
 #if defined(AlphaArchitecture)
+CCOPTIONS =
 PARIFLAGS = -DLONG_IS_64BIT
 #else
 PARIFLAGS = -DLONG_IS_32BIT
@@ -89,8 +93,12 @@ PARIFLAGS = -DLONG_IS_32BIT
 #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 = .
 PARILIB =
@@ -126,9 +134,29 @@ MPILIB=
 MPIINC=.
 #endif
 
+#ifdef USE_FEP
+FEP=1
+#if defined(OpenXM_HOME)
+FEPLIB= $(ROOTDIR)/lib/libreadline.a
+#else
+FEPLIB = -lreadline -ltermcap
+#endif
+#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)