===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl,v
retrieving revision 1.2
retrieving revision 1.11
diff -u -p -r1.2 -r1.11
--- OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl	2000/01/20 06:17:11	1.2
+++ OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl	2000/08/21 08:31:35	1.11
@@ -1,7 +1,54 @@
-/* $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.
+ * 
+ * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
+ * non-exclusive and royalty-free license to use, copy, modify and
+ * redistribute, solely for non-commercial and non-profit purposes, the
+ * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
+ * conditions of this Agreement. For the avoidance of doubt, you acquire
+ * only a limited right to use the SOFTWARE hereunder, and FLL or any
+ * third party developer retains all rights, including but not limited to
+ * copyrights, in and to the SOFTWARE.
+ * 
+ * (1) FLL does not grant you a license in any way for commercial
+ * purposes. You may use the SOFTWARE only for non-commercial and
+ * non-profit purposes only, such as academic, research and internal
+ * business use.
+ * (2) The SOFTWARE is protected by the Copyright Law of Japan and
+ * international copyright treaties. If you make copies of the SOFTWARE,
+ * with or without modification, as permitted hereunder, you shall affix
+ * to all such copies of the SOFTWARE the above copyright notice.
+ * (3) An explicit reference to this SOFTWARE and its copyright owner
+ * shall be made on your publication or presentation in any form of the
+ * results obtained by use of the SOFTWARE.
+ * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
+ * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification
+ * for such modification or the source code of the modified part of the
+ * SOFTWARE.
+ * 
+ * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
+ * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
+ * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
+ * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
+ * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
+ * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
+ * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+ * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
+ * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
+ * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
+ * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
+ * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
+ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
+ * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
+ * $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.10 2000/05/29 08:54:47 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,10 +57,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 +71,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 +79,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 +88,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,19 +123,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