===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl,v
retrieving revision 1.11
retrieving revision 1.23
diff -u -p -r1.11 -r1.23
--- OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl	2000/08/21 08:31:35	1.11
+++ OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl	2001/06/04 02:49:46	1.23
@@ -2,57 +2,17 @@
  * 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 $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.22 2001/03/19 04:17:39 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 || \
@@ -65,7 +25,7 @@ EXTRA_LDOPTIONS=-static
 #endif
 #endif
 
-#if defined(AlphaArchitecture)
+#if defined(AlphaArchitecture) || defined(DarwinArchitecture)
 #undef USE_GCC
 #endif
 
@@ -124,27 +84,30 @@ 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
+
 #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
@@ -175,9 +138,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)