===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl,v
retrieving revision 1.10
retrieving revision 1.17
diff -u -p -r1.10 -r1.17
--- OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl	2000/05/29 08:54:47	1.10
+++ OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl	2000/12/23 08:44:36	1.17
@@ -1,11 +1,16 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.9 2000/04/10 08:31:37 noro Exp $ */
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.16 2000/12/23 08:04:16 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 || \
@@ -41,7 +46,7 @@ CC= gcc
 CC= cc
 #endif
 
-CDEBUGFLAGS= -O
+CDEBUGFLAGS= -O2
 
 #if defined(SunArchitecture)
 #if SystemV4
@@ -85,19 +90,17 @@ 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 =
 #endif
 
-#ifdef USE_INET
-INET=1
-#else
-INET=0
-#endif
-
 #ifdef USE_LAPACK
 LAPACK=1
 LAPACKLIB = -llapack -lblas -lI77 -lF77
@@ -128,9 +131,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= -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)