Changeset f79b94c in git


Ignore:
Timestamp:
Sep 4, 2000, 3:31:31 PM (24 years ago)
Author:
Olaf Bachmann <obachman@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
ec7aac79223c2edb9fd5358c0f2f3e8ddcd120e6
Parents:
05e7d13dce909dfa04b941da1c487b7c2a3a6044
Message:
* support for omalloc


git-svn-id: file:///usr/local/Singular/svn/trunk@4564 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
factory
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • factory/ChangeLog

    r05e7d13 rf79b94c  
     12000-09-02  Olaf Bachmann  <obachman@mathematik.uni-kl.de>
     2
     3        * configure.in, etc: support for omalloc
     4
    152000-08-04  Olaf Bachmann  <obachman@mathematik.uni-kl.de>
    26

  • factory/canonicalform.cc

    r05e7d13 rf79b94c  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: canonicalform.cc,v 1.30 2000-05-29 15:05:19 Singular Exp $ */
     2/* $Id: canonicalform.cc,v 1.31 2000-09-04 13:31:25 obachman Exp $ */
    33
    44#include <config.h>
    … …  
    2727int initializeCharacteristic();
    2828#ifdef SINGULAR
    29 int mmInit(void);
     29extern int mmInit(void);
    3030#endif
    3131

  • factory/config.h.in

    r05e7d13 rf79b94c  
    11/* emacs edit mode for this file is -*- C -*- */
    2 /* $Id: config.h.in,v 1.9 1998-07-01 09:26:12 pohl Exp $ */
     2/* $Id: config.h.in,v 1.10 2000-09-04 13:31:26 obachman Exp $ */
    33
    44#ifndef INCL_CONFIG_H
    … …  
    5353#undef SINGULAR
    5454
     55/* define if build with OMALLOC */
     56#undef HAVE_OMALLOC
     57
    5558/* define if linked with factory memory manager */
    5659#undef USE_MEMUTIL

  • factory/configure

    r05e7d13 rf79b94c  
    1616  --with-memman(=<memman>) specify Factory memory manager.
    1717                          <memman> is either \`old' (default), \`new', or \`no'."
     18ac_help="$ac_help
     19  --with-omalloc           build for use with omalloc"
    1820ac_help="$ac_help
    1921  --with-gmp(=<gmp_inc_path>(,<gmp_lib_path>))
    … …  
    594596# font-lock-trick: '
    595597
     598# Check whether --with-omalloc or --without-omalloc was given.
     599if test "${with_omalloc+set}" = set; then
     600  withval="$with_omalloc"
     601  :
     602fi
     603
    596604# Check whether --with-gmp or --without-gmp was given.
    597605if test "${with_gmp+set}" = set; then
    … …  
    706714set dummy gcc; ac_word=$2
    707715echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    708 echo "configure:709: checking for $ac_word" >&5
     716echo "configure:717: checking for $ac_word" >&5
    709717if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    710718  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    736744set dummy cc; ac_word=$2
    737745echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    738 echo "configure:739: checking for $ac_word" >&5
     746echo "configure:747: checking for $ac_word" >&5
    739747if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    740748  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    787795set dummy cl; ac_word=$2
    788796echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    789 echo "configure:790: checking for $ac_word" >&5
     797echo "configure:798: checking for $ac_word" >&5
    790798if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    791799  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    819827
    820828echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
    821 echo "configure:822: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
     829echo "configure:830: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
    822830
    823831ac_ext=c
    … …  
    830838cat > conftest.$ac_ext << EOF
    831839
    832 #line 833 "configure"
     840#line 841 "configure"
    833841#include "confdefs.h"
    834842
    835843main(){return(0);}
    836844EOF
    837 if { (eval echo configure:838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     845if { (eval echo configure:846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    838846  ac_cv_prog_cc_works=yes
    839847  # If we can't run a trivial program, we are probably using a cross compiler.
    … …  
    861869fi
    862870echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
    863 echo "configure:864: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
     871echo "configure:872: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
    864872echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
    865873cross_compiling=$ac_cv_prog_cc_cross
    866874
    867875echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
    868 echo "configure:869: checking whether we are using GNU C" >&5
     876echo "configure:877: checking whether we are using GNU C" >&5
    869877if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    870878  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    875883#endif
    876884EOF
    877 if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
     885if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    878886  ac_cv_prog_gcc=yes
    879887else
    … …  
    894902CFLAGS=
    895903echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
    896 echo "configure:897: checking whether ${CC-cc} accepts -g" >&5
     904echo "configure:905: checking whether ${CC-cc} accepts -g" >&5
    897905if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    898906  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    931939set dummy $ac_prog; ac_word=$2
    932940echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    933 echo "configure:934: checking for $ac_word" >&5
     941echo "configure:942: checking for $ac_word" >&5
    934942if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
    935943  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    963971
    964972echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
    965 echo "configure:966: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
     973echo "configure:974: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
    966974
    967975ac_ext=C
    … …  
    974982cat > conftest.$ac_ext << EOF
    975983
    976 #line 977 "configure"
     984#line 985 "configure"
    977985#include "confdefs.h"
    978986
    979987int main(){return(0);}
    980988EOF
    981 if { (eval echo configure:982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     989if { (eval echo configure:990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    982990  ac_cv_prog_cxx_works=yes
    983991  # If we can't run a trivial program, we are probably using a cross compiler.
    … …  
    10051013fi
    10061014echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
    1007 echo "configure:1008: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
     1015echo "configure:1016: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
    10081016echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
    10091017cross_compiling=$ac_cv_prog_cxx_cross
    10101018
    10111019echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
    1012 echo "configure:1013: checking whether we are using GNU C++" >&5
     1020echo "configure:1021: checking whether we are using GNU C++" >&5
    10131021if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
    10141022  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    10191027#endif
    10201028EOF
    1021 if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
     1029if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    10221030  ac_cv_prog_gxx=yes
    10231031else
    … …  
    10381046CXXFLAGS=
    10391047echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
    1040 echo "configure:1041: checking whether ${CXX-g++} accepts -g" >&5
     1048echo "configure:1049: checking whether ${CXX-g++} accepts -g" >&5
    10411049if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
    10421050  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    10861094#
    10871095echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
    1088 echo "configure:1089: checking how to run the C preprocessor" >&5
     1096echo "configure:1097: checking how to run the C preprocessor" >&5
    10891097# On Suns, sometimes $CPP names a directory.
    10901098if test -n "$CPP" && test -d "$CPP"; then
    … …  
    11011109  # not just through cpp.
    11021110  cat > conftest.$ac_ext <<EOF
    1103 #line 1104 "configure"
     1111#line 1112 "configure"
    11041112#include "confdefs.h"
    11051113#include <assert.h>
    … …  
    11071115EOF
    11081116ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1109 { (eval echo configure:1110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1117{ (eval echo configure:1118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    11101118ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    11111119if test -z "$ac_err"; then
    … …  
    11181126  CPP="${CC-cc} -E -traditional-cpp"
    11191127  cat > conftest.$ac_ext <<EOF
    1120 #line 1121 "configure"
     1128#line 1129 "configure"
    11211129#include "confdefs.h"
    11221130#include <assert.h>
    … …  
    11241132EOF
    11251133ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1126 { (eval echo configure:1127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1134{ (eval echo configure:1135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    11271135ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    11281136if test -z "$ac_err"; then
    … …  
    11351143  CPP="${CC-cc} -nologo -E"
    11361144  cat > conftest.$ac_ext <<EOF
    1137 #line 1138 "configure"
     1145#line 1146 "configure"
    11381146#include "confdefs.h"
    11391147#include <assert.h>
    … …  
    11411149EOF
    11421150ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1143 { (eval echo configure:1144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1151{ (eval echo configure:1152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    11441152ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    11451153if test -z "$ac_err"; then
    … …  
    11661174
    11671175echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
    1168 echo "configure:1169: checking how to run the C++ preprocessor" >&5
     1176echo "configure:1177: checking how to run the C++ preprocessor" >&5
    11691177if test -z "$CXXCPP"; then
    11701178if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
    … …  
    11791187  CXXCPP="${CXX-g++} -E"
    11801188  cat > conftest.$ac_ext <<EOF
    1181 #line 1182 "configure"
     1189#line 1190 "configure"
    11821190#include "confdefs.h"
    11831191#include <stdlib.h>
    11841192EOF
    11851193ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1186 { (eval echo configure:1187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1194{ (eval echo configure:1195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    11871195ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    11881196if test -z "$ac_err"; then
    … …  
    12091217
    12101218echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
    1211 echo "configure:1212: checking whether ln -s works" >&5
     1219echo "configure:1220: checking whether ln -s works" >&5
    12121220if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    12131221  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    12411249# ./install, which can be erroneously created by make from ./install.sh.
    12421250echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
    1243 echo "configure:1244: checking for a BSD compatible install" >&5
     1251echo "configure:1252: checking for a BSD compatible install" >&5
    12441252if test -z "$INSTALL"; then
    12451253if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    … …  
    12961304set dummy ranlib; ac_word=$2
    12971305echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1298 echo "configure:1299: checking for $ac_word" >&5
     1306echo "configure:1307: checking for $ac_word" >&5
    12991307if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    13001308  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    13241332
    13251333echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
    1326 echo "configure:1327: checking whether ${MAKE-make} sets \${MAKE}" >&5
     1334echo "configure:1335: checking whether ${MAKE-make} sets \${MAKE}" >&5
    13271335set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
    13281336if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
    … …  
    13531361set dummy ar; ac_word=$2
    13541362echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1355 echo "configure:1356: checking for $ac_word" >&5
     1363echo "configure:1364: checking for $ac_word" >&5
    13561364if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
    13571365  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    13831391set dummy m4; ac_word=$2
    13841392echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1385 echo "configure:1386: checking for $ac_word" >&5
     1393echo "configure:1394: checking for $ac_word" >&5
    13861394if eval "test \"`echo '$''{'ac_cv_prog_M4'+set}'`\" = set"; then
    13871395  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    14131421set dummy bison; ac_word=$2
    14141422echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1415 echo "configure:1416: checking for $ac_word" >&5
     1423echo "configure:1424: checking for $ac_word" >&5
    14161424if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then
    14171425  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    14521460set dummy mkinstalldirs; ac_word=$2
    14531461echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1454 echo "configure:1455: checking for $ac_word" >&5
     1462echo "configure:1463: checking for $ac_word" >&5
    14551463if eval "test \"`echo '$''{'ac_cv_path_FACTORY_MKINSTALLDIRS'+set}'`\" = set"; then
    14561464  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    14891497set dummy makeheader; ac_word=$2
    14901498echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1491 echo "configure:1492: checking for $ac_word" >&5
     1499echo "configure:1500: checking for $ac_word" >&5
    14921500if eval "test \"`echo '$''{'ac_cv_path_FACTORY_MAKEHEADER'+set}'`\" = set"; then
    14931501  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    15281536
    15291537echo $ac_n "checking and generating explicit install paths""... $ac_c" 1>&6
    1530 echo "configure:1531: checking and generating explicit install paths" >&5
     1538echo "configure:1539: checking and generating explicit install paths" >&5
    15311539
    15321540# generate Makefile
    … …  
    15681576#
    15691577echo $ac_n "checking for atof in -lm""... $ac_c" 1>&6
    1570 echo "configure:1571: checking for atof in -lm" >&5
     1578echo "configure:1579: checking for atof in -lm" >&5
    15711579ac_lib_var=`echo m'_'atof | sed 'y%./+-%__p_%'`
    15721580if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    15761584LIBS="-lm  $LIBS"
    15771585cat > conftest.$ac_ext <<EOF
    1578 #line 1579 "configure"
     1586#line 1587 "configure"
    15791587#include "confdefs.h"
    15801588/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    15871595; return 0; }
    15881596EOF
    1589 if { (eval echo configure:1590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1597if { (eval echo configure:1598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    15901598  rm -rf conftest*
    15911599  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    16181626if test "x$gmp_in_installation" != xyes; then
    16191627  echo $ac_n "checking for main in -lgmp""... $ac_c" 1>&6
    1620 echo "configure:1621: checking for main in -lgmp" >&5
     1628echo "configure:1629: checking for main in -lgmp" >&5
    16211629ac_lib_var=`echo gmp'_'main | sed 'y%./+-%__p_%'`
    16221630if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    16261634LIBS="-lgmp  $LIBS"
    16271635cat > conftest.$ac_ext <<EOF
    1628 #line 1629 "configure"
     1636#line 1637 "configure"
    16291637#include "confdefs.h"
    16301638
    … …  
    16331641; return 0; }
    16341642EOF
    1635 if { (eval echo configure:1636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1643if { (eval echo configure:1644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    16361644  rm -rf conftest*
    16371645  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    16641672      LDFLAGS="-L$explicit_libdir $LDFLAGS"
    16651673      echo $ac_n "checking for main in -lgmp""... $ac_c" 1>&6
    1666 echo "configure:1667: checking for main in -lgmp" >&5
     1674echo "configure:1675: checking for main in -lgmp" >&5
    16671675ac_lib_var=`echo gmp'_'main | sed 'y%./+-%__p_%'`
    16681676if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    16721680LIBS="-lgmp  $LIBS"
    16731681cat > conftest.$ac_ext <<EOF
    1674 #line 1675 "configure"
     1682#line 1683 "configure"
    16751683#include "confdefs.h"
    16761684
    … …  
    16791687; return 0; }
    16801688EOF
    1681 if { (eval echo configure:1682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1689if { (eval echo configure:1690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    16821690  rm -rf conftest*
    16831691  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    17291737ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    17301738echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    1731 echo "configure:1732: checking for $ac_hdr" >&5
     1739echo "configure:1740: checking for $ac_hdr" >&5
    17321740if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    17331741  echo $ac_n "(cached) $ac_c" 1>&6
    17341742else
    17351743  cat > conftest.$ac_ext <<EOF
    1736 #line 1737 "configure"
     1744#line 1745 "configure"
    17371745#include "confdefs.h"
    17381746#include <$ac_hdr>
    17391747EOF
    17401748ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1741 { (eval echo configure:1742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1749{ (eval echo configure:1750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    17421750ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    17431751if test -z "$ac_err"; then
    … …  
    17701778ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    17711779echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    1772 echo "configure:1773: checking for $ac_hdr" >&5
     1780echo "configure:1781: checking for $ac_hdr" >&5
    17731781if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    17741782  echo $ac_n "(cached) $ac_c" 1>&6
    17751783else
    17761784  cat > conftest.$ac_ext <<EOF
    1777 #line 1778 "configure"
     1785#line 1786 "configure"
    17781786#include "confdefs.h"
    17791787#include <$ac_hdr>
    17801788EOF
    17811789ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1782 { (eval echo configure:1783: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1790{ (eval echo configure:1791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    17831791ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    17841792if test -z "$ac_err"; then
    … …  
    18141822fi
    18151823
    1816 for ac_hdr in stdio.h stdlib.h string.h time.h math.h
     1824for ac_hdr in stdio.h stdlib.h string.h time.h math.h omalloc.h
    18171825do
    18181826ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    18191827echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    1820 echo "configure:1821: checking for $ac_hdr" >&5
     1828echo "configure:1829: checking for $ac_hdr" >&5
    18211829if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    18221830  echo $ac_n "(cached) $ac_c" 1>&6
    18231831else
    18241832  cat > conftest.$ac_ext <<EOF
    1825 #line 1826 "configure"
     1833#line 1834 "configure"
    18261834#include "confdefs.h"
    18271835#include <$ac_hdr>
    18281836EOF
    18291837ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1830 { (eval echo configure:1831: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1838{ (eval echo configure:1839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    18311839ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    18321840if test -z "$ac_err"; then
    … …  
    18611869ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    18621870echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    1863 echo "configure:1864: checking for $ac_hdr" >&5
     1871echo "configure:1872: checking for $ac_hdr" >&5
    18641872if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    18651873  echo $ac_n "(cached) $ac_c" 1>&6
    18661874else
    18671875  cat > conftest.$ac_ext <<EOF
    1868 #line 1869 "configure"
     1876#line 1877 "configure"
    18691877#include "confdefs.h"
    18701878#include <$ac_hdr>
    18711879EOF
    18721880ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1873 { (eval echo configure:1874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1881{ (eval echo configure:1882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    18741882ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    18751883if test -z "$ac_err"; then
    … …  
    19021910ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    19031911echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    1904 echo "configure:1905: checking for $ac_hdr" >&5
     1912echo "configure:1913: checking for $ac_hdr" >&5
    19051913if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    19061914  echo $ac_n "(cached) $ac_c" 1>&6
    19071915else
    19081916  cat > conftest.$ac_ext <<EOF
    1909 #line 1910 "configure"
     1917#line 1918 "configure"
    19101918#include "confdefs.h"
    19111919#include <$ac_hdr>
    19121920EOF
    19131921ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1914 { (eval echo configure:1915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1922{ (eval echo configure:1923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    19151923ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    19161924if test -z "$ac_err"; then
    … …  
    19461954ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    19471955echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    1948 echo "configure:1949: checking for $ac_hdr" >&5
     1956echo "configure:1957: checking for $ac_hdr" >&5
    19491957if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    19501958  echo $ac_n "(cached) $ac_c" 1>&6
    19511959else
    19521960  cat > conftest.$ac_ext <<EOF
    1953 #line 1954 "configure"
     1961#line 1962 "configure"
    19541962#include "confdefs.h"
    19551963#include <$ac_hdr>
    19561964EOF
    19571965ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1958 { (eval echo configure:1959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1966{ (eval echo configure:1967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    19591967ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    19601968if test -z "$ac_err"; then
    … …  
    19922000ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    19932001echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    1994 echo "configure:1995: checking for $ac_hdr" >&5
     2002echo "configure:2003: checking for $ac_hdr" >&5
    19952003if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    19962004  echo $ac_n "(cached) $ac_c" 1>&6
    19972005else
    19982006  cat > conftest.$ac_ext <<EOF
    1999 #line 2000 "configure"
     2007#line 2008 "configure"
    20002008#include "confdefs.h"
    20012009#include <$ac_hdr>
    20022010EOF
    20032011ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2004 { (eval echo configure:2005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2012{ (eval echo configure:2013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    20052013ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    20062014if test -z "$ac_err"; then
    … …  
    20612069
    20622070echo $ac_n "checking for working const""... $ac_c" 1>&6
    2063 echo "configure:2064: checking for working const" >&5
     2071echo "configure:2072: checking for working const" >&5
    20642072if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
    20652073  echo $ac_n "(cached) $ac_c" 1>&6
    20662074else
    20672075  cat > conftest.$ac_ext <<EOF
    2068 #line 2069 "configure"
     2076#line 2077 "configure"
    20692077#include "confdefs.h"
    20702078
    … …  
    21152123; return 0; }
    21162124EOF
    2117 if { (eval echo configure:2118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2125if { (eval echo configure:2126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    21182126  rm -rf conftest*
    21192127  ac_cv_c_const=yes
    … …  
    21362144
    21372145echo $ac_n "checking for inline""... $ac_c" 1>&6
    2138 echo "configure:2139: checking for inline" >&5
     2146echo "configure:2147: checking for inline" >&5
    21392147if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
    21402148  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    21432151for ac_kw in inline __inline__ __inline; do
    21442152  cat > conftest.$ac_ext <<EOF
    2145 #line 2146 "configure"
     2153#line 2154 "configure"
    21462154#include "confdefs.h"
    21472155
    … …  
    21502158; return 0; }
    21512159EOF
    2152 if { (eval echo configure:2153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2160if { (eval echo configure:2161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    21532161  rm -rf conftest*
    21542162  ac_cv_c_inline=$ac_kw; break
    … …  
    21782186# arithmetic shift
    21792187echo $ac_n "checking whether your compiler does arithmetic shifts""... $ac_c" 1>&6
    2180 echo "configure:2181: checking whether your compiler does arithmetic shifts" >&5
     2188echo "configure:2189: checking whether your compiler does arithmetic shifts" >&5
    21812189if eval "test \"`echo '$''{'ac_cv_shift'+set}'`\" = set"; then
    21822190  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    21862194else
    21872195  cat > conftest.$ac_ext <<EOF
    2188 #line 2189 "configure"
     2196#line 2197 "configure"
    21892197#include "confdefs.h"
    21902198 int main() { if (-2 >> 1 == -1) exit(0); else exit(1); }
    21912199EOF
    2192 if { (eval echo configure:2193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     2200if { (eval echo configure:2201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    21932201then
    21942202  ac_cv_shift=yes
    … …  
    22922300fi
    22932301
     2302echo $ac_n "checking whether to use omalloc""... $ac_c" 1>&6
     2303echo "configure:2304: checking whether to use omalloc" >&5
     2304
     2305if test "$with_omalloc" = yes; then
     2306  if test "$ac_cv_header_omalloc_h" != yes; then
     2307    if test "$enable_omalloc" = yes; then
     2308       echo "configure: warning: did not find omalloc.h" 1>&2
     2309    else
     2310       with_omalloc=no
     2311    fi
     2312  fi
     2313else
     2314  if test "$with_omalloc" != no; then
     2315    if test "$enable_omalloc" = yes; then
     2316      if test "$ac_cv_header_omalloc_h" != yes; then
     2317        echo "configure: warning: did not find omalloc.h" 1>&2
     2318      fi
     2319      with_omalloc=yes
     2320    else
     2321      with_omalloc=no
     2322    fi
     2323  fi
     2324fi
     2325if test "$with_omalloc" = yes; then
     2326  cat >> confdefs.h <<\EOF
     2327#define HAVE_OMALLOC 1
     2328EOF
     2329
     2330  with_memman=no
     2331fi
     2332echo "$ac_t""$with_omalloc" 1>&6
     2333   
    22942334# memory manager
    22952335if test "x$with_memman" != xno; then

  • factory/configure.in

    r05e7d13 rf79b94c  
    11dnl # emacs edit mode for this file is -*- sh -*-
    2 dnl # $Id: configure.in,v 1.25 2000-04-27 10:07:30 obachman Exp $
     2dnl # $Id: configure.in,v 1.26 2000-09-04 13:31:28 obachman Exp $
    33
    44dnl #
    … …  
    1313# - initialisation.
    1414#
    15 AC_REVISION($Id: configure.in,v 1.25 2000-04-27 10:07:30 obachman Exp $)
     15AC_REVISION($Id: configure.in,v 1.26 2000-09-04 13:31:28 obachman Exp $)
    1616AC_INIT(canonicalform.cc)
    1717AC_CONFIG_HEADER(config.h)
    … …  
    4444# font-lock-trick: '
    4545
     46AC_ARG_WITH(
     47  omalloc,
     48  [  --with-omalloc           build for use with omalloc])
    4649AC_ARG_WITH(
    4750  gmp,
    … …  
    250253fi
    251254
    252 AC_CHECK_HEADERS(stdio.h stdlib.h string.h time.h math.h, ,
     255AC_CHECK_HEADERS(stdio.h stdlib.h string.h time.h math.h omalloc.h, ,
    253256  [ AC_MSG_ERROR(C header files not found) ])
    254257
    … …  
    385388fi
    386389
     390AC_MSG_CHECKING(whether to use omalloc)
     391
     392if test "$with_omalloc" = yes; then
     393  if test "$ac_cv_header_omalloc_h" != yes; then
     394    if test "$enable_omalloc" = yes; then
     395       AC_MSG_WARN(did not find omalloc.h, install before compiling)
     396    else
     397       with_omalloc=no
     398    fi
     399  fi
     400else
     401  if test "$with_omalloc" != no; then
     402    if test "$enable_omalloc" = yes; then
     403      if test "$ac_cv_header_omalloc_h" != yes; then
     404        AC_MSG_WARN(did not find omalloc.h, install before compiling)
     405      fi
     406      with_omalloc=yes
     407    else
     408      with_omalloc=no
     409    fi
     410  fi
     411fi
     412if test "$with_omalloc" = yes; then
     413  AC_DEFINE(HAVE_OMALLOC)
     414  with_memman=no
     415fi
     416AC_MSG_RESULT($with_omalloc)
     417   
    387418# memory manager
    388419if test "x$with_memman" != xno; then

  • factory/int_int.cc

    r05e7d13 rf79b94c  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: int_int.cc,v 1.14 1998-06-26 16:16:33 schmidt Exp $ */
     2/* $Id: int_int.cc,v 1.15 2000-09-04 13:31:29 obachman Exp $ */
    33
    44#include <config.h>
    … …  
    1111#include "gmpext.h"
    1212 
     13#ifdef HAVE_OMALLOC
     14const omBin InternalInteger::InternalInteger_bin = omGetSpecBin(sizeof(InternalInteger));
     15#endif
     16
    1317InternalInteger::InternalInteger()
    1418{

  • factory/int_int.h

    r05e7d13 rf79b94c  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: int_int.h,v 1.9 1998-06-26 16:16:40 schmidt Exp $ */
     2/* $Id: int_int.h,v 1.10 2000-09-04 13:31:30 obachman Exp $ */
    33
    44#ifndef INCL_INT_INT_H
    … …  
    1717#include "gmpext.h"
    1818
     19
     20#ifdef HAVE_OMALLOC
     21#include <omalloc.h>
     22#endif
     23
    1924class InternalInteger : public InternalCF
    2025{
    … …  
    3035
    3136    static inline MP_INT & MPI ( const InternalCF * const c );
    32 
     37#ifdef HAVE_OMALLOC
     38  static const omBin InternalInteger_bin;
     39#endif
    3340public:
     41#ifdef HAVE_OMALLOC
     42  void* operator new(size_t size)
     43    {
     44      void* addr;
     45      omTypeAllocBin(void*, addr, InternalInteger_bin);
     46      return addr;
     47    }
     48  void operator delete(void* addr, size_t size)
     49    {
     50      omFreeBin(addr, InternalInteger_bin);
     51    }
     52#endif
     53
    3454    InternalInteger();
    3555    InternalInteger( const InternalCF& )

  • factory/int_poly.cc

    r05e7d13 rf79b94c  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: int_poly.cc,v 1.12 1998-06-26 16:15:28 schmidt Exp $ */
     2/* $Id: int_poly.cc,v 1.13 2000-09-04 13:31:29 obachman Exp $ */
    33
    44#include <config.h>
    … …  
    2323#include "imm.h"
    2424
     25#ifdef HAVE_OMALLOC
     26const omBin term::term_bin = omGetSpecBin(sizeof(term));
     27const omBin InternalPoly::InternalPoly_bin = omGetSpecBin(sizeof(InternalPoly));
     28#endif
    2529
    2630InternalPoly::InternalPoly( termList first, termList last, const Variable & v )
    … …  
    14531457    return first;
    14541458}
     1459

  • factory/int_poly.h

    r05e7d13 rf79b94c  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: int_poly.h,v 1.6 1998-06-26 16:15:08 schmidt Exp $ */
     2/* $Id: int_poly.h,v 1.7 2000-09-04 13:31:31 obachman Exp $ */
    33
    44#ifndef INCL_INT_POLY_H
    … …  
    1616#include "canonicalform.h"
    1717
     18#ifdef HAVE_OMALLOC
     19#include <omalloc.h>
     20#endif
    1821
    1922class term {
    … …  
    2225    CanonicalForm coeff;
    2326    int exp;
     27#ifdef HAVE_OMALLOC
     28  static const omBin term_bin;
     29#endif
    2430public:
    2531    term() : next(0), coeff(0), exp(0) {}
    … …  
    2733    friend class InternalPoly;
    2834    friend class CFIterator;
     35#ifdef HAVE_OMALLOC
     36  void* operator new(size_t size)
     37    {
     38      void* addr;
     39      omTypeAllocBin(void*, addr, term_bin);
     40      return addr;
     41    }
     42  void operator delete(void* addr, size_t size)
     43    {
     44      omFreeBin(addr, term_bin);
     45    }
     46#endif
    2947};
    3048
    … …  
    108126    int sign() const;
    109127
     128#ifdef HAVE_OMALLOC
     129  static const omBin InternalPoly_bin;
     130  void* operator new(size_t size)
     131    {
     132      void* addr;
     133      omTypeAllocBin(void*, addr, InternalPoly_bin);
     134      return addr;
     135    }
     136  void operator delete(void* addr, size_t size)
     137    {
     138      omFreeBin(addr, InternalPoly_bin);
     139    }
     140#endif
    110141    friend class CFIterator;
    111142};
Note: See TracChangeset for help on using the changeset viewer.