===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -p -r1.2 -r1.4
--- OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl	2000/01/20 06:17:11	1.2
+++ OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl	2000/02/08 04:47:10	1.4
@@ -1,7 +1,7 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.1.1.1 1999/12/03 07:39:11 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.3 2000/02/04 09:27:32 noro Exp $ */
+#include "config.h"
+
 #define USE_GCC
-#define USE_PARI
-#define USE_PLOT
 #define USE_INET
 /* #define USE_MPI */
 /* #define USE_FFT_FLOAT */
@@ -10,8 +10,8 @@
 #if defined(LinuxArchitecture)
 #if LinuxCLibMajorVersion >= 6 || \
     (LinuxCLibMajorVersion == 5 && LinuxCLibMinorVersion == 99)
-STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_BSD_SOURCE $(PROJECT_DEFINES)
-STD_DEFINES = -Dlinux -D__i386__ -D_BSD_SOURCE $(PROJECT_DEFINES)
+STD_CPP_DEFINES = -traditional -Dlinux -D_BSD_SOURCE $(PROJECT_DEFINES)
+STD_DEFINES = -Dlinux -D_BSD_SOURCE $(PROJECT_DEFINES)
 #endif
 #endif
 
@@ -21,8 +21,6 @@ STD_DEFINES = -Dlinux -D__i386__ -D_BSD_SOURCE $(PROJE
 
 #define SUN4M 1
 
-#include "config.h"
-
 #if defined(OpenXM_HOME)
 ROOTDIR=OpenXM_HOME
 #else
@@ -39,7 +37,6 @@ CC= cc
 #endif
 
 CDEBUGFLAGS= -O6
-CCOPTIONS=
 
 #if defined(SparcArchitecture)
 #if SystemV4
@@ -67,19 +64,19 @@ CC= cc -Wl,-D -Wl,$(HEAP_START_ADDR)
 #endif
 #endif
 
-#ifdef USE_PARI
-PARI=1
 #if defined(AlphaArchitecture)
 PARIFLAGS = -DLONG_IS_64BIT
 #else
 PARIFLAGS = -DLONG_IS_32BIT
 #endif
+
+#ifdef USE_PARI
+PARI=1
 PARIINC = $(ROOTDIR)/include/pari
 PARILIB = $(ROOTDIR)/lib/libpari.a
 #else
 PARI=0
 PARIINC = .
-PARIFLAGS =
 PARILIB =
 #endif