Changeset 6b32990 in git

Timestamp:

Dec 12, 2000, 9:44:55 AM (22 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

de7793b9aaa39c2f00b6e30ee4ad5c82915497aa

Parents:

52ea3f939ec0aa2915d2d6a747bab3976eb9bfb7

Message:

* dynamic kernel modules for MP and DBM links
* p_Procs improvements


git-svn-id: file:///usr/local/Singular/svn/trunk@4865 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• LIB/tst.lib (modified) (2 diffs)
• Makefile.in (modified) (22 diffs)
• configure (modified) (152 diffs)
• configure.in (modified) (7 diffs)
• dbm_sl.h (added)
• extra.cc (modified) (3 diffs)
• hilb.cc (modified) (2 diffs)
• ideals.cc (modified) (2 diffs)
• khstd.cc (modified) (3 diffs)
• kstd1.cc (modified) (6 diffs)
• kstd2.cc (modified) (2 diffs)
• kutil.cc (modified) (7 diffs)
• misc.cc (modified) (1 diff)
• mod2.h.in (modified) (2 diffs)
• mod_raw.cc (modified) (8 diffs)
• mod_raw.h (modified) (2 diffs)
• mpsr_GetMisc.cc (modified) (2 diffs)
• mpsr_Tok.cc (modified) (3 diffs)
• mpsr_sl.cc (moved) (moved from Singular/sing_mp.cc) (19 diffs)
• mpsr_sl.h (added)
• p_Procs_Dynamic.cc (modified) (6 diffs)
• p_Procs_Dynamic.h (modified) (2 diffs)
• p_Procs_Generate.cc (modified) (8 diffs)
• p_Procs_Impl.h (modified) (5 diffs)
• p_Procs_Lib.cc (modified) (2 diffs)
• p_Procs_Set.h (modified) (1 diff)
• p_Procs_Static.cc (modified) (2 diffs)
• p_Procs_Static.h (modified) (1 diff)
• p_kBucketSetLm__Template.cc (modified) (1 diff)
• ring.cc (modified) (3 diffs)
• silink.cc (modified) (7 diffs)
• silink.h (modified) (3 diffs)
• sing_dbm.cc (modified) (6 diffs)
• sing_mp.h (deleted)
• slInit.h (added)
• slInit_Dynamic.cc (added)
• slInit_Static.cc (added)
• tesths.cc (modified) (3 diffs)

Singular/LIB/tst.lib

@@ -1 @@
-// $Id: tst.lib,v 1.27 2000-09-25 10:44:50 obachman Exp $
+// $Id: tst.lib,v 1.28 2000-12-12 08:44:55 obachman Exp $
 //(obachman, last modified 6/30/98)
 /////////////////////////////////////////////////////////////////////////////
 
-version="$Id: tst.lib,v 1.27 2000-09-25 10:44:50 obachman Exp $";
+version="$Id: tst.lib,v 1.28 2000-12-12 08:44:55 obachman Exp $";
 info="
 LIBRARY:  tst.lib      PROCEDURES FOR RUNNING AUTOMATIC TST TESTS
@@ -34 +34 @@
   s = read(tmpfile);
   errno = system("sh", "rm -f " + tmpfile);
-  if (size(#) > 0)
-  {
-      s = s[1, size(s) -1];
+  if (size(#) > 0 && size(s) > 1)
+  {
+    s = s[1, size(s) -1];
   }
   return (s);

Singular/Makefile.in

@@ -61 +61 @@
 STATIC_LDFLAGS  = @STATIC_LDFLAGS@
 LIBS            = -lm @NEED_LIBS@ 
+MP_LIBS         = @MP_LIBS@
 DL_KERNEL       = @DL_KERNEL@
+HAVE_MPSR       = @HAVE_MPSR@
 
 ifdef LD_STATIC
 LDFLAGS  := ${STATIC_LDFLAGS} ${LDFLAGS} 
 SING_EXEC = Singular-static
+LIBS := ${MP_LIBS} ${LIBS} 
 DL_KERNEL =
 else
@@ -72 +75 @@
 endif
 
+# CXXFLAGS =  -g -Wall -Wno-unused
+# CFLAGS =  -g -Wall -Wno-unused
 ##
 ## End configuration dependend stuff
@@ -95 +100 @@
     fglm.cc fglmzero.cc fglmvec.cc fglmgauss.cc fglmhom.cc fglmcomb.cc \
     numbers.cc polys.cc p_polys.cc polys0.cc polys1.cc polys-impl.cc \
-    ring.cc shortfl.cc silink.cc sing_mp.cc\
-    sing_dbm.cc kspoly.cc \
+    ring.cc shortfl.cc silink.cc kspoly.cc \
     subexpr.cc syz.cc syz0.cc syz1.cc syz2.cc syz3.cc\
     timer.cc weight.cc \
-    mpsr_Put.cc mpsr_PutPoly.cc mpsr_GetPoly.cc \
-    mpsr_Get.cc mpsr_GetMisc.cc mpsr_Error.cc \
     GMPrat.cc multicnt.cc npolygon.cc semic.cc spectrum.cc splist.cc \
-    ndbm.cc  libparse.cc mod_raw.cc \
+    libparse.cc mod_raw.cc \
     pcv.cc kbuckets.cc\
     mpr_inout.cc mpr_base.cc mpr_numeric.cc \
@@ -109 +111 @@
     pShallowCopyDelete.cc 
 
+# stuff for MP
+MPSR_SOURCES = mpsr_Put.cc mpsr_PutPoly.cc mpsr_GetPoly.cc mpsr_sl.cc\
+        mpsr_Get.cc mpsr_GetMisc.cc mpsr_Error.cc \
+
+# stuff for dbm
+DBMSR_SOURCES =  ndbm.cc sing_dbm.cc
+
 # normal C source files
 CSOURCES=weight0.c fegetopt.c fereadl.c page.c feOpenWinntUrl.c dError.c mmstd.c
 
-
 # C++ sources which are used if part of the kernel are dynamically linked
-DL_KERNEL_SOURCES=p_Procs_Dynamic.cc 
+DL_KERNEL_SOURCES=p_Procs_Dynamic.cc slInit_Dynamic.cc 
 
 # C++ sources which are used for dynamic libraries if part of the kernel is
 # dynamically linked
-DL_LIB_SOURCES=p_Procs_Lib.cc
+DL_LIB_SOURCES=p_Procs_Lib.cc 
 
 # C++ sources which are used if no parts of the kernel are dynamically linked
-STATIC_SOURCES=p_Procs_Static.cc
+STATIC_SOURCES=p_Procs_Static.cc slInit_Static.cc 
+
+# C++ sources for which both, shared and static object files are needed
+COMMON_SOURCES = $(MPSR_SOURCES) $(DBMSR_SOURCES)
 
 # special C++ source files (need extra compiling and/or linking), for which
 # dependencies should be generated
-ESOURCES=mmalloc.cc iparith.cc \
-        $(DL_KERNEL_SOURCES) $(DL_LIB_SOURCES) $(STATIC_SOURCES)
-
-SOURCES=${CSOURCES} ${CXXSOURCES} ${ESOURCES} \
+ESOURCES=mmalloc.cc iparith.cc $(COMMON_SOURCES) \
+        $(DL_KERNEL_SOURCES) $(DL_LIB_SOURCES) $(STATIC_SOURCES) 
+
+SOURCES=${CSOURCES} ${CXXSOURCES} \
         grammar.y scanner.l libparse.l syz2.cc prCopyTemplate.cc \
         p_Delete__Template.cc p_ShallowCopyDelete__Template.cc \
@@ -149 +160 @@
         ffields.h khstd.h silink.h sparsmat.h gnumpfl.h gnumpc.h \
         fglm.h kstd1.h modulop.h sing_dbm.h weight.h \
-        fglmgauss.h fglmvec.h mpsr.h sing_mp.h \
+        fglmgauss.h fglmvec.h mpsr.h mpsr_sl.h\
         kstdfac.h mpsr_Get.h kmatrix.h\
         kutil.h mpsr_Put.h\
-        ndbm.h polys-impl.h libparse.h \
+        ndbm.h dbm_sl.h polys-impl.h libparse.h \
         GMPrat.h multicnt.h npolygon.h semic.h spectrum.h splist.h multicnt.h \
         pcv.h mod_raw.h kbuckets.h \
@@ -174 +185 @@
 endif
 
+P_PROCS_MODULES = FieldZp FieldIndep FieldQ FieldGeneral
+
 ifeq ($(DL_KERNEL),1)
-OBJS := $(OBJS) $(DL_KERNEL_SOURCES:.cc=.o)
-DL_LIBS=p_Procs.so
+OBJS    := $(OBJS) $(DL_KERNEL_SOURCES:.cc=.o)
+DBMSR_SO= dbmsr.so
+DL_LIBS := $(P_PROCS_MODULES:%=p_Procs_%.so) $(DBMSR_SO)
+ifeq ($(HAVE_MPSR), 1)
+MPSR_SO =       mpsr.so
+DL_LIBS :=      $(DL_LIBS) $(MPSR_SO)
+endif
 else
-OBJS := $(OBJS) $(STATIC_SOURCES:.cc=.o)
+ifndef LD_STATIC
+LIBS := $(MP_LIBS) $(LIBS)
+endif
+OBJS := $(OBJS) $(STATIC_SOURCES:.cc=.o) $(COMMON_SOURCES:.c=.o)
 DL_LIBS=
 endif
@@ -225 +246 @@
 
 # building objects for shared libraries
+p_Procs_Lib_%.dl_o : p_Procs_Lib.cc p_Procs_Dynamic.o 
+        ${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} ${SFLAGS} -Dp_Procs_$* -c $< -o $@
+
 %.dl_o : %.cc
         ${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} ${SFLAGS} -c $< -o $@
@@ -231 +255 @@
 all:    $(SING_EXEC)
 
-Singular-static: mod2.h Makefile version.h scanner.cc \
-          ${OBJS} iparith.o tesths.cc libparse.cc claptmpl.o mpsr_Tok.o
+Singular-static: version.h
         sleep 1
         echo "#define HAVE_STATIC" > static.h
-        ${MAKE} LD_STATIC=1 Singular
+        ${MAKE} LD_STATIC=1 S_EXT="-static" Singular-static
         echo "#undef HAVE_STATIC" > static.h
-        ${INSTALL_PROGRAM} Singular Singular-static
-
-Singular: mod2.h Makefile version.h scanner.cc  ${OBJS} mmalloc.o \
+
+Singular${S_EXT}: mod2.h Makefile version.h scanner.cc  ${OBJS} mmalloc.o \
           iparith.o tesths.cc libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS)
         ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} \
-          -o Singular \
+          -o Singular${S_EXT} \
           tesths.cc iparith.o mpsr_Tok.o claptmpl.o\
           ${OBJS} ${LDFLAGS} ${LIBS} -lomalloc_ndebug mmalloc.o
 
 %.static: version.h
-        test -r $* && cp $* save_$*
-        ${MAKE} DL_KERNEL=0 $*
-        ${INSTALL_PROGRAM} $* $*.static
-        rm -f $*
-        test -r save_$* && mv save_$* $*
+        ${MAKE} DL_KERNEL=0 S_EXT=".static" $@
 
 iparith.o mpsr_Tok.o : iparith.inc mpsr_Tok.inc
@@ -325 +343 @@
 p_Procs_Static.o: p_Procs_Static.inc 
 p_Procs_Static.inc: p_Procs_Static.h 
-p_Procs_Dynamic.o: p_Procs_Dynamic.inc
-p_Procs_Lib.o: p_Procs_Lib.inc
+p_Procs_Dynamic.o p_Procs_Lib.o: p_Procs_Dynamic.inc
 p_Procs_Dynamic.inc p_Procs_Lib.inc: p_Procs_Dynamic.h
 
-# here is how p_Procs_[Static|Dynamic|Lib].inc is generated
-p_Procs_%.inc: 
+# here is how p_Procs_[Static|Dynamic].inc is generated
+p_Procs_%.inc: p_Procs_Generate.cc p_Procs_Impl.h mod2.h 
         $(CXX) -g -Wall -Dp_Procs_$* p_Procs_Generate.cc -o p_Procs_$*
         ./p_Procs_$* > p_Procs_$*.inc
 
 
-p_Procs.so: p_Procs_Lib.dl_o
+p_Procs_%.so: p_Procs_Lib_%.dl_o
         ${CXX} ${CXXFLAGS} ${SFLAGS} ${SLDFLAGS} $< -o $@
+
+mpsr.so: $(MPSR_SOURCES:.cc=.dl_o)
+        ${CXX} ${CXXFLAGS} ${SFLAGS} ${SLDFLAGS} ${LDFLAGS} -o $@ $^ ${MP_LIBS}
+
+dbmsr.so: $(DBMSR_SOURCES:.cc=.dl_o)
+        ${CXX} ${CXXFLAGS} ${SFLAGS} ${SLDFLAGS} ${LDFLAGS} -o $@ $^ ${MP_LIBS}
 
 src: scanner.cc grammar.h grammar.cc libparse.cc 
@@ -511 +534 @@
 OBJA=$(OBJA1) $(OBJA2)
 
+DL_TAILG=\"sog\"
+DL_TAILP=\"sop\"
+DL_TAILB=\"sob\"
+DL_TAILT=\"sot\"
+DL_TAILA=\"soa\"
+
+
 ifeq ($(DL_KERNEL),1)
 
 OBJG := $(OBJG) $(DL_KERNEL_SOURCES:.cc=.og)
-DL_LIBSG=p_Procs.sog
-DL_TAILG=\"sog\"
+DL_LIBSG := $(P_PROCS_MODULES:%=p_Procs_%.sog) $(MPSR_SO:%.so=%.sog) $(DBMSR_SO:%.so=%.sog)
 
 OBJP := $(OBJP) $(DL_KERNEL_SOURCES:.cc=.op)
-DL_LIBSP=p_Procs.sop
-DL_TAILP=\"sop\"
+DL_LIBSP := $(P_PROCS_MODULES:%=p_Procs_%.sop) $(MPSR_SO:%.so=%.sop) $(DBMSR_SO:%.so=%.sop)
 
 OBJB := $(OBJB) $(DL_KERNEL_SOURCES:.cc=.ob)
-DL_LIBSB=p_Procs.sob
-DL_TAILB=\"sob\"
+DL_LIBSB := $(P_PROCS_MODULES:%=p_Procs_%.sob) $(MPSR_SO:%.so=%.sob) $(DBMSR_SO:%.so=%.sob)
 
 OBJT := $(OBJT) $(DL_KERNEL_SOURCES:.cc=.ot)
-DL_LIBST=p_Procs.sot
-DL_TAILT=\"sot\"
+DL_LIBST := $(P_PROCS_MODULES:%=p_Procs_%.sot) $(MPSR_SO:%.so=%.sot) $(DBMSR_SO:%.so=%.sot)
 
 OBJA := $(OBJA) $(DL_KERNEL_SOURCES:.cc=.oa)
-DL_LIBSA=p_Procs.soa
-DL_TAILA=\"soa\"
+DL_LIBSA := $(P_PROCS_MODULES:%=p_Procs_%.soa) $(MPSR_SO:%.so=%.soa) $(DBMSR_SO:%.so=%.soa)
 
 else
 
-OBJG := $(OBJG) $(STATIC_SOURCES:.cc=.og)
+OBJG := $(OBJG) $(STATIC_SOURCES:.cc=.og) $(COMMON_SOURCES:.cc=.og)
 DL_LIBSG=
 
-OBJP := $(OBJP) $(STATIC_SOURCES:.cc=.op)
+OBJP := $(OBJP) $(STATIC_SOURCES:.cc=.op) $(COMMON_SOURCES:.cc=.op)
 DL_LIBSP=
 
-OBJB := $(OBJB) $(STATIC_SOURCES:.cc=.ob)
+OBJB := $(OBJB) $(STATIC_SOURCES:.cc=.ob) $(COMMON_SOURCES:.cc=.ob)
 DL_LIBSB=
 
-OBJT := $(OBJT) $(STATIC_SOURCES:.cc=.ot)
+OBJT := $(OBJT) $(STATIC_SOURCES:.cc=.ot) $(COMMON_SOURCES:.cc=.ot)
 DL_LIBST=
 
-OBJA := $(OBJA) $(STATIC_SOURCES:.cc=.oa)
+OBJA := $(OBJA) $(STATIC_SOURCES:.cc=.oa) $(COMMON_SOURCES:.cc=.oa)
 DL_LIBST=
 
@@ -571 +596 @@
 ##
 
-p_Procs.sog: p_Procs_Lib.dl_og
+p_Procs_%.sog: p_Procs_Lib_%.dl_og 
         ${CXXG} ${CXXFLAGSG} ${SFLAGS} ${SLDFLAGS} $< -o $@
 
+p_Procs_Lib_%.dl_og : p_Procs_Lib.cc  p_Procs_Dynamic.og
+        ${CXX} ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} ${SFLAGS} -Dp_Procs_$* -c $< -o $@
 
 %.dl_og: %.cc
         ${CXXG} ${CXXFLAGSG} ${CXXTEMPLFLAGSG} ${CPPFLAGS} ${DEFSG} ${SFLAGS} -c $< -o $@
 
+mpsr.sog: $(MPSR_SOURCES:.cc=.dl_og)
+        ${CXXG} ${CXXFLAGSG} ${SFLAGS} ${SLDFLAGS} ${LDFLAGS} -o $@ $^ ${MP_LIBS}
+
+dbmsr.sog: $(DBMSR_SOURCES:.cc=.dl_og)
+        ${CXXG} ${CXXFLAGSG} ${SFLAGS} ${SLDFLAGS} ${LDFLAGS} -o $@ $^ ${MP_LIBS}
+
 claptmpl.og: claptmpl.cc mod2.h
         $(CXXG)  ${CXXFLAGSG} ${CPPFLAGS} ${DEFSG} -c $< -o $@
@@ -587 +620 @@
         $(CCG)  ${CFLAGSG} ${CPPFLAGS} ${DEFSG} -c $< -o $@
 
-Singularg: scanner.cc  $(OBJG)  mmalloc.og $(DL_LIBSG)\
+Singularg${S_EXT}: scanner.cc  $(OBJG)  mmalloc.og $(DL_LIBSG)\
            iparith.og mpsr_Tok.og claptmpl.og tesths.cc version.h 
-        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGSG} ${CPPFLAGS} ${DEFSG} -o Singularg \
+        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGSG} ${CPPFLAGS} ${DEFSG} -o Singularg${S_EXT} \
         tesths.cc iparith.og mpsr_Tok.og claptmpl.og $(OBJG) ${LDFLAGS} ${LIBS} -lomalloc mmalloc.og \
         ${LD_DYN_FLAGS} ${LD_LIBC}
@@ -644 +677 @@
 
 ## for gprof
-p_Procs.sop: p_Procs_Lib.dl_op
+p_Procs_%.sop: p_Procs_Lib_%.dl_op
         ${CXXP} ${CXXFLAGSP} ${SFLAGS} ${SLDFLAGS} $< -o $@
+
+p_Procs_Lib_%.dl_op : p_Procs_Lib.cc p_Procs_Dynamic.op
+        ${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} ${SFLAGS} -Dp_Procs_$* -c $< -o $@
 
 %.dl_op: %.cc
@@ -651 +687 @@
 
 
+mpsr.sop: $(MPSR_SOURCES:.cc=.dl_op)
+        ${CXXP} ${CXXFLAGSP} ${SFLAGS} ${SLDFLAGS} ${LDFLAGS} -o $@ $^ ${MP_LIBS}
+
+dbmsr.sop: $(DBMSR_SOURCES:.cc=.dl_op)
+        ${CXXP} ${CXXFLAGSP} ${SFLAGS} ${SLDFLAGS} ${LDFLAGS} -o $@ $^ ${MP_LIBS}
+
 claptmpl.op: claptmpl.cc mod2.h
         $(CXXP)  ${CXXFLAGSP} ${CPPFLAGS} ${DEFSP} -c $< -o $@
@@ -660 +702 @@
         $(CCP)  ${CFLAGSP} ${CPPFLAGS} ${DEFSP} -c $< -o $@
 
-Singularp: scanner.cc   $(OBJP) mmalloc.op\
+Singularp${S_EXT}: scanner.cc   $(OBJP) mmalloc.op\
            iparith.op mpsr_Tok.op claptmpl.op tesths.cc version.h $(DL_LIBSP)
-        $(CXXP) ${CXXFLAGSP} ${CXXTEMPLFLAGSP} ${CPPFLAGS} ${DEFSP} -o Singularp \
+        $(CXXP) ${CXXFLAGSP} ${CXXTEMPLFLAGSP} ${CPPFLAGS} ${DEFSP} -o Singularp${S_EXT} \
         tesths.cc iparith.op mpsr_Tok.op claptmpl.op $(OBJP) ${LDFLAGSP} ${LIBS} -lomalloc_p mmalloc.op\
         ${LD_DYN_FLAGS} 
@@ -674 +716 @@
 
 ## for bprof
-p_Procs.sob: p_Procs_Lib.dl_ob
+p_Procs_%.sob: p_Procs_Lib_%.dl_ob
         ${CXXP} ${CXXFLAGSB} ${SFLAGS} ${SLDFLAGS} $< -o $@
 
+p_Procs_Lib_%.dl_ob : p_Procs_Lib.cc  p_Procs_Dynamic.ob
+        ${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} ${SFLAGS} -Dp_Procs_$* -c $< -o $@
 
 %.dl_ob: %.cc
         ${CXXP} ${CXXFLAGSB} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSB} ${SFLAGS} -c $< -o $@
 
+mpsr.sob: $(MPSR_SOURCES:.cc=.dl_ob)
+        ${CXXP} ${CXXFLAGSB} ${SFLAGS} ${SLDFLAGS} ${LDFLAGS} -o $@ $^ ${MP_LIBS}
+
+dbmsr.sob: $(DBMSR_SOURCES:.cc=.dl_ob)
+        ${CXXP} ${CXXFLAGSB} ${SFLAGS} ${SLDFLAGS} ${LDFLAGS} -o $@ $^ ${MP_LIBS}
 
 claptmpl.ob: claptmpl.cc mod2.h
@@ -691 +740 @@
         $(CCP)  ${CFLAGSP} ${CPPFLAGS} ${DEFSB} -c $< -o $@
 
-Singularb: scanner.cc   $(OBJB) iparith.ob mpsr_Tok.ob claptmpl.ob tesths.cc version.h mmalloc.ob
-        $(CXXP) ${CXXFLAGSP} ${CPPFLAGS} ${DEFSB} -o Singularb \
+Singularb${S_EXT}: scanner.cc   $(OBJB) iparith.ob mpsr_Tok.ob claptmpl.ob tesths.cc version.h mmalloc.ob
+        $(CXXP) ${CXXFLAGSP} ${CPPFLAGS} ${DEFSB} -o Singularb${S_EXT} \
         tesths.cc iparith.ob mpsr_Tok.ob claptmpl.ob $(OBJB) $(BPROFOBJ) \
         ${LDFLAGSP} ${LIBS} -lomalloc_ndebug mmalloc.ob ${LD_DYN_FLAGS} 
@@ -705 +754 @@
 # for mtrack
 # 
-p_Procs.sot: p_Procs_Lib.dl_ot
-        ${CXXP} ${CXXFLAGST} ${SFLAGS} ${SLDFLAGS} $< -o $@
+p_Procs_%.sot: p_Procs_Lib_%.dl_ot 
+        ${CXX} ${CXXFLAGST} ${SFLAGS} ${SLDFLAGS} $< -o $@
+
+p_Procs_Lib_%.dl_ot : p_Procs_Lib.cc p_Procs_Dynamic.ot
+        ${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} ${SFLAGS} -Dp_Procs_$* -c $< -o $@
 
 %.dl_ot: %.cc
         ${CXXP} ${CXXFLAGST} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFST} ${SFLAGS} -c $< -o $@
 
+mpsr.sot: $(MPSR_SOURCES:.cc=.dl_ot)
+        ${CXX} ${CXXFLAGST} ${SFLAGS} ${SLDFLAGS} ${LDFLAGS} -o $@ $^ ${MP_LIBS}
+
+dbmsr.sot: $(DBMSR_SOURCES:.cc=.dl_ot)
+        ${CXX} ${CXXFLAGST} ${SFLAGS} ${SLDFLAGS} ${LDFLAGS} -o $@ $^ ${MP_LIBS}
 
 claptmpl.ot: claptmpl.cc mod2.h
@@ -721 +778 @@
         $(CCP)  ${CFLAGST} ${CPPFLAGS} ${DEFST} -c $< -o $@
 
-Singulart: scanner.cc   $(OBJT) iparith.ot mpsr_Tok.ot claptmpl.ot tesths.cc version.h  mmalloc.ot
-        $(CXXP) ${CXXFLAGST} ${CPPFLAGS} ${DEFST} -o Singulart \
+Singulart${S_EXT}: scanner.cc   $(OBJT) iparith.ot mpsr_Tok.ot claptmpl.ot tesths.cc version.h  mmalloc.ot
+        $(CXXP) ${CXXFLAGST} ${CPPFLAGS} ${DEFST} -o Singulart${S_EXT} \
         tesths.cc iparith.ot mpsr_Tok.ot claptmpl.ot $(OBJT) ${LDFLAGST} ${LIBS} -lomalloc mmalloc.ot \
         ${LD_DYN_FLAGS} 
@@ -740 +797 @@
 CXXFLAGSA       = -g  -O -Wall -Wno-unused ${PIPE}
 
-p_Procs.soa: p_Procs_Lib.dl_oa
+p_Procs_%.soa: p_Procs_Lib_%.dl_oa
         ${CXX} ${CXXFLAGSA} ${SFLAGS} ${SLDFLAGS} $< -o $@
+
+p_Procs_Lib_%.dl_oa : p_Procs_Lib.cc p_Procs_Dynamic.oa
+        ${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} ${SFLAGS} -Dp_Procs_$* -c $< -o $@
 
 %.dl_oa: %.cc
         ${CXX} ${CXXFLAGSA} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSA} ${SFLAGS} -c $< -o $@
 
+mpsr.soa: $(MPSR_SOURCES:.cc=.dl_oa)
+        ${CXX} ${CXXFLAGSA} ${SFLAGS} ${SLDFLAGS} ${LDFLAGS} -o $@ $^ ${MP_LIBS}
+
+dbmsr.soa: $(DBMSR_SOURCES:.cc=.dl_oa)
+        ${CXX} ${CXXFLAGSA} ${SFLAGS} ${SLDFLAGS} ${LDFLAGS} -o $@ $^ ${MP_LIBS}
+
+
 claptmpl.oa: claptmpl.cc mod2.h
         $(CXX)  ${CXXFLAGSA} ${CPPFLAGS} ${DEFSA} -c $< -o $@
@@ -755 +822 @@
         $(CCP)  ${CFLAGSA} ${CPPFLAGS} ${DEFSA} -c $< -o $@
 
-Singulara: scanner.cc   $(OBJA) iparith.oa mpsr_Tok.oa claptmpl.oa tesths.cc version.h  mmalloc.oa $(DL_LIBSA)
-        $(CXXP) ${CXXFLAGSA} ${CPPFLAGS} ${DEFSA} -o Singulara \
+Singulara${S_EXT}: scanner.cc   $(OBJA) iparith.oa mpsr_Tok.oa claptmpl.oa tesths.cc version.h  mmalloc.oa $(DL_LIBSA)
+        $(CXXP) ${CXXFLAGSA} ${CPPFLAGS} ${DEFSA} -o Singulara${S_EXT} \
         tesths.cc iparith.oa mpsr_Tok.oa claptmpl.oa $(OBJA) ${LDFLAGS} ${LIBS} -lomalloc mmalloc.oa \
         ${LD_DYN_FLAGS} 
@@ -808 +875 @@
 
 %.d: %.c mod2.h 
-        echo $(@:.d=.og) $(@:.d=.od) $(@:.dd=_d.c) $(@:.d=.op) $(@:.d=.ob) $(@:.d=.ot) $(@:.dd=.oa)" " \\ > $@
+        echo $(@:.d=.og) $(@:.d=.od) $(@:.dd=_d.c) $(@:.d=.op) $(@:.d=.ob) $(@:.d=.ot) $(@:.d=.oa)" " \\ > $@
         $(CCM) ${CPPFLAGS} ${DEFSG} $< >> $@
 

Singular/configure

@@ -1593 +1593 @@
 fi
 
+SAVE_LIBS=${LIBS}
+LIBS=
 echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6
-echo "configure:1597: checking for socket in -lbsd" >&5
+echo "configure:1599: checking for socket in -lbsd" >&5
 ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1602 +1604 @@
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1605 "configure"
+#line 1607 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1613 +1615 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1641 +1643 @@
 
 echo $ac_n "checking for listen in -lsocket""... $ac_c" 1>&6
-echo "configure:1644: checking for listen in -lsocket" >&5
+echo "configure:1646: checking for listen in -lsocket" >&5
 ac_lib_var=`echo socket'_'listen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1649 +1651 @@
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1652 "configure"
+#line 1654 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1660 +1662 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1688 +1690 @@
 
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:1691: checking for gethostbyname in -lnsl" >&5
+echo "configure:1693: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1696 +1698 @@
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1699 "configure"
+#line 1701 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1707 +1709 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1735 +1737 @@
 
 echo $ac_n "checking for index in -lucb""... $ac_c" 1>&6
-echo "configure:1738: checking for index in -lucb" >&5
+echo "configure:1740: checking for index in -lucb" >&5
 ac_lib_var=`echo ucb'_'index | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1743 +1745 @@
 LIBS="-lucb  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1746 "configure"
+#line 1748 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1754 +1756 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1781 +1783 @@
 fi
 
+MP_LIBS=${LIBS}
+LIBS=
 
 # check for dl lib
@@ -1786 +1790 @@
         HPUX*)
           echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:1789: checking for shl_load in -ldld" >&5
+echo "configure:1793: checking for shl_load in -ldld" >&5
 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1794 +1798 @@
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1797 "configure"
+#line 1801 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1805 +1809 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1841 +1845 @@
         *Linux*)
           echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:1844: checking for dlopen in -ldl" >&5
+echo "configure:1848: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1849 +1853 @@
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1852 "configure"
+#line 1856 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1860 +1864 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1898 +1902 @@
 
 
+LIBS=${SAVE_LIBS}
 
 # heder file checks
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1904: checking for ANSI C header files" >&5
+echo "configure:1909: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1909 "configure"
+#line 1914 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -1914 +1919 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -1931 +1936 @@
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1934 "configure"
+#line 1939 "configure"
 #include "confdefs.h"
 #include <string.h>
@@ -1949 +1954 @@
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1952 "configure"
+#line 1957 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -1970 +1975 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1973 "configure"
+#line 1978 "configure"
 #include "confdefs.h"
 #include <ctype.h>
@@ -1981 +1986 @@
 
 EOF
-if { (eval echo configure:1984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
@@ -2008 +2013 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2011: checking for $ac_hdr" >&5
+echo "configure:2016: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2016 "configure"
+#line 2021 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -2050 +2055 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2053: checking for $ac_hdr" >&5
+echo "configure:2058: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2058 "configure"
+#line 2063 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -2089 +2094 @@
 # typedefs, structures
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2092: checking for working const" >&5
+echo "configure:2097: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2097 "configure"
+#line 2102 "configure"
 #include "confdefs.h"
 
@@ -2143 +2148 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
@@ -2164 +2169 @@
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2167: checking for inline" >&5
+echo "configure:2172: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2171 +2176 @@
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 2174 "configure"
+#line 2179 "configure"
 #include "confdefs.h"
 
@@ -2178 +2183 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
@@ -2204 +2209 @@
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2207: checking for size_t" >&5
+echo "configure:2212: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2212 "configure"
+#line 2217 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2237 +2242 @@
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2240: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2245: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2245 "configure"
+#line 2250 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2251 +2256 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
@@ -2272 +2277 @@
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:2275: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:2280: checking whether struct tm is in sys/time.h or time.h" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2280 "configure"
+#line 2285 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2285 +2290 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
@@ -2310 +2315 @@
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:2313: checking for working alloca.h" >&5
+echo "configure:2318: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2318 "configure"
+#line 2323 "configure"
 #include "confdefs.h"
 #include <alloca.h>
@@ -2322 +2327 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
@@ -2343 +2348 @@
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2346: checking for alloca" >&5
+echo "configure:2351: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2351 "configure"
+#line 2356 "configure"
 #include "confdefs.h"
 
@@ -2376 +2381 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
@@ -2408 +2413 @@
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2411: checking whether alloca needs Cray hooks" >&5
+echo "configure:2416: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2416 "configure"
+#line 2421 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
@@ -2438 +2443 @@
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2441: checking for $ac_func" >&5
+echo "configure:2446: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2446 "configure"
+#line 2451 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2466 +2471 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -2493 +2498 @@
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2496: checking stack direction for C alloca" >&5
+echo "configure:2501: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2501 +2506 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2504 "configure"
+#line 2509 "configure"
 #include "confdefs.h"
 find_stack_direction ()
@@ -2520 +2525 @@
 }
 EOF
-if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
@@ -2543 +2548 @@
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:2546: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:2551: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2549 +2554 @@
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 2552 "configure"
+#line 2557 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
@@ -2567 +2572 @@
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 2570 "configure"
+#line 2575 "configure"
 #include "confdefs.h"
 #include <termio.h>
@@ -2592 +2597 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2595: checking for $ac_hdr" >&5
+echo "configure:2600: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2600 "configure"
+#line 2605 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -2631 +2636 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2634: checking for $ac_func" >&5
+echo "configure:2639: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2639 "configure"
+#line 2644 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2659 +2664 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -2684 +2689 @@
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2687: checking for working mmap" >&5
+echo "configure:2692: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2692 +2697 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2695 "configure"
+#line 2700 "configure"
 #include "confdefs.h"
 
@@ -2832 +2837 @@
 
 EOF
-if { (eval echo configure:2835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
@@ -2855 +2860 @@
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2858: checking return type of signal handlers" >&5
+echo "configure:2863: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2863 "configure"
+#line 2868 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2877 +2882 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
@@ -2896 +2901 @@
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:2899: checking for vprintf" >&5
+echo "configure:2904: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2904 "configure"
+#line 2909 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2924 +2929 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
@@ -2948 +2953 @@
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:2951: checking for _doprnt" >&5
+echo "configure:2956: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2956 "configure"
+#line 2961 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2976 +2981 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
@@ -3003 +3008 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3006: checking for $ac_func" >&5
+echo "configure:3011: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3011 "configure"
+#line 3016 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -3031 +3036 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -3059 +3064 @@
 # arithmetic shifts
 echo $ac_n "checking whether your machine has correct arithmetic shifts""... $ac_c" 1>&6
-echo "configure:3062: checking whether your machine has correct arithmetic shifts" >&5
+echo "configure:3067: checking whether your machine has correct arithmetic shifts" >&5
 if eval "test \"`echo '$''{'ac_cv_shift'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3072 +3077 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3075 "configure"
+#line 3080 "configure"
 #include "confdefs.h"
  int main() { if (-2 >> 1 == -1) exit(0); else exit(1); } 
 EOF
-if { (eval echo configure:3079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_shift=yes
@@ -3101 +3106 @@
 # check for a peculiar constructor initialization
 echo $ac_n "checking whether explicit C++ constructor calls are allowed""... $ac_c" 1>&6
-echo "configure:3104: checking whether explicit C++ constructor calls are allowed" >&5
+echo "configure:3109: checking whether explicit C++ constructor calls are allowed" >&5
 
 ac_ext=C
@@ -3114 +3119 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3117 "configure"
+#line 3122 "configure"
 #include "confdefs.h"
 
@@ -3132 +3137 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_explicit_const=yes
@@ -3161 +3166 @@
 # sprintf returns number of printed chars
 echo $ac_n "checking whether vsprintf returns number of printed chars""... $ac_c" 1>&6
-echo "configure:3164: checking whether vsprintf returns number of printed chars" >&5
+echo "configure:3169: checking whether vsprintf returns number of printed chars" >&5
 if eval "test \"`echo '$''{'ac_cv_returns_n_of_chars'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3169 +3174 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3172 "configure"
+#line 3177 "configure"
 #include "confdefs.h"
 #include <stdio.h>
  main() { char *str=(char*)malloc(20); if (((int) sprintf(str,"123456789")) == 9) exit(0); else exit(1); }
 EOF
-if { (eval echo configure:3177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_returns_n_of_chars=yes
@@ -3200 +3205 @@
 # determine ALIGN_8
 echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:3203: checking size of char" >&5
+echo "configure:3208: checking size of char" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3208 +3213 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3211 "configure"
+#line 3216 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3219 +3224 @@
 }
 EOF
-if { (eval echo configure:3222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_char=`cat conftestval`
@@ -3239 +3244 @@
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:3242: checking size of short" >&5
+echo "configure:3247: checking size of short" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3247 +3252 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3250 "configure"
+#line 3255 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3258 +3263 @@
 }
 EOF
-if { (eval echo configure:3261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_short=`cat conftestval`
@@ -3278 +3283 @@
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:3281: checking size of int" >&5
+echo "configure:3286: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3286 +3291 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3289 "configure"
+#line 3294 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3297 +3302 @@
 }
 EOF
-if { (eval echo configure:3300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
@@ -3317 +3322 @@
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:3320: checking size of long" >&5
+echo "configure:3325: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3325 +3330 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3328 "configure"
+#line 3333 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3336 +3341 @@
 }
 EOF
-if { (eval echo configure:3339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
@@ -3356 +3361 @@
 
 echo $ac_n "checking size of void*""... $ac_c" 1>&6
-echo "configure:3359: checking size of void*" >&5
+echo "configure:3364: checking size of void*" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_voidp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3364 +3369 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3367 "configure"
+#line 3372 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3375 +3380 @@
 }
 EOF
-if { (eval echo configure:3378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_voidp=`cat conftestval`
@@ -3395 +3400 @@
 
 echo $ac_n "checking size of double""... $ac_c" 1>&6
-echo "configure:3398: checking size of double" >&5
+echo "configure:3403: checking size of double" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3403 +3408 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3406 "configure"
+#line 3411 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3414 +3419 @@
 }
 EOF
-if { (eval echo configure:3417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_double=`cat conftestval`
@@ -3434 +3439 @@
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3437: checking whether byte ordering is bigendian" >&5
+echo "configure:3442: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3441 +3446 @@
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 3444 "configure"
+#line 3449 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -3452 +3457 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 3459 "configure"
+#line 3464 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -3467 +3472 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
@@ -3487 +3492 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3490 "configure"
+#line 3495 "configure"
 #include "confdefs.h"
 main () {
@@ -3500 +3505 @@
 }
 EOF
-if { (eval echo configure:3503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian=no
@@ -3618 +3623 @@
 
 echo $ac_n "checking whether to use dynamic linking""... $ac_c" 1>&6
-echo "configure:3621: checking whether to use dynamic linking" >&5
+echo "configure:3626: checking whether to use dynamic linking" >&5
 if test "$with_dl" != no && test "$ac_lib_dl" = yes; then
   cat >> confdefs.h <<\EOF
@@ -3631 +3636 @@
 
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:3634: checking for tgetent in -lncurses" >&5
+echo "configure:3639: checking for tgetent in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3639 +3644 @@
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3642 "configure"
+#line 3647 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3650 +3655 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3677 +3682 @@
 \
  echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:3680: checking for tgetent in -lcurses" >&5
+echo "configure:3685: checking for tgetent in -lcurses" >&5
 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3685 +3690 @@
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3688 "configure"
+#line 3693 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3696 +3701 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3723 +3728 @@
 \
   echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:3726: checking for tgetent in -ltermcap" >&5
+echo "configure:3731: checking for tgetent in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3731 +3736 @@
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3734 "configure"
+#line 3739 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3742 +3747 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3775 +3780 @@
 
 # readline
-if test "$with_readline" = dynamic && test "$ac_cv_have_dl" != yes; then
+if test "$with_readline" = dynamic && test "$ac_have_dl" != yes; then
   echo "configure: warning: can not build dynamic readline without dynamic linking" 1>&2
   with_readline=static
@@ -3791 +3796 @@
 
    echo $ac_n "checking for rl_abort in -lreadline""... $ac_c" 1>&6
-echo "configure:3794: checking for rl_abort in -lreadline" >&5
+echo "configure:3799: checking for rl_abort in -lreadline" >&5
 ac_lib_var=`echo readline'_'rl_abort | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3799 +3804 @@
 LIBS="-lreadline  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3802 "configure"
+#line 3807 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3813 +3818 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3841 +3846 @@
 
    echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:3844: checking how to run the C++ preprocessor" >&5
+echo "configure:3849: checking how to run the C++ preprocessor" >&5
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
@@ -3854 +3859 @@
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
-#line 3857 "configure"
+#line 3862 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -3887 +3892 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3890: checking for $ac_hdr" >&5
+echo "configure:3895: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3895 "configure"
+#line 3900 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -3926 +3931 @@
       test "$ac_cv_header_readline_readline_h" = yes; then
      echo $ac_n "checking whether readline.h is ok""... $ac_c" 1>&6
-echo "configure:3929: checking whether readline.h is ok" >&5
+echo "configure:3934: checking whether readline.h is ok" >&5
      if eval "test \"`echo '$''{'ac_cv_header_readline_readline_h_ok'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3934 "configure"
+#line 3939 "configure"
 #include "confdefs.h"
 #include<unistd.h>
@@ -3956 +3961 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_readline_readline_h_ok="yes"
@@ -3972 +3977 @@
 #not ok -- try once more with explicitly declaring everything
       echo $ac_n "checking whether or not we nevertheless can use readline""... $ac_c" 1>&6
-echo "configure:3975: checking whether or not we nevertheless can use readline" >&5
+echo "configure:3980: checking whether or not we nevertheless can use readline" >&5
       if eval "test \"`echo '$''{'ac_cv_have_readline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3980 "configure"
+#line 3985 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -4011 +4016 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_have_readline="yes"
@@ -4050 +4055 @@
 
 echo $ac_n "checking which readline to use""... $ac_c" 1>&6
-echo "configure:4053: checking which readline to use" >&5
+echo "configure:4058: checking which readline to use" >&5
 if test "$ac_cv_with_readline" = dynamic; then
   echo "$ac_t""dynamic" 1>&6
@@ -4068 +4073 @@
 # gmp, smallgmp, MP, MPT, factory, libfac
 echo $ac_n "checking for main in -lgmp""... $ac_c" 1>&6
-echo "configure:4071: checking for main in -lgmp" >&5
+echo "configure:4076: checking for main in -lgmp" >&5
 ac_lib_var=`echo gmp'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4076 +4081 @@
 LIBS="-lgmp  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4079 "configure"
+#line 4084 "configure"
 #include "confdefs.h"
 
@@ -4083 +4088 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4111 +4116 @@
 
 if test "ac_cv_lib_gmp_main" = yes && test "$with-apint" = smallgmp; then
-  LIBS=NEED_LIBS
+  LIBS=${NEED_LIBS}
 fi
 echo $ac_n "checking for main in -lsmallgmp""... $ac_c" 1>&6
-echo "configure:4117: checking for main in -lsmallgmp" >&5
+echo "configure:4122: checking for main in -lsmallgmp" >&5
 ac_lib_var=`echo smallgmp'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4122 +4127 @@
 LIBS="-lsmallgmp  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4125 "configure"
+#line 4130 "configure"
 #include "confdefs.h"
 
@@ -4129 +4134 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4156 +4161 @@
 fi
 
+SAVE_LIBS=$LIBS
 echo $ac_n "checking for IMP_PutGmpInt in -lMP""... $ac_c" 1>&6
-echo "configure:4160: checking for IMP_PutGmpInt in -lMP" >&5
+echo "configure:4166: checking for IMP_PutGmpInt in -lMP" >&5
 ac_lib_var=`echo MP'_'IMP_PutGmpInt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4163 +4169 @@
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lMP  $LIBS"
+LIBS="-lMP $MP_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4168 "configure"
+#line 4174 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4176 +4182 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4203 +4209 @@
 fi
 
-echo $ac_n "checking for MPT_GetTre in -lMPT""... $ac_c" 1>&6
-echo "configure:4207: checking for MPT_GetTre in -lMPT" >&5
-ac_lib_var=`echo MPT'_'MPT_GetTre | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for MPT_GetTree in -lMPT""... $ac_c" 1>&6
+echo "configure:4213: checking for MPT_GetTree in -lMPT" >&5
+ac_lib_var=`echo MPT'_'MPT_GetTree | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lMPT  $LIBS"
+LIBS="-lMPT $MP_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4215 "configure"
+#line 4221 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char MPT_GetTre();
+char MPT_GetTree();
 
 int main() {
-MPT_GetTre()
+MPT_GetTree()
 ; return 0; }
 EOF
-if { (eval echo configure:4226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4250 +4256 @@
 fi
 
+LIBS=$SAVE_LIBS
 echo $ac_n "checking for atof in -lsingcf""... $ac_c" 1>&6
-echo "configure:4254: checking for atof in -lsingcf" >&5
+echo "configure:4261: checking for atof in -lsingcf" >&5
 ac_lib_var=`echo singcf'_'atof | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4259 +4266 @@
 LIBS="-lsingcf  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4262 "configure"
+#line 4269 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4270 +4277 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4298 +4305 @@
 
 echo $ac_n "checking for atof in -lsingfac""... $ac_c" 1>&6
-echo "configure:4301: checking for atof in -lsingfac" >&5
+echo "configure:4308: checking for atof in -lsingfac" >&5
 ac_lib_var=`echo singfac'_'atof | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4306 +4313 @@
 LIBS="-lsingfac  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4309 "configure"
+#line 4316 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4317 +4324 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4345 +4352 @@
 
 echo $ac_n "checking for omTestAddr in -lomalloc""... $ac_c" 1>&6
-echo "configure:4348: checking for omTestAddr in -lomalloc" >&5
+echo "configure:4355: checking for omTestAddr in -lomalloc" >&5
 ac_lib_var=`echo omalloc'_'omTestAddr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4353 +4360 @@
 LIBS="-lomalloc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4356 "configure"
+#line 4363 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4364 +4371 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4392 +4399 @@
 
 echo $ac_n "checking for main in -lomalloc_ndebug""... $ac_c" 1>&6
-echo "configure:4395: checking for main in -lomalloc_ndebug" >&5
+echo "configure:4402: checking for main in -lomalloc_ndebug" >&5
 ac_lib_var=`echo omalloc_ndebug'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4400 +4407 @@
 LIBS="-lomalloc_ndebug  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4403 "configure"
+#line 4410 "configure"
 #include "confdefs.h"
 
@@ -4407 +4414 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4439 +4446 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4442: checking for $ac_hdr" >&5
+echo "configure:4449: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4447 "configure"
+#line 4454 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4459: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -4518 +4525 @@
 
 echo $ac_n "checking which apint package to use""... $ac_c" 1>&6
-echo "configure:4521: checking which apint package to use" >&5
+echo "configure:4528: checking which apint package to use" >&5
 if test "${with_apint}" != gmp && test "${with_apint}" != smallgmp; then
   if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
@@ -4560 +4567 @@
 #
 echo $ac_n "checking whether to have MP""... $ac_c" 1>&6
-echo "configure:4563: checking whether to have MP" >&5
+echo "configure:4570: checking whether to have MP" >&5
 if test "${with_MP}" != yes && test "${with_MP}" != no; then
   if (test "${will_have_gmp}" = yes) && \
@@ -4569 +4576 @@
 EOF
 
-    NEED_LIBS="-lMPT -lMP ${NEED_LIBS}"
+    HAVE_MPSR=1
+    MP_LIBS="-lMPT -lMP ${MP_LIBS}"
   else
     echo "$ac_t""no" 1>&6
@@ -4581 +4589 @@
 EOF
 
-    NEED_LIBS="-lMPT -lMP ${NEED_LIBS}"
+    HAVE_MPSR=1
+    MP_LIBS="-lMPT -lMP ${MP_LIBS}"
   else
     echo "$ac_t""no" 1>&6
@@ -4590 +4599 @@
 fi
 
+
+
 echo $ac_n "checking whether to have factory""... $ac_c" 1>&6
-echo "configure:4594: checking whether to have factory" >&5
+echo "configure:4605: checking whether to have factory" >&5
 if test "${with_factory}" != yes && test "${with_factory}" != no; then
   if test "$ac_factory_ok" =  yes || test "$enable_factory" = yes; then
@@ -4622 +4633 @@
 
 echo $ac_n "checking whether to have libfac""... $ac_c" 1>&6
-echo "configure:4625: checking whether to have libfac" >&5
+echo "configure:4636: checking whether to have libfac" >&5
 if test "${with_libfac}" != yes && test "${with_libfac}" != no; then
   if (test "${will_have_factory}" = yes) && \
@@ -4656 +4667 @@
 
 echo $ac_n "checking whether to have dbm links""... $ac_c" 1>&6
-echo "configure:4659: checking whether to have dbm links" >&5
+echo "configure:4670: checking whether to have dbm links" >&5
 if test "$with_dbm" != no; then
   cat >> confdefs.h <<\EOF
@@ -4668 +4679 @@
 
 echo $ac_n "checking whether to have namespaces""... $ac_c" 1>&6
-echo "configure:4671: checking whether to have namespaces" >&5
+echo "configure:4682: checking whether to have namespaces" >&5
 if test "$with_namespaces" != yes; then
   echo "$ac_t""no" 1>&6
@@ -4680 +4691 @@
 
 echo $ac_n "checking whether to have dynamic modules""... $ac_c" 1>&6
-echo "configure:4683: checking whether to have dynamic modules" >&5
+echo "configure:4694: checking whether to have dynamic modules" >&5
 if test "$with_dynamic_modules" != yes || test "$ac_have_dl" != yes; then
   echo "$ac_t""no" 1>&6
@@ -4692 +4703 @@
 
 echo $ac_n "checking whether to have dynamic kernel""... $ac_c" 1>&6
-echo "configure:4695: checking whether to have dynamic kernel" >&5
+echo "configure:4706: checking whether to have dynamic kernel" >&5
 if test "$with_dynamic_kernel" != no && test "$ac_lib_dl" = yes; then
   DL_KERNEL=1
@@ -4700 +4711 @@
 
 echo $ac_n "checking whether to have Plural""... $ac_c" 1>&6
-echo "configure:4703: checking whether to have Plural" >&5
+echo "configure:4714: checking whether to have Plural" >&5
 if test "$with_plural" != yes; then
   echo "$ac_t""no" 1>&6
@@ -4880 +4891 @@
 s%@ALLOCA@%$ALLOCA%g
 s%@CXXCPP@%$CXXCPP%g
+s%@HAVE_MPSR@%$HAVE_MPSR%g
+s%@MP_LIBS@%$MP_LIBS%g
 s%@NEED_LIBS@%$NEED_LIBS%g
 s%@DL_KERNEL@%$DL_KERNEL%g

Singular/configure.in

@@ -250 +250 @@
 # lib checks
 AC_CHECK_LIB(m, atof)
+SAVE_LIBS=${LIBS}
+LIBS=
 AC_CHECK_LIB(bsd, socket)
 AC_CHECK_LIB(socket, listen)
 AC_CHECK_LIB(nsl, gethostbyname)
 AC_CHECK_LIB(ucb, index)
+MP_LIBS=${LIBS}
+LIBS=
 
 # check for dl lib
@@ -279 +283 @@
 AC_SUBST(SFLAGS)
 AC_SUBST(SLDFLAGS)
+LIBS=${SAVE_LIBS}
 
 # heder file checks
@@ -453 +458 @@
 
 # readline
-if test "$with_readline" = dynamic && test "$ac_cv_have_dl" != yes; then
+if test "$with_readline" = dynamic && test "$ac_have_dl" != yes; then
   AC_MSG_WARN(can not build dynamic readline without dynamic linking)
   with_readline=static
@@ -559 +564 @@
 AC_CHECK_LIB(gmp, main)
 if test "ac_cv_lib_gmp_main" = yes && test "$with-apint" = smallgmp; then
-  LIBS=NEED_LIBS
+  LIBS=${NEED_LIBS}
 fi
 AC_CHECK_LIB(smallgmp, main)
-AC_CHECK_LIB(MP, IMP_PutGmpInt)
-AC_CHECK_LIB(MPT, MPT_GetTre)
+SAVE_LIBS=$LIBS
+AC_CHECK_LIB(MP, IMP_PutGmpInt,,,$MP_LIBS)
+AC_CHECK_LIB(MPT, MPT_GetTree,,,$MP_LIBS)
+LIBS=$SAVE_LIBS
 AC_CHECK_LIB(singcf, atof)
 AC_CHECK_LIB(singfac, atof)
@@ -656 +663 @@
     AC_MSG_RESULT(yes)
     AC_DEFINE(HAVE_MPSR)
-    NEED_LIBS="-lMPT -lMP ${NEED_LIBS}"
+    HAVE_MPSR=1
+    MP_LIBS="-lMPT -lMP ${MP_LIBS}"
   else
     AC_MSG_RESULT(no)
@@ -665 +673 @@
     AC_MSG_RESULT(yes)
     AC_DEFINE(HAVE_MPSR)
-    NEED_LIBS="-lMPT -lMP ${NEED_LIBS}"
+    HAVE_MPSR=1
+    MP_LIBS="-lMPT -lMP ${MP_LIBS}"
   else
     AC_MSG_RESULT(no)
@@ -673 +682 @@
   AC_MSG_RESULT(no)
 fi
+AC_SUBST(HAVE_MPSR)
+AC_SUBST(MP_LIBS)
 
 AC_MSG_CHECKING(whether to have factory)

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.151 2000-12-07 15:42:30 obachman Exp $ */
+/* $Id: extra.cc,v 1.152 2000-12-12 08:44:43 obachman Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -78 +78 @@
 
 #include "silink.h"
-#ifdef HAVE_MPSR
-#include "mpsr.h"
-#include "MPT_GP.h"
-#endif
 #include "walk.h"
 
@@ -1089 +1085 @@
     else
 #endif
-/*==================== gp =================*/
-#ifdef HAVE_MPSR
-    if (strcmp(sys_cmd, "gp") == 0)
-    {
-      if (h->Typ() != LINK_CMD)
-      {
-        WerrorS("No Link arg");
-        return FALSE;
-      }
-      si_link l = (si_link) h->Data();
-      if (strcmp(l->m->type, "MPfile") != 0)
-      {
-        WerrorS("No MPfile link");
-        return TRUE;
-      }
-      if( ! SI_LINK_R_OPEN_P(l)) // open r ?
-      {
-        if (slOpen(l, SI_LINK_READ)) return TRUE;
-      }
-
-      MP_Link_pt link = (MP_Link_pt) l->data;
-      if (MP_InitMsg(link) != MP_Success)
-      {
-        WerrorS("Can not Init");
-      }
-      MPT_Tree_pt tree = NULL;
-      if (MPT_GetTree(link, &tree) != MPT_Success)
-      {
-        WerrorS("Can not get tree");
-        return TRUE;
-      }
-      MPT_GP_pt gp_tree = MPT_GetGP(tree);
-      if (gp_tree == NULL || ! gp_tree->IsOk(gp_tree))
-      {
-        WerrorS("gp error");
-        return TRUE;
-      }
-      delete gp_tree;
-      MPT_DeleteTree(tree);
-      return FALSE;
-    }
-    else
-#endif
 /*==================== sdb_flags =================*/
     if (strcmp(sys_cmd, "sdb_flags") == 0)

Singular/hilb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: hilb.cc,v 1.16 2000-11-08 15:34:55 obachman Exp $ */
+/* $Id: hilb.cc,v 1.17 2000-12-12 08:44:44 obachman Exp $ */
 /*
 *  ABSTRACT -  Hilbert series
@@ -223 +223 @@
   }
   if (wdegree == NULL)
-    hWeight();
+  {
+    // hWeight();
+  }
   else
     hWDegree(wdegree);

Singular/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.116 2000-12-06 11:03:10 Singular Exp $ */
+/* $Id: ideals.cc,v 1.117 2000-12-12 08:44:44 obachman Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -2298 +2298 @@
   //pChangeRing(pVariables,currRing->OrdSgn,ord,block0,block1,wv);
   rChangeCurrRing(&tmpR);
-  currRing = &tmpR;
   h = idInit(IDELEMS(h1),h1->rank);
   // fetch data from the old ring

Singular/khstd.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: khstd.cc,v 1.12 2000-11-08 15:34:57 obachman Exp $ */
+/* $Id: khstd.cc,v 1.13 2000-12-12 08:44:45 obachman Exp $ */
 /*
 * ABSTRACT:utils for hilbert driven kStd
@@ -16 +16 @@
 #include "kstd1.h"
 #include "khstd.h"
+
 
 /*2
@@ -51 +52 @@
     // then pFDeg == degp == kHomModDeg (see kStd)
     if ((degp!=kModDeg) && (degp!=kHomModDeg)) degp=pTotaldegree;
+    // degp = pWDegree;
     l = hilb->length()-1;
     mw = (*hilb)[l];

Singular/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.68 2000-11-28 11:50:52 obachman Exp $ */
+/* $Id: kstd1.cc,v 1.69 2000-12-12 08:44:45 obachman Exp $ */
 /*
 * ABSTRACT:
@@ -10 +10 @@
 // #define NO_LDEG
 
-// define if buckets should be use
-#define MORA_USE_BUCKETS
+// define if buckets should be used
+// #define MORA_USE_BUCKETS
+
+// define if tailrings should be used
+// #define HAVE_TAIL_RING
 
 #include "mod2.h"
@@ -204 +207 @@
                                         strat->T[i].length < li))
             &&
-            pLmShortDivisibleBy(strat->T[i].p, strat->sevT[i], h->p, ~h->sev))
+            p_LmShortDivisibleBy(strat->T[i].GetLmTailRing(), strat->sevT[i], h->GetLmTailRing(), ~h->sev, strat->tailRing))
 #else
           j = kFindDivisibleByInT(strat->T, strat->sevT, strat->tl, h, i);
@@ -475 +478 @@
       if (H.p==NULL) return NULL;
     }
-    if (pLmShortDivisibleBy(strat->T[j].p, strat->sevT[j], H.p, not_sev))
+    if (p_LmShortDivisibleBy(strat->T[j].GetLmTailRing(), strat->sevT[j], H.GetLmTailRing(), not_sev, strat->tailRing))
     {
       //if (strat->interpt) test_int_std(strat->kIdeal);
@@ -1106 +1109 @@
   strat->use_buckets = kMoraUseBucket(strat);
   /*- compute-------------------------------------------*/
+
+#ifdef HAVE_TAIL_RING
+  kStratInitChangeTailRing(strat);
+#endif  
+  
   while (strat->Ll >= 0)
   {
@@ -1522 +1530 @@
 long kModDeg(poly p, ring r)
 {
-  long o=pWDegree(p, r);
+  // Hmm obachman: on 1-2, this is pTotalDegree
+  // I think that I had changed this to pWDegree sometime in 10/2000
+  // However, this breaks eliminate, etc
+  // long o=pWDegree(p, r);
+  long o=pTotaldegree(p, r);
   long i=p_GetComp(p, r);
   if (i==0) return o;

Singular/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.65 2000-12-07 15:03:55 obachman Exp $ */
+/* $Id: kstd2.cc,v 1.66 2000-12-12 08:44:46 obachman Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -647 +647 @@
       strat->enterS(strat->P, pos, strat, strat->tl);
       if (hilb!=NULL) khCheck(Q,w,hilb,hilbeledeg,hilbcount,strat);
+//      Print("[%d]",hilbeledeg);
       if (strat->P.lcm!=NULL) pLmFree(strat->P.lcm);
       if (strat->sl>srmax) srmax = strat->sl;

Singular/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.81 2000-11-28 11:50:53 obachman Exp $ */
+/* $Id: kutil.cc,v 1.82 2000-12-12 08:44:46 obachman Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -20 +20 @@
 #define KDEBUG 2
 #endif
+
 // define if enterL, enterT should use memmove instead of doing it manually
-// on topgun, this is slightly faster (see monodromy_l.tst)
+// on topgun, this is slightly faster (see monodromy_l.tst, homog_gonnet.sing)
 #define ENTER_USE_MEMMOVE
+
+// define, if the my_memmove inlines should be used instead of 
+// system memmove -- it does not seem to pay off, though
+// #define ENTER_USE_MYMEMMOVE
 
 #include "tok.h"
@@ -44 +49 @@
 #endif
 
+#ifdef ENTER_USE_MYMEMMOVE
+inline void _my_memmove_d_gt_s(unsigned long* d, unsigned long* s, long l)
+{
+  register unsigned long* _dl = (unsigned long*) d;
+  register unsigned long* _sl = (unsigned long*) s;
+  register long _i = l - 1;
+
+  do
+  {
+    _dl[_i] = _sl[_i];
+    _i--;
+  }
+  while (_i >= 0);
+}
+
+inline void _my_memmove_d_lt_s(unsigned long* d, unsigned long* s, long l)
+{
+  register long _ll = l;
+  register unsigned long* _dl = (unsigned long*) d;
+  register unsigned long* _sl = (unsigned long*) s;
+  register long _i = 0;
+
+  do
+  {
+    _dl[_i] = _sl[_i];
+    _i++;
+  }
+  while (_i < _ll);
+}
+
+inline void _my_memmove(void* d, void* s, long l)
+{
+  unsigned long _d = (unsigned long) d;
+  unsigned long _s = (unsigned long) s;
+  unsigned long _l = ((l) + SIZEOF_LONG - 1) >> LOG_SIZEOF_LONG;
+
+  if (_d > _s) _my_memmove_d_gt_s(_d, _s, _l);
+  else _my_memmove_d_lt_s(_d, _s, _l);
+}
+
+#undef memmove
+#define memmove(d,s,l) _my_memmove(d, s, l)
+#endif
+
 
 static poly redMora (poly h,int maxIndex,kStrategy strat);
@@ -427 +476 @@
 }
 
+int kFindInT(poly p, kStrategy strat)
+{
+  int i;
+  do
+  {
+    i = kFindInT(p, strat->T, strat->tl);
+    if (i >= 0) return i;
+    strat = strat->next;
+  }
+  while (strat != NULL);
+  return -1;
+}
+  
 #ifdef KDEBUG
 
@@ -750 +812 @@
 void deleteInL (LSet set, int *length, int j,kStrategy strat)
 {
-  int i;
-
   if (set[j].lcm!=NULL)
     pLmFree(set[j].lcm);
@@ -764 +824 @@
     {
       // search p in T, if it is there, do not delete it
-      int i=strat->tl;
-      poly p=set[j].p;
-      if (p!=NULL)
-      loop
-      {
-        if (i < 0)
-        {
-          if (strat->next!=NULL)
-          {
-            strat=strat->next;
-            i=strat->tl;
-          }
-          else
-          {
-            /* not found : */
-            if (set[j].bucket != NULL)
-            {
-              kBucketDeleteAndDestroy(&set[j].bucket);
-              pNext(p) = NULL;
-              if (set[j].t_p != NULL) pNext(set[j].t_p) = NULL;
-            }
-            if (set[j].t_p != NULL)
-            {
-              p_Delete(&(set[j].t_p), set[j].tailRing);
-              p_LmFree(p, currRing);
-            }
-            else
-            {
-              pDelete(&p);
-            }
-            break;
-          }
-        }
-        else
-        {
-          if (strat->T[i].p==p)
-          {
-            /* found : */
-            p=NULL;
-            break;
-          }
-          i--;
-        }
-      }
-    }
-    set[j].p=NULL;
-  }
-  if ((*length)>0)
-  {
+      if (pOrdSgn != -1 || kFindInT(set[j].p, strat) < 0)
+      {
+        // assure that for global ordereings kFindInT fails
+        assume(pOrdSgn == -1 || kFindInT(set[j].p, strat) < 0);
+        set[j].Delete();
+      }
+    }
+  }
+  if (*length > 0 && j < *length)
+  {
+#ifdef ENTER_USE_MEMMOVE
+    memmove(&(set[j]), &(set[j+1]), (*length - j)*sizeof(LObject));
+#else    
+    int i;
     for (i=j; i < (*length); i++)
       set[i] = set[i+1];
+#endif
   }
 #ifdef KDEBUG
@@ -4058 +4084 @@
                                   // Hmmm .. the condition pFDeg == pDeg
                                   // might be too strong
-                                  (strat->homog && pFDeg == pDeg), 
+                                  (strat->homog && pFDeg == pDeg && pOrdSgn == 1), 
                                   !strat->ak, 
                                   expbound);

Singular/misc.cc

@@ -106 +106 @@
   memset(&sLastPrinted,0,sizeof(sleftv));
   sLastPrinted.rtyp=NONE;
-#ifdef HAVE_MPSR
-  extern void mpsr_Init();
-  mpsr_Init();
-#endif
   return t;
 }

Singular/mod2.h.in

@@ -6 +6 @@
  *          DO NOT EDIT!
  *
- *  Version: $Id: mod2.h.in,v 1.94 2000-12-07 15:03:56 obachman Exp $
+ *  Version: $Id: mod2.h.in,v 1.95 2000-12-12 08:44:47 obachman Exp $
  *******************************************************************/
 #ifndef MOD2_H
@@ -312 +312 @@
 #endif
 
+/* define LINKAGE to "extern C" if compiling for shared libs */
+#ifndef LINKAGE
+#if defined(PIC)
+#define LINKAGE extern "C"
+#else
+#define LINKAGE
+#endif
+#endif
+
 
 /*******************************************************************

Singular/mod_raw.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mod_raw.cc,v 1.9 2000-12-07 15:03:57 obachman Exp $ */
+/* $Id: mod_raw.cc,v 1.10 2000-12-12 08:44:48 obachman Exp $ */
 /*
  * ABSTRACT: machine depend code for dynamic modules
@@ -12 +12 @@
 */
 
+#include <stdio.h>
+
 #include "mod2.h"
 #include "static.h"
@@ -36 +38 @@
 #endif
 
-void* dynl_open_binary_warn(char* binary_name)
+void* dynl_open_binary_warn(char* binary_name, const char* msg)
 {
   void* handle = NULL;
@@ -50 +52 @@
       Warn("Could not open dynamic library: %s", path_name);
       Warn("Error message from system: %s", dynl_error());
-      Warn("Singular will work properly, but much slower.");
+      if (msg != NULL) Warn("%s", msg);
       Warn("See the INSTALL section in the Singular manual for details.");
       warn_handle = TRUE;
@@ -58 +60 @@
 }
 
-void* dynl_sym_warn(void* handle, char* proc)
+void* dynl_sym_warn(void* handle, char* proc, const char* msg)
 {
   void *proc_ptr = NULL;
@@ -68 +70 @@
       Warn("Could load a procedure from a dynamic library");
       Warn("Error message from system: %s", dynl_error());
-      Warn("Singular will work properly, but much slower.");
+      if (msg != NULL) Warn("%s", msg);
       Warn("See the INSTALL section in the Singular manual for details.");
       warn_proc = TRUE;
@@ -83 +85 @@
 #include <dlfcn.h>
 
+static void* kernel_handle = NULL;
 void *dynl_open(
   char *filename    /* I: filename to load */
@@ -92 +95 @@
 void *dynl_sym(void *handle, char *symbol)
 {
+  if (handle == DYNL_KERNEL_HANDLE)
+  {
+    if (kernel_handle == NULL)
+      kernel_handle = dynl_open(NULL);
+    handle = kernel_handle;
+  }
   return(dlsym(handle, symbol));
 }

Singular/mod_raw.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mod_raw.h,v 1.5 2000-12-07 15:03:57 obachman Exp $ */
+/* $Id: mod_raw.h,v 1.6 2000-12-12 08:44:48 obachman Exp $ */
 /*
  * ABSTRACT: machine depend code for dynamic modules
@@ -15 +15 @@
 
 #if defined(HAVE_DL)
-void* dynl_open_binary_warn(char* binary_name);
-void* dynl_sym_warn(void* handle, char* proc);
+
+void* dynl_open_binary_warn(char* binary_name, const char* msg = NULL);
+void* dynl_sym_warn(void* handle, char* proc, const char* msg = NULL);
 
 void *       dynl_open(char *filename);
+// if handle == DYNL_KERNEL_HANDLE, then symbol is searched for
+// in kernel of program
+#define DYNL_KERNEL_HANDLE ((void*) 0x1)
 void *       dynl_sym(void *handle, char *symbol);
 int          dynl_close (void *handle);

Singular/mpsr_GetMisc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpsr_GetMisc.cc,v 1.23 2000-12-06 11:03:22 Singular Exp $ */
+/* $Id: mpsr_GetMisc.cc,v 1.24 2000-12-12 08:44:48 obachman Exp $ */
 
 /***************************************************************
@@ -444 +444 @@
 #include "mmalloc.h"
 
-void mpsr_Init()
-{
+static int mpsr_is_initialized = 0;
+
+LINKAGE void mpsr_Init()
+{
+  if (mpsr_is_initialized) return;
 #ifndef EXTERNAL_MALLOC_H
   // memory management functions of MP (and MPT)

Singular/mpsr_Tok.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpsr_Tok.cc,v 1.26 2000-05-16 08:50:49 Singular Exp $ */
+/* $Id: mpsr_Tok.cc,v 1.27 2000-12-12 08:44:48 obachman Exp $ */
 
 /***************************************************************
@@ -88 +88 @@
   }
   else
-    return mpsr_SetError(mpsr_UnknownSingularToken);
+    return mpsr_UnknownSingularToken;
 }
 
@@ -97 +97 @@
 
   if (sr_dict == MAX_SR_DICT)
-    return mpsr_SetError(mpsr_UnknownDictionary);
+    return mpsr_UnknownDictionary;
 
   tok = mp2tok[sr_dict][cop];
   if (tok == MAX_TOK)
-    return mpsr_SetError(mpsr_UnkownOperator);
+    return mpsr_UnkownOperator;
 
   *o_tok = tok;

Singular/mpsr_sl.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sing_mp.cc,v 1.34 2000-11-21 15:35:46 Singular Exp $ */
-
-/*
-* ABSTRACT: interface to MP links
-*/
+/***************************************************************
+ *  File:    mpsr_sl.cc
+ *  Purpose: implementation of sl_link routines for MP
+ *  Author:  obachman (Olaf Bachmann)
+ *  Created: 12/00
+ *  Version: $Id: mpsr_sl.cc,v 1.1 2000-12-12 08:44:49 obachman Exp $
+ *******************************************************************/
 
 #include "mod2.h"
@@ -24 +26 @@
 #include "feOpt.h"
 
+
 static int Batch_ReadEval(si_link silink);
 
@@ -34 +37 @@
 #endif
 
-MP_Env_pt mp_Env = NULL;
+static MP_Env_pt mp_Env = NULL;
 
 /* =============== general utilities ====================================== */
@@ -106 +109 @@
  *
  ***************************************************************/
-static BOOLEAN slOpenMPFile(si_link l, short flag)
+LINKAGE BOOLEAN slOpenMPFile(si_link l, short flag)
 {
   char *argv[] = {"--MPtransp", "FILE", "--MPmode", "append",
@@ -166 +169 @@
  ***************************************************************/
 
-static MP_Link_pt slOpenMPConnect(int n_argc, char **n_argv)
+LINKAGE MP_Link_pt slOpenMPConnect(int n_argc, char **n_argv)
 {
   char *argv[] = {"--MPtransp", "TCP", "--MPmode", "connect", "--MPport",
@@ -187 +190 @@
 }
 
-static MP_Link_pt slOpenMPListen(int n_argc, char **n_argv)
+LINKAGE MP_Link_pt slOpenMPListen(int n_argc, char **n_argv)
 {
   char *argv[] = {"--MPtransp", "TCP", "--MPmode", "listen",
@@ -200 +203 @@
 }
 
-static MP_Link_pt slOpenMPLaunch(int n_argc, char **n_argv)
+MP_Link_pt slOpenMPLaunch(int n_argc, char **n_argv)
 {
   char *argv[] = {"--MPtransp", "TCP", "--MPmode", "launch",
@@ -249 +252 @@
 }
 
-static MP_Link_pt slOpenMPFork(si_link l, int n_argc, char **n_argv)
+LINKAGE MP_Link_pt slOpenMPFork(si_link l, int n_argc, char **n_argv)
 {
   MP_Link_pt link = NULL;
@@ -288 +291 @@
 
 
-static BOOLEAN slOpenMPTcp(si_link l, short flag)
+LINKAGE BOOLEAN slOpenMPTcp(si_link l, short flag)
 {
   MP_Link_pt link = NULL;
@@ -336 +339 @@
  ***************************************************************/
 
-static BOOLEAN slWriteMP(si_link l, leftv v)
+LINKAGE BOOLEAN slWriteMP(si_link l, leftv v)
 {
   leftv next = (v != NULL ? v->next : (leftv) NULL);
@@ -367 +370 @@
 }
 
-leftv slReadMP(si_link l)
+LINKAGE leftv slReadMP(si_link l)
 {
   leftv v = NULL;
@@ -390 +393 @@
 }
 
-static BOOLEAN slCloseMP(si_link l)
+LINKAGE BOOLEAN slCloseMP(si_link l)
 {
   if ((strcmp(l->mode, "launch") == 0 || strcmp(l->mode, "fork") == 0) &&
@@ -400 +403 @@
 }
 
-static BOOLEAN slKillMP(si_link l)
+LINKAGE BOOLEAN slKillMP(si_link l)
 {
   MP_KillLink((MP_Link_pt) l->data);
@@ -407 +410 @@
 }
 
-static BOOLEAN slDumpMP(si_link l)
+LINKAGE BOOLEAN slDumpMP(si_link l)
 {
   mpsr_ClearError();
@@ -419 +422 @@
 }
 
-static BOOLEAN slGetDumpMP(si_link l)
+LINKAGE BOOLEAN slGetDumpMP(si_link l)
 {
   mpsr_ClearError();
@@ -431 +434 @@
 }
 
-static char* slStatusMP(si_link l, char* request)
+LINKAGE char* slStatusMP(si_link l, char* request)
 {
   if (strcmp(request, "read") == 0)
@@ -456 +459 @@
  ***************************************************************/
 
-int Batch_ReadEval(si_link silink)
+static int Batch_ReadEval(si_link silink)
 {
   leftv v = NULL;
@@ -502 +505 @@
 
 
-int Batch_do(const char* port, const char* host)
+LINKAGE int Batch_do(const char* port, const char* host)
 {
 #ifdef MPSR_BATCH_DEBUG
@@ -540 +543 @@
   return Batch_ReadEval(silink);
 }
-
-/***************************************************************
- *
- * MP link Extension inits
- *
- ***************************************************************/
-
-void slInitMPFileExtension(si_link_extension s)
-{
-  s->Open=slOpenMPFile;
-  s->Close=slCloseMP;
-  s->Close=slKillMP;
-  s->Read=slReadMP;
-  //s->Read2=NULL;
-  s->Dump=slDumpMP;
-  s->GetDump=slGetDumpMP;
-  s->Write=slWriteMP;
-  s->Status=slStatusMP;
-  s->type="MPfile";
-}
-
-void slInitMPTcpExtension(si_link_extension s)
-{
-  s->Open=slOpenMPTcp;
-  s->Close=slCloseMP;
-  s->Kill=slKillMP;
-  s->Read=slReadMP;
-  //s->Read2=NULL;
-  s->Dump=slDumpMP;
-  s->GetDump=slGetDumpMP;
-  s->Write=slWriteMP;
-  s->Status=slStatusMP;
-  s->type="MPtcp";
-}
 #endif

Singular/p_Procs_Dynamic.cc

@@ -6 +6 @@
  *  Purpose: source for dynamically loaded version of p_Procs
  *  Author:  obachman (Olaf Bachmann)
- *  Created: 8/00
- *  Version: $Id: p_Procs_Dynamic.cc,v 1.1 2000-12-07 15:03:59 obachman Exp $
+ *  Created: 12/00
+ *  Version: $Id: p_Procs_Dynamic.cc,v 1.2 2000-12-12 08:44:49 obachman Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -23 +23 @@
 BOOLEAN p_procs_dynamic = TRUE;
 
-// no external linkage
-#define LINKAGE 
+#define WARN_MSG "Singular will work properly, but much slower."
+
+// need external linkage, so that dynl_sym works
+#undef LINKAGE
+#define LINKAGE extern "C"
+#define p_Procs_Kernel
 #include "p_Procs_Dynamic.inc"
 
@@ -35 +39 @@
 #define MAX_PROCNAME_LEN 200
 
-static void* p_procs_handle = NULL;
-void InitSetDynamicProcs()
-{
-  if (p_procs_handle == NULL)
-    p_procs_handle =  dynl_open_binary_warn("p_Procs");
-}
-#define InitSetProcs(f, l, o) InitSetDynamicProcs()
-
-
-void* GetGeneralProc(p_Proc proc)
+static void* p_procs_handle_FieldIndep = NULL;
+static void* p_procs_handle_FieldZp = NULL;
+static void* p_procs_handle_FieldQ = NULL;
+static void* p_procs_handle_FieldGeneral = NULL;
+
+static void* p_ProcInitHandle(void** handle, const char* module)
+{
+  if (*handle == NULL)
+  {
+    char name[25];
+    sprintf(name, "p_Procs_%s", module);
+    *handle = dynl_open_binary_warn(name, WARN_MSG);
+  }
+  return *handle;
+}
+
+static inline void* p_ProcGetHandle(p_Proc proc, p_Field field)
+{
+  const char* module =  p_ProcField_2_Module(proc, field);
+  
+  if (strcmp(module, "FieldIndep") == 0) 
+    return p_ProcInitHandle(&p_procs_handle_FieldIndep, module);
+  else if (strcmp(module, "FieldZp") == 0) 
+    return p_ProcInitHandle(&p_procs_handle_FieldZp, module);
+  else if (strcmp(module, "FieldQ") == 0) 
+    return p_ProcInitHandle(&p_procs_handle_FieldQ, module);
+  else if (strcmp(module, "FieldGeneral") == 0) 
+    return p_ProcInitHandle(&p_procs_handle_FieldGeneral, module);
+  else
+  {
+    assume(0);
+    return NULL;
+  }
+}
+
+  
+#define InitSetProcs(f, l, o) ((void)0)
+
+static void* GetGeneralProc(p_Proc proc)
 {
   switch(proc)
@@ -86 +119 @@
 #include "omalloc.h"
 
-char* GetGeneralProcName(p_Proc proc)
+static char* GetGeneralProcName(p_Proc proc)
 {
   switch(proc)
@@ -123 +156 @@
   return "p_Unknown_Proc";
 }
-char* GetDynamicProcName(const char* proc_s, p_Proc proc, 
-                         p_Field field, p_Length length, p_Ord ord)
+#endif
+
+
+static void* GetDynamicProc(const char* proc_s, p_Proc proc, 
+                            p_Field field, p_Length length, p_Ord ord
+#ifdef RDEBUG
+                     , int get_name = 0
+#endif
+                     )
 {
   void* proc_ptr = NULL;
   char proc_name[MAX_PROCNAME_LEN];
-  
-  if (p_procs_handle != NULL && 
-      (field != FieldGeneral || length != LengthGeneral || ord != OrdGeneral))
-  {
-    sprintf(proc_name, "%s__%s_%s_%s", proc_s, 
-            p_FieldEnum_2_String(field), 
-            p_LengthEnum_2_String(length), 
-            p_OrdEnum_2_String(ord));
-    proc_ptr = dynl_sym_warn(p_procs_handle, proc_name);
-    if (proc_ptr != NULL) 
+  sprintf(proc_name, "%s__%s_%s_%s", proc_s, 
+          p_FieldEnum_2_String(field), 
+          p_LengthEnum_2_String(length), 
+          p_OrdEnum_2_String(ord));
+  // first, try to get the proc from the kernel
+  proc_ptr = dynl_sym(DYNL_KERNEL_HANDLE, proc_name);
+  if (proc_ptr == NULL)
+  {
+    proc_ptr = dynl_sym_warn(p_ProcGetHandle(proc, field), proc_name, WARN_MSG);
+    // last but not least use general proc
+    if (proc_ptr == NULL)
     {
-      char* name = omStrDup(proc_name);
-      omMarkAsStaticAddr(name);
-      return name;
+      proc_ptr = GetGeneralProc(proc);
+#ifdef RDEBUG
+      sprintf(proc_name, GetGeneralProcName(proc));
+#endif      
     }
   }
-  return GetGeneralProcName(proc);
-}
-  
-#endif
-
-
-void* GetDynamicProc(const char* proc_s, p_Proc proc, 
-                     p_Field field, p_Length length, p_Ord ord)
-{
-  void* proc_ptr = NULL;
-  
-  if (p_procs_handle != NULL && 
-      (field != FieldGeneral || length != LengthGeneral || ord != OrdGeneral))
-  {
-    char proc_name[MAX_PROCNAME_LEN];
-    sprintf(proc_name, "%s__%s_%s_%s", proc_s, 
-            p_FieldEnum_2_String(field), 
-            p_LengthEnum_2_String(length), 
-            p_OrdEnum_2_String(ord));
-    proc_ptr = dynl_sym(p_procs_handle, proc_name);
-  }
-  if (proc_ptr == NULL)
-    proc_ptr = GetGeneralProc(proc);
-
+#ifdef RDEBUG
+  if (get_name)
+  {
+    char* name = omStrDup(proc_name);
+    omMarkAsStaticAddr(name);
+    return (void*) name;
+  }
+#endif
   return  proc_ptr;
 }
@@ -182 +208 @@
   if (set_names)                                                    \
     _p_procs->what = (what##_Proc_Ptr)                              \
-       GetDynamicProcName(#what,  what##_Proc, field, length, ord); \
+       GetDynamicProc(#what,  what##_Proc, field, length, ord, 1);  \
   else                                                              \
     DoReallySetProc(what, field, length, ord);                      \

Singular/p_Procs_Dynamic.h

@@ -7 +7 @@
  *  Purpose: Configuration for p_Procs as dynamic library procedures
  *  Author:  obachman (Olaf Bachmann)
- *  Created: 8/00
- *  Version: $Id: p_Procs_Dynamic.h,v 1.2 2000-12-07 18:17:22 obachman Exp $
+ *  Created: 12/00
+ *  Version: $Id: p_Procs_Dynamic.h,v 1.3 2000-12-12 08:44:49 obachman Exp $
  *******************************************************************/
 
@@ -15 +15 @@
 
 // see p_Procs_Impl.h for an explaination of these defines
-#define HAVE_FAST_P_PROCS   2
-#define HAVE_FAST_FIELD     3
+#define HAVE_FAST_P_PROCS   5
+#define HAVE_FAST_FIELD     2
 #define HAVE_FAST_LENGTH 4
 #define HAVE_FAST_ORD 4
-#define HAVE_FAST_ZERO_ORD 0
+#define HAVE_FAST_ZERO_ORD 2
+
+// for the configuration of what goes into the kenel and what into
+// shared libs, see p_Procs_Generate.cc:IsKernelProc(...)
 
 #endif // P_PROCS_DYNAMC_H

Singular/p_Procs_Generate.cc

@@ -8 +8 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Procs_Generate.cc,v 1.1 2000-12-07 15:04:00 obachman Exp $
+ *  Version: $Id: p_Procs_Generate.cc,v 1.2 2000-12-12 08:44:50 obachman Exp $
  *******************************************************************/
 
@@ -20 +20 @@
 #ifdef p_Procs_Static
 #include "p_Procs_Static.h"
-#elif defined(p_Procs_Dynamic) || defined(p_Procs_Lib)
+#else
 #include "p_Procs_Dynamic.h"
 #endif
 
 #include "p_Procs_Impl.h"
+
+#ifndef p_Procs_Static
+int FieldGeneralProcs = 0,
+  FieldIndepProcs = 0,
+  FieldZpProcs = 0,
+  FieldQProcs = 0,
+  KernelProcs = 0,
+  UnknownProcs = 0;
+
+// returns 1, if proc should go into kernel, 0 otherwise
+int IsKernelProc(p_Proc proc, p_Field field, p_Length length, p_Ord ord)
+{
+  // general procs go into kernel
+  if (field == FieldGeneral && length == LengthGeneral && ord == OrdGeneral)
+    return 1;
+  
+  // plus procs with FieldZp
+  if (field == FieldZp && 
+      // which are not general in length or ord
+      !((length == LengthGeneral && p_ProcDependsOn_Length(proc)) ||
+        (ord == OrdGeneral && p_ProcDependsOn_Ord(proc))) &&
+      // and whose length is smaller than five 
+      (!p_ProcDependsOn_Length(proc) || (length >= LengthFour)))
+    return 1;
+  
+  return 0;
+}
+
+#endif
 
 #define DoSetProc(what, field, length, ord) \
@@ -58 +87 @@
              
   (generated_p_procs[proc])[index(proc, field, length, ord)] = s_full_proc_name;
-  
   // define all macros 
   printf("\n// definition of %s\n", s_full_proc_name);
+#ifndef p_Procs_Static
+  if (IsKernelProc(proc, field, length, ord))
+  {
+    KernelProcs++;
+    printf("#ifdef p_Procs_Kernel\n");
+  }
+  else
+  {
+    const char* module = p_ProcField_2_Module(proc, field);
+    if (strcmp(module, "FieldGeneral") == 0)
+      FieldGeneralProcs++;
+    else if (strcmp(module, "FieldIndep") == 0)
+      FieldIndepProcs++;
+    else if (strcmp(module, "FieldZp") == 0)
+      FieldZpProcs++;
+    else if (strcmp(module, "FieldQ") == 0)
+      FieldQProcs++;
+    else
+      UnknownProcs++;
+
+    printf("#ifdef p_Procs_%s\n", module);
+  }
+#endif  
   i = 0;
   while (macros_field[i] != NULL)
@@ -107 +158 @@
   printf("#include \"%s__Template.cc\"\n", s_what);
   printf("#undef %s\n", s_what);
+#ifndef p_Procs_Static
+  printf("#endif // p_Procs_[Kernel|Field*]\n");
+#endif
 }
 
 void GenerateProc(const char* s_what, p_Proc proc, p_Field field, p_Length length, p_Ord ord)
 {
-  if (
-#ifdef p_Procs_Lib
-    (field != FieldGeneral || length != LengthGeneral || ord != OrdGeneral) &&
-#endif
-    ! AlreadyHaveProc(proc, field, length, ord))
+  if (! AlreadyHaveProc(proc, field, length, ord))
     AddProc(s_what, proc, field, length, ord);
 }
@@ -134 +184 @@
  *               %s
  * See the end for a summary. 
- *******************************************************************/
-
-#define %s\n\n",
-#ifdef p_Procs_Dynamic
-         "p_Procs_Dynamic", "p_Procs_Dynamic"
-#elif defined(p_Procs_Static)
-         "p_Procs_Static", "p_Procs_Static"
+ *******************************************************************/\n",
+
+#if defined(p_Procs_Static)
+         "p_Procs_Static"
 #else
-         "p_Procs_Lib", "p_Procs_Lib"
+         "p_Procs_Dynamic"
 #endif
          );
@@ -153 +200 @@
   }
 
-// only need FieldGeneral_LengthGeneral_OrdGeneral for p_Procs_Dynamic
-#ifndef p_Procs_Dynamic  
   // set default procs
   for (field = 0; field < (int) FieldUnknown; field++)
@@ -162 +207 @@
       for (ord=0; ord < (int)OrdUnknown; ord++)
       {
-#endif
         if (IsValidSpec((p_Field) field, (p_Length) length, (p_Ord) ord))
             SetProcs((p_Field) field, (p_Length) length, (p_Ord) ord);
-#ifndef p_Procs_Dynamic
       }
     }
   }
-#endif
 
 // we only need lookup tables for p_Procs_Static
@@ -229 +271 @@
  *   HAVE_FAST_ZERO_ORD = %d
  *   
- *   Generated PolyProcs= %d
- *
- *******************************************************************/\n",
-         HAVE_FAST_P_PROCS, HAVE_FAST_FIELD, HAVE_FAST_LENGTH, HAVE_FAST_ORD, HAVE_FAST_ZERO_ORD,
-         NumberOfHaveProcs);
-}
-
-
+ *   Generated PolyProcs= %d\n",
+         HAVE_FAST_P_PROCS, HAVE_FAST_FIELD, HAVE_FAST_LENGTH, HAVE_FAST_ORD, 
+         HAVE_FAST_ZERO_ORD, NumberOfHaveProcs);
+
+#ifndef p_Procs_Static
+  printf(" * 
+ * KernelProcs          = %d
+ * FieldIndepProcs      = %d
+ * FieldZpProcs         = %d
+ * FieldQProcs          = %d
+ * FieldGeneralProcs    = %d
+ * FieldUnknownProcs    = %d\n",
+         KernelProcs, FieldIndepProcs, FieldZpProcs,FieldQProcs,
+         FieldGeneralProcs, UnknownProcs);
+#endif  
+
+  printf(" *
+ *******************************************************************/\n");
+}
+
+

Singular/p_Procs_Impl.h

@@ -6 +6 @@
  *  Purpose: implementation of primitive procs for polys
  *  Author:  obachman (Olaf Bachmann)
- *  Created: 8/00
- *  Version: $Id: p_Procs_Impl.h,v 1.1 2000-12-07 15:04:00 obachman Exp $
+ *  Created: 12/00
+ *  Version: $Id: p_Procs_Impl.h,v 1.2 2000-12-12 08:44:50 obachman Exp $
  *******************************************************************/
 #ifndef P_PROCS_IMPL_H
@@ -102 +102 @@
 
 // If you add/remove things from here, also remeber to adjust the
-// respective *_2_String 
+// respective *_2_String
 typedef enum p_Field
 {
   FieldGeneral = 0,
   FieldZp,          
+  FieldQ,
   FieldR,
   FieldGF,
-  FieldQ,
 #if HAVE_MORE_FIELDS_IMPLEMENTED
   FieldLong_R,
@@ -199 +199 @@
       case FieldGeneral: return "FieldGeneral";
       case FieldZp: return "FieldZp";          
+      case FieldQ: return "FieldQ";
       case FieldR: return "FieldR";
       case FieldGF: return "FieldGF";
-      case FieldQ: return "FieldQ";
 #if HAVE_MORE_FIELDS_IMPLEMENTED
       case FieldLong_R: return "FieldLong_R";
@@ -284 +284 @@
 }
 
+static inline int p_ProcDependsOn_Field(p_Proc proc)
+{
+  if (proc == p_ShallowCopyDelete_Proc ||
+      proc == p_Merge_q_Proc)
+    return 0;
+  return 1;
+}
+
+static inline int p_ProcDependsOn_Ord(p_Proc proc)
+{
+  switch(proc)
+  {
+      case p_Add_q_Proc:
+      case p_Minus_mm_Mult_qq_Proc:
+      case pp_Mult_mm_Noether_Proc:
+      case p_kBucketSetLm_Proc:
+      case p_Merge_q_Proc:
+        return 1;
+        
+      default:
+        return 0;
+  }
+}
+
+static inline int p_ProcDependsOn_Length(p_Proc proc)
+{
+  switch(proc)
+  {
+      case p_Delete_Proc:
+      case p_Mult_nn_Proc:
+      case p_Neg_Proc:
+        return 0;
+        
+      default:
+        return 1;
+  }
+}
+  
+// returns string specifying the module into which the p_Proc
+// should go
+static inline const char* p_ProcField_2_Module(p_Proc proc,  p_Field field)
+{
+  if (! p_ProcDependsOn_Field(proc))
+    return "FieldIndep";
+  else
+  {
+    if (field > FieldQ) field = FieldGeneral;
+    return p_FieldEnum_2_String(field);
+  }
+}
+
 /***************************************************************
  *  
@@ -454 +505 @@
         break;
         
-      case p_kBucketSetLm_Proc:
-      {
-        if (field != FieldZp)
-        {
-          field = FieldGeneral;
-          length = LengthGeneral;
-          ord = OrdGeneral;
-          return;
-        }
-      }
-
       default: break;
   }

Singular/p_Procs_Lib.cc

@@ -6 +6 @@
  *  Purpose: source for shared library of p_Procs
  *  Author:  obachman (Olaf Bachmann)
- *  Created: 8/00
- *  Version: $Id: p_Procs_Lib.cc,v 1.1 2000-12-07 15:06:39 obachman Exp $
+ *  Created: 12/00
+ *  Version: $Id: p_Procs_Lib.cc,v 1.2 2000-12-12 08:44:50 obachman Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -20 +20 @@
 #include "kbuckets.h"
 
-#define LINKAGE extern "C"
+#include "p_Procs_Dynamic.inc"
 
-#include "p_Procs_Lib.inc"
-

Singular/p_Procs_Set.h

@@ -11 +11 @@
  *           have to be defined before this file is included
  *  Author:  obachman (Olaf Bachmann)
- *  Created: 8/00
- *  Version: $Id: p_Procs_Set.h,v 1.1 2000-12-07 15:04:00 obachman Exp $
+ *  Created: 12/00
+ *  Version: $Id: p_Procs_Set.h,v 1.2 2000-12-12 08:44:50 obachman Exp $
  *******************************************************************/
 

Singular/p_Procs_Static.cc

@@ -6 +6 @@
  *  Purpose: source for static version of p_Procs
  *  Author:  obachman (Olaf Bachmann)
- *  Created: 8/00
- *  Version: $Id: p_Procs_Static.cc,v 1.1 2000-12-07 15:04:01 obachman Exp $
+ *  Created: 12/00
+ *  Version: $Id: p_Procs_Static.cc,v 1.2 2000-12-12 08:44:50 obachman Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -22 +22 @@
 BOOLEAN p_procs_dynamic = FALSE;
 
-#define LINKAGE
 #include "p_Procs_Static.inc"
 

Singular/p_Procs_Static.h

@@ -6 +6 @@
  *  Purpose: Configuration for static p_Procs
  *  Author:  obachman (Olaf Bachmann)
- *  Created: 8/00
- *  Version: $Id: p_Procs_Static.h,v 1.1 2000-12-07 15:04:01 obachman Exp $
+ *  Created: 12/00
+ *  Version: $Id: p_Procs_Static.h,v 1.2 2000-12-12 08:44:51 obachman Exp $
  *******************************************************************/
 

Singular/p_kBucketSetLm__Template.cc

@@ -6 +6 @@
  *  Purpose: template for setting the Lm of a bucket
  *  Author:  obachman (Olaf Bachmann)
- *  Created: 8/00
- *  Version: $Id: p_kBucketSetLm__Template.cc,v 1.3 2000-12-07 15:04:01 obachman Exp $
+ *  Created: 12/00
+ *  Version: $Id: p_kBucketSetLm__Template.cc,v 1.4 2000-12-12 08:44:51 obachman Exp $
  *******************************************************************/
 

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.148 2000-12-07 15:04:02 obachman Exp $ */
+/* $Id: ring.cc,v 1.149 2000-12-12 08:44:51 obachman Exp $ */
 
 /*
@@ -671 +671 @@
   int nblocks=rBlocks(r);
 
-  omCheckAddrSize(r,sizeof(ip_sring));
+  // omCheckAddrSize(r,sizeof(ip_sring));
   omCheckAddrSize(r->order,nblocks*sizeof(int));
   omCheckAddrSize(r->block0,nblocks*sizeof(int));
@@ -677 +677 @@
   omCheckAddrSize(r->wvhdl,nblocks*sizeof(int_ptr));
   omCheckAddrSize(r->names,r->N*sizeof(char_ptr));
+
 
   nblocks--;

Singular/silink.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: silink.cc,v 1.37 2000-12-06 11:03:29 Singular Exp $ */
+/* $Id: silink.cc,v 1.38 2000-12-12 08:44:52 obachman Exp $ */
 
 /*
@@ -35 +35 @@
 static BOOLEAN DumpQring(FILE *fd, idhdl h, char *type_str);
 static BOOLEAN DumpAsciiMaps(FILE *fd, idhdl h, idhdl rhdl);
+static si_link_extension slTypeInit(si_link_extension s, const char* type);
 
 /* ====================================================================== */
@@ -83 +84 @@
   {
     si_link_extension s = si_link_root;
-
-    while (s != NULL && (strcmp(s->type, type) != 0)) s = s->next;
+    si_link_extension prev = s;
+
+    while (strcmp(s->type, type) != 0)
+    {
+      if (s->next == NULL) 
+      {
+        prev = s;
+        s = NULL;
+        break;
+      }
+      else
+      {
+        s = s->next;
+      }
+    }
 
     if (s != NULL)
@@ -90 +104 @@
     else
     {
-      Warn("Found unknown link type: %s", type);
-      Warn("Use default link type: %s", si_link_root->type);
-      l->m = si_link_root;
+      l->m = slTypeInit(prev, type);
     }
     omFree(type);
@@ -99 +111 @@
     l->m = si_link_root;
 
+  if (l->m == NULL) return TRUE;
+  
   l->name = (name != NULL ? name : omStrDup(""));
   l->mode = (mode != NULL ? mode : omStrDup(""));
@@ -809 +823 @@
 /*------------Initialization at Start-up time------------------------*/
 
+#include "slInit.h"
+
+static si_link_extension slTypeInit(si_link_extension s, const char* type)
+{
+  assume(s != NULL);
+  s->next = NULL;
+  si_link_extension ns = (si_link_extension)omAlloc0Bin(s_si_link_extension_bin);
+  
+#ifdef HAVE_MPSR
+  if (strcmp(type, "MPfile") == 0)
+    s->next = slInitMPFileExtension(ns);
+  else if (strcmp(type, "MPtcp") == 0)
+    s->next = slInitMPTcpExtension(ns);
 #ifdef HAVE_DBM
-#include "sing_dbm.h"
-#endif
-
-#ifdef HAVE_MPSR
-#include "sing_mp.h"
-#endif
+  else
+#endif
+#endif
+#ifdef HAVE_DBM
+  if (strcmp(type, "DBM") == 0)
+    s->next = slInitDBMExtension(ns);
+#endif
+#if defined(HAVE_DBM) || defined(HAVE_MPSR)
+  else
+#endif
+  {
+    Warn("Found unknown link type: %s", type);
+    Warn("Use default link type: %s", si_link_root->type);
+    omFreeBin(ns, s_si_link_extension_bin);
+    return si_link_root;
+  }
+  
+  if (s->next == NULL)
+  {
+    Werror("Can not initialize link type %s", type);
+    omFreeBin(ns, s_si_link_extension_bin);
+    return NULL;
+  }
+  return s->next;
+}
 
 void slStandardInit()
@@ -832 +878 @@
   si_link_root->type="ASCII";
   s = si_link_root;
-#ifdef HAVE_DBM
-#ifndef HAVE_MODULE_DBM
-  s->next = (si_link_extension)omAlloc0Bin(s_si_link_extension_bin);
-  s = s->next;
-  slInitDBMExtension(s);
-#endif
-#endif
-#ifdef HAVE_MPSR
-  s->next = (si_link_extension)omAlloc0Bin(s_si_link_extension_bin);
-  s = s->next;
-  slInitMPFileExtension(s);
-  s->next = (si_link_extension)omAlloc0Bin(s_si_link_extension_bin);
-  s = s->next;
-  slInitMPTcpExtension(s);
-#endif
-}
+  s->next = NULL;
+}

Singular/silink.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: silink.h,v 1.14 2000-08-14 12:56:49 obachman Exp $ */
+/* $Id: silink.h,v 1.15 2000-12-12 08:44:53 obachman Exp $ */
 /*
 * ABSTRACT: general interface to links
@@ -47 +47 @@
 };
 
-BOOLEAN slExtend(si_link_extension s);
-
 // flags:
 #define SI_LINK_CLOSE   0
@@ -85 +83 @@
   return l;
 }
+
+#include "omalloc.h"
 inline char* slString(si_link l)
 {

Singular/sing_dbm.cc

@@ -5 +5 @@
 //**************************************************************************/
 //
-// $Id: sing_dbm.cc,v 1.14 2000-09-18 09:19:33 obachman Exp $
+// $Id: sing_dbm.cc,v 1.15 2000-12-12 08:44:53 obachman Exp $
 //
 //**************************************************************************/
@@ -36 +36 @@
 
 //**************************************************************************/
-BOOLEAN dbOpen(si_link l, short flag)
+LINKAGE BOOLEAN dbOpen(si_link l, short flag)
 {
   char *mode = "r";
@@ -73 +73 @@
 
 //**************************************************************************/
-BOOLEAN dbClose(si_link l)
+LINKAGE BOOLEAN dbClose(si_link l)
 {
   DBM_info *db = (DBM_info *)l->data;
@@ -86 +86 @@
 //**************************************************************************/
 static datum d_value;
-leftv dbRead2(si_link l, leftv key)
+LINKAGE leftv dbRead2(si_link l, leftv key)
 {
   DBM_info *db = (DBM_info *)l->data;
@@ -132 +132 @@
   return v;
 }
-leftv dbRead1(si_link l)
+LINKAGE leftv dbRead1(si_link l)
 {
   return dbRead2(l,NULL);
 }
 //**************************************************************************/
-BOOLEAN dbWrite(si_link l, leftv key)
+LINKAGE BOOLEAN dbWrite(si_link l, leftv key)
 {
   DBM_info *db = (DBM_info *)l->data;
@@ -205 +205 @@
 //}
 //**************************************************************************/
-si_link_extension slInitDBMExtension(si_link_extension s)
-{
-  s->Open=dbOpen;
-  s->Close=dbClose;
-  s->Kill=dbClose;
-  s->Read=dbRead1;
-  s->Read2=dbRead2;
-  s->Write=dbWrite;
-  //s->Dump=NULL;
-  //s->GetDump=NULL;
-  //s->Status=dbStatus;
-  s->Status=slStatusAscii;
-  s->type="DBM";
-  return s;
-}
+
 #endif /* HAVE_DBM */

Singular/tesths.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tesths.cc,v 1.82 2000-09-18 09:19:38 obachman Exp $ */
+/* $Id: tesths.cc,v 1.83 2000-12-12 08:44:55 obachman Exp $ */
 
 /*
@@ -30 +30 @@
 #include "distrib.h"
 #include "version.h"
+#include "slInit.h"
 
 #ifdef HAVE_FACTORY
@@ -213 +214 @@
   {
 #ifdef HAVE_MPSR
-    extern int Batch_do(const char* port, const char* host);
-    return Batch_do((char*) feOptValue(FE_OPT_MPPORT),
-                    (char*) feOptValue(FE_OPT_MPHOST));
+    BatchDoProc batch_do = slInitMPBatchDo();
+    if (batch_do != NULL)
+      return (*batch_do)((char*) feOptValue(FE_OPT_MPPORT),
+                         (char*) feOptValue(FE_OPT_MPHOST));
+    else
+      return 1;
 #else
     assume(0);