=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl,v retrieving revision 1.1.1.1 retrieving revision 1.4 diff -u -p -r1.1.1.1 -r1.4 --- OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl 1999/12/03 07:39:11 1.1.1.1 +++ OpenXM_contrib2/asir2000/include/Attic/Risa.tmpl 2000/02/08 04:47:10 1.4 @@ -1,20 +1,26 @@ -/* $OpenXM: OpenXM/src/asir99/include/Risa.tmpl,v 1.1.1.1 1999/11/10 08:12:30 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 */ /* #define USE_LAPACK */ +#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) +#endif +#endif + #if defined(AlphaArchitecture) #undef USE_GCC #endif #define SUN4M 1 -#include "config.h" - #if defined(OpenXM_HOME) ROOTDIR=OpenXM_HOME #else @@ -31,7 +37,6 @@ CC= cc #endif CDEBUGFLAGS= -O6 -CCOPTIONS= #if defined(SparcArchitecture) #if SystemV4 @@ -59,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 @@ -116,4 +121,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) +DEFINES= -DINET=$(INET) -DPARI=$(PARI) -DLAPACK=$(LAPACK) -DDO_PLOT=$(DO_PLOT) -DUSE_FLOAT=$(USE_FLOAT) $(PARIFLAGS) -DHMEXT -DMPI=$(MPI) $(LINUX_EXTRA_DEFINES)