===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl,v
retrieving revision 1.2
retrieving revision 1.13
diff -u -p -r1.2 -r1.13
--- OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl	2000/01/20 06:17:11	1.2
+++ OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl	2000/12/05 01:24:53	1.13
@@ -1,8 +1,12 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.1.1.1 1999/12/03 07:39:11 noro Exp $ */
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.12 2000/08/22 01:30:25 noro Exp $ 
+*/
+#include "config.h"
+
 #define USE_GCC
-#define USE_PARI
-#define USE_PLOT
-#define USE_INET
 /* #define USE_MPI */
 /* #define USE_FFT_FLOAT */
 /* #define USE_LAPACK */
@@ -10,10 +14,13 @@
 #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)
+#if 0
+EXTRA_LDOPTIONS=-static
 #endif
 #endif
+#endif
 
 #if defined(AlphaArchitecture)
 #undef USE_GCC
@@ -21,8 +28,6 @@ STD_DEFINES = -Dlinux -D__i386__ -D_BSD_SOURCE $(PROJE
 
 #define SUN4M 1
 
-#include "config.h"
-
 #if defined(OpenXM_HOME)
 ROOTDIR=OpenXM_HOME
 #else
@@ -31,6 +36,8 @@ ROOTDIR=/usr/local
 
 ASIR_BINDIR=$(ROOTDIR)/bin
 ASIR_LIBDIR=$(ROOTDIR)/lib/asir
+ASIR_INCDIR=$(ROOTDIR)/include/asir
+GC_INCDIR=$(ROOTDIR)/include/gc
 
 #if defined(USE_GCC)
 CC= gcc
@@ -38,13 +45,19 @@ CC= gcc
 CC= cc
 #endif
 
-CDEBUGFLAGS= -O6
-CCOPTIONS=
+CDEBUGFLAGS= -O
 
-#if defined(SparcArchitecture)
+#if defined(SunArchitecture)
 #if SystemV4
-CDEBUGFLAGS= -O6 -mv8
+#if defined(SparcArchitecture)
+CDEBUGFLAGS= -O -mv8
+#else
+CDEBUGFLAGS= -O
+#endif
+CCOPTIONS = -DSYSV -DSVR4
 AR=/usr/ccs/bin/ar cqs
+/* ranlib is dummy on Solaris 2. */
+RANLIB=/usr/ccs/bin/ranlib
 #endif
 #if !SystemV4
 #if defined(USE_GCC)
@@ -67,28 +80,22 @@ 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
 
-#ifdef USE_INET
-INET=1
-#else
-INET=0
-#endif
-
 #ifdef USE_LAPACK
 LAPACK=1
 LAPACKLIB = -llapack -lblas -lI77 -lF77
@@ -124,4 +131,4 @@ MPIINC=.
 #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= -DPARI=$(PARI) -DLAPACK=$(LAPACK) -DDO_PLOT=$(DO_PLOT) -DUSE_FLOAT=$(USE_FLOAT) $(PARIFLAGS) -DHMEXT -DMPI=$(MPI) $(LINUX_EXTRA_DEFINES)