===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl,v
retrieving revision 1.7
retrieving revision 1.35
diff -u -p -r1.7 -r1.35
--- OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl	2000/03/10 03:05:01	1.7
+++ OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl	2003/03/07 03:12:26	1.35
@@ -1,21 +1,35 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.6 2000/03/06 08:24:23 noro Exp $ */
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/Risa.tmpl,v 1.34 2003/02/14 22:29:13 ohara Exp $ 
+*/
 #include "config.h"
 
 #define USE_GCC
-#define USE_INET
 /* #define USE_MPI */
 /* #define USE_FFT_FLOAT */
 /* #define USE_LAPACK */
+/* #define USE_FEP */
+/* #undef OpenXM_HOME */
+/* #define USE_INTERVAL */
 
+#if defined(cygwinArchitecture)
+INSTALL=/bin/install
+#endif
+
 #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,11 +52,15 @@ CC= gcc
 CC= cc
 #endif
 
-CDEBUGFLAGS= -O6
+CDEBUGFLAGS= -g -O
 
-#if defined(SparcArchitecture)
+#if defined(SunArchitecture)
 #if SystemV4
-CDEBUGFLAGS= -O6 -mv8
+#if defined(SparcArchitecture)
+CDEBUGFLAGS= -g -O -mv8
+#else
+CDEBUGFLAGS= -g -O
+#endif
 CCOPTIONS = -DSYSV -DSVR4
 AR=/usr/ccs/bin/ar cqs
 /* ranlib is dummy on Solaris 2. */
@@ -70,60 +88,87 @@ 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
-PARILIB = $(ROOTDIR)/lib/libpari.a
+PARI= -DPARI
+PARIINC = -I$(ROOTDIR)/include/pari
+#if defined(OpenXM_HOME)
+PARILIB = $(ROOTDIR)/lib/lib$(LIBPARI).a
 #else
-PARI=0
-PARIINC = .
-PARILIB =
+PARILIB = -L/usr/local/lib -l$(LIBPARI)
 #endif
-
-#ifdef USE_INET
-INET=1
 #else
-INET=0
+PARI=
+PARIINC = 
+PARILIB =
 #endif
 
 #ifdef USE_LAPACK
-LAPACK=1
+LAPACK= -DLAPACK=1
 LAPACKLIB = -llapack -lblas -lI77 -lF77
 #else
-LAPACK=0
+LAPACK= -DLAPACK=0
 LAPACKLIB =
 #endif
 
 #ifdef USE_PLOT
-DO_PLOT=1
+DO_PLOT= -DDO_PLOT=1
 #else
-DO_PLOT=0
+DO_PLOT= -DDO_PLOT=0
 #endif
 
 #ifdef USE_FFT_FLOAT
-USE_FLOAT=1
+USE_FLOAT= -DUSE_FLOAT
 #else
-USE_FLOAT=0
+USE_FLOAT=
 #endif
 
 #ifdef USE_MPI
-MPI=1
+MPI= -DMPI=1
 MPILIB=-L/opt/FJSVmpi2/lib -lmpi -L/opt/FSUNaprun/lib -lmpl -lemi -lthread
-MPIINC=/opt/FJSVmpi2/include
+MPIINC=-I/opt/FJSVmpi2/include
 #else
-MPI=0
+MPI=-DMPI=0
 MPILIB=
-MPIINC=.
+MPIINC=
 #endif
 
+#ifdef USE_FEP
+FEP= -DFEP=1
+#if defined(OpenXM_HOME)
+FEPLIB= $(ROOTDIR)/lib/libreadline.a
+#else
+FEPLIB = -lreadline -ltermcap
+#endif
+#else
+FEP=-DFEP=0
+FEPLIB =
+#endif
+
+
 #if !defined(NullParameter)
 #define NullParameter
 #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)
+#ifdef USE_INTERVAL
+INTERVALDEF = -DINTERVAL -DITVDEBUG
+INTERVALDEF = -DINTERVAL
+#else
+INTERVALDEF =
+#endif
+
+INCLUDES= -I. -I$(TOP)/include -I$(TOP)/parse -I$(TOP)/io -I$(TOP)/gc/include $(PARIINC) $(MPIINC)
+DEFINES= $(INTERVALDEF) -DINET=$(INET) $(PARI) $(LAPACK) $(DO_PLOT) $(USE_FLOAT) $(PARIFLAGS) -DHMEXT $(MPI) $(FEP) $(LINUX_EXTRA_DEFINES)