===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl,v
retrieving revision 1.8
retrieving revision 1.24
diff -u -p -r1.8 -r1.24
--- OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl	2000/03/14 06:30:34	1.8
+++ OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl	2001/06/15 07:56:05	1.24
@@ -1,21 +1,31 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.7 2000/03/10 03:05:01 noro Exp $ */
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.23 2001/06/04 02:49:46 noro Exp $ 
+*/
 #include "config.h"
 
-#define USE_GCC
-#define USE_INET
+/* #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 || \
     (LinuxCLibMajorVersion == 5 && LinuxCLibMinorVersion == 99)
 STD_CPP_DEFINES = -traditional -Dlinux -D_BSD_SOURCE $(PROJECT_DEFINES)
 STD_DEFINES = -Dlinux -D_BSD_SOURCE $(PROJECT_DEFINES)
+#if 0
+EXTRA_LDOPTIONS=-static
 #endif
 #endif
+#endif
 
-#if defined(AlphaArchitecture)
+#if defined(AlphaArchitecture) || defined(DarwinArchitecture)
 #undef USE_GCC
 #endif
 
@@ -38,14 +48,14 @@ CC= gcc
 CC= cc
 #endif
 
-CDEBUGFLAGS= -O6
+CDEBUGFLAGS= -O
 
 #if defined(SunArchitecture)
 #if SystemV4
 #if defined(SparcArchitecture)
-CDEBUGFLAGS= -O6 -mv8
+CDEBUGFLAGS= -O -mv8
 #else
-CDEBUGFLAGS= -O6
+CDEBUGFLAGS= -O
 #endif
 CCOPTIONS = -DSYSV -DSVR4
 AR=/usr/ccs/bin/ar cqs
@@ -74,27 +84,34 @@ 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
+
+#if defined(AIXArchitecture)
+CC = cc -qchars=signed
+#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 = .
 PARILIB =
 #endif
 
-#ifdef USE_INET
-INET=1
-#else
-INET=0
-#endif
-
 #ifdef USE_LAPACK
 LAPACK=1
 LAPACKLIB = -llapack -lblas -lI77 -lF77
@@ -125,9 +142,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)