Changeset dc32d42 in git


Ignore:
Timestamp:
May 21, 1997, 3:05:36 PM (26 years ago)
Author:
Olaf Bachmann <obachman@…>
Branches:
(u'spielwiese', '91e5db82acc17434e4062bcfa44e6efa7d41fd30')
Children:
2b3f238c740deb3d586dc1d5b379ddadb848cbaa
Parents:
670667a17a4a8423dbd6c8e3749cc652102fb28a
Message:
Merged fixes from 1-0 branch


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

Legend:

Unmodified
Added
Removed

  • Singular/ChangeLog

    r670667 rdc32d42  
    22          subexpr.cc: implemented sleftv::Copy for ring/qring
    33          syz1.cc: added missing idSkipZeros to LaScala*
     4
     5Tue May 13 11:32:41 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
     6
     7        * claptmpl.cc: changed template initializiation of libfac, so that
     8          class.cc and tmpl_inst.h does not need to be included
     9
     10Mon May 12 16:48:14 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
     11
     12        * misc.cc: Added / to Help_File and Info_File
     13
     14Wed May 21 08:56:19 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
     15
     16        * tesths.cc (main): made -v option gmp v1.3 clean
     17
     18Tue May 20 14:02:42 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
     19
     20        * misc.cc: Put #include <factory.h> into #ifdef HAVE_FACTORY brackets
     21
     22* hannes: ipshell.cc: fixed a bug in iiExport (multiple exports in rings)
     23          subexpr.cc: implemented sleftv::Copy for ring/qring
     24          syz1.cc: added missing idSkipZeros to LaScala*
     25                   
     26Wed May 14 16:40:19 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
     27
     28        * Makefile.in: changed mpcheck.data so that the brain-dead sed on
     29          the suns does not mess up the output on files with long lines
    430
    531Tue May 13 11:32:41 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>

  • Singular/Makefile.in

    r670667 rdc32d42  
    4545CFLAGS          = @CFLAGS@
    4646CXXFLAGS        = @CXXFLAGS@
     47CXXNOOPTFLAGS   = @CXXNOOPTFLAGS@
    4748CXXTEMPLFLAGS   = @CXXTEMPLFLAGS@
    4849CPPFLAGS        = -I${srcdir} @CPPFLAGS@
    … …  
    161162        tesths.cc iparith.o mpsr_Tok.o ${OBJS} ${LDFLAGS} ${LIBS}
    162163
    163 iparith.o mpsr_Tok.o : iparith.inc
     164iparith.o mpsr_Tok.o : iparith.inc mpsr_Tok.inc
    164165
    165166claptmpl.o: claptmpl.cc mod2.h
    166167        ${CXX} ${CXXFLAGS}  ${CPPFLAGS} ${DEFS} -c $<   
     168
     169weight.o: weight.cc mod2.h
     170        ${CXX} ${CXXNOOPTFLAGS} ${CPPFLAGS} ${DEFS} -c $<
    167171       
    168 iparith.inc : iparith.cc ipconv.cc tok.h mpsr_Tok.cc grammar.h
     172iparith.inc mpsr_Tok.inc : iparith.cc ipconv.cc tok.h mpsr_Tok.cc grammar.h
    169173        ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${DEFS} -DGENTABLE -o gentable \
    170174        iparith.cc tesths.cc mpsr_Tok.cc ${OBJS} ${LDFLAGS} ${LIBS}

  • Singular/claptmpl.cc

    r670667 rdc32d42  
    33*  Computer Algebra System SINGULAR     *
    44****************************************/
    5 // $Id: claptmpl.cc,v 1.7 1997-05-20 08:52:02 Singular Exp $
     5// $Id: claptmpl.cc,v 1.8 1997-05-21 13:05:09 obachman Exp $
    66/*
    77* ABSTRACT - instantiation of all templates
    … …  
    5454
    5555#ifdef HAVE_LIBFAC_P
    56 #include <templates/tmpl_inst.h>
    57 #include <templates/class.cc>
     56#include <factor.h>
     57
     58// class.h:
     59template <class T>
     60class Substitution {
     61private:
     62    T _factor;
     63    T _exp;
     64public:
     65    Substitution() : _factor(1), _exp(0) {}
     66    Substitution( const Substitution<T> & f ) : _factor(f._factor), _exp(f._exp) {}
     67    Substitution( const T & f, const T & e ) : _factor(f), _exp(e) {}
     68    Substitution( const T & f ) : _factor(f), _exp(1) {}
     69    ~Substitution() {}
     70    Substitution<T>& operator= ( const Substitution<T>& );
     71    Substitution<T>& operator= ( const T& );
     72    T factor() const { return _factor; }
     73    T exp() const { return _exp; }
     74    friend int operator== ( const Substitution<T>&, const Substitution<T>& );
     75};
     76
     77// class.cc
     78template <class T>
     79Substitution<T>& Substitution<T>::operator= ( const Substitution<T>& f )
     80{
     81    if ( this != &f ) {
     82        _factor = f._factor;
     83        _exp = f._exp;
     84    }
     85    return *this;
     86}
     87
     88template <class T>
     89Substitution<T>& Substitution<T>::operator= ( const T & f )
     90{
     91    _factor = f;
     92    _exp = 1;
     93    return *this;
     94}
     95
     96template <class T>
     97int operator== ( const Substitution<T> &f1, const Substitution<T> &f2 )
     98{
     99    return (f1.exp() == f2.exp()) && (f1.factor() == f2.factor());
     100}
    58101
    59102template class List<int>;
    … …  
    66109template class Array<Variable>;
    67110template class Array<int>;
     111typedef Substitution<CanonicalForm> SForm ;
    68112template class List<SForm>;
    69113template class ListIterator<SForm>;

  • Singular/configure

    r670667 rdc32d42  
    31543154
    31553155
     3156echo $ac_n "checking whether _AIX is defined""... $ac_c" 1>&6
     3157if eval "test \"`echo '$''{'ac_cv_is_aix'+set}'`\" = set"; then
     3158  echo $ac_n "(cached) $ac_c" 1>&6
     3159else
     3160  cat > conftest.$ac_ext <<EOF
     3161#line 3162 "configure"
     3162#include "confdefs.h"
     3163#ifdef _AIX
     3164    yes
     3165#endif
     3166
     3167EOF
     3168if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
     3169  egrep "yes" >/dev/null 2>&1; then
     3170  rm -rf conftest*
     3171  ac_cv_is_aix=yes
     3172else
     3173  rm -rf conftest*
     3174  ac_cv_is_aix=no
     3175fi
     3176rm -f conftest*
     3177
     3178fi
     3179
     3180if test "$ac_cv_is_aix" = yes; then
     3181  echo "$ac_t""yes" 1>&6
     3182else
     3183  echo "$ac_t""no" 1>&6
     3184fi
     3185
     3186
    31563187if test ${GXX} = yes; then
    31573188  CXXFLAGS="-O3 -w -fomit-frame-pointer"
    31583189  CXXTEMPLFLAGS="-fno-implicit-templates"
     3190  if test "$ac_cv_is_aix" = yes; then
     3191    CXXNOOPTFLAGS="-O -w -fomit-frame-pointer"
     3192  else
     3193    CXXNOOPTFLAGS=$CXXFLAGS
     3194  fi
    31593195else
    31603196  CXXTEMPFLAGS=""
    3161 fi
     3197  CXXNOOPTFLAGS=$CXXFLAGS
     3198fi
     3199
    31623200
    31633201
    … …  
    32973335s%@ALLOCA@%$ALLOCA%g
    32983336s%@CXXTEMPLFLAGS@%$CXXTEMPLFLAGS%g
     3337s%@CXXNOOPTFLAGS@%$CXXNOOPTFLAGS%g
    32993338
    33003339CEOF

  • Singular/configure.in

    r670667 rdc32d42  
    394394dnl Last, but not least, customize CFLAGS
    395395dnl
     396AC_MSG_CHECKING(whether _AIX is defined)
     397AC_CACHE_VAL(ac_cv_is_aix,
     398AC_EGREP_CPP(yes,
     399[#ifdef _AIX
     400    yes
     401#endif
     402], ac_cv_is_aix=yes, ac_cv_is_aix=no, 1))
     403if test "$ac_cv_is_aix" = yes; then
     404  AC_MSG_RESULT(yes)
     405else
     406  AC_MSG_RESULT(no)
     407fi
     408
     409
    396410if test ${GXX} = yes; then
    397411  CXXFLAGS="-O3 -w -fomit-frame-pointer"
    398412  CXXTEMPLFLAGS="-fno-implicit-templates"
     413  if test "$ac_cv_is_aix" = yes; then
     414    CXXNOOPTFLAGS="-O -w -fomit-frame-pointer"
     415  else
     416    CXXNOOPTFLAGS=$CXXFLAGS
     417  fi
    399418else
    400419  CXXTEMPFLAGS=""
     420  CXXNOOPTFLAGS=$CXXFLAGS
    401421fi
    402422AC_SUBST(CXXTEMPLFLAGS)
     423AC_SUBST(CXXNOOPTFLAGS)
    403424
    404425if test ${GCC} = yes; then

  • Singular/ideals.cc

    r670667 rdc32d42  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ideals.cc,v 1.6 1997-05-02 15:10:13 Singular Exp $ */
     4/* $Id: ideals.cc,v 1.7 1997-05-21 13:05:12 obachman Exp $ */
    55/*
    66* ABSTRACT - all basic methods to manipulate ideals
    … …  
    29202920  if (idIs0(arg)) return idInit(1,arg->rank);
    29212921
    2922   int i,j,k=0,pC;
     2922  int i,j,k,pC;
    29232923  poly p,q;
    29242924  int rg=arg->rank;
    2925   ideal res = idInit(IDELEMS(arg),rg);
     2925  ideal res = idCopy(arg);
    29262926  intvec *indexMap=new intvec(rg+1);
    29272927  intvec *toKill=new intvec(rg+1);
    29282928
    2929   for (i=indexMap->length()-1;i>0;i--)
    2930     (*indexMap)[i] = i;
    2931   for (j=IDELEMS(arg)-1;j>=0;j--)
    2932   {
    2933     if (arg->m[j]!=NULL)
    2934     {
    2935       if ((pIsConstantComp(arg->m[j])) && (pNext(arg->m[j])==NULL))
    2936       {
    2937         pC = pGetComp(arg->m[j]);
     2929  loop
     2930  {
     2931    k = 0;
     2932    for (i=indexMap->length()-1;i>0;i--)
     2933    {
     2934      (*indexMap)[i] = i;
     2935      (*toKill)[i] = 0;
     2936    }
     2937    for (j=IDELEMS(res)-1;j>=0;j--)
     2938    {
     2939      if ((res->m[j]!=NULL) && (pIsConstantComp(res->m[j])) &&
     2940           (pNext(res->m[j])==NULL))
     2941      {
     2942        pC = pGetComp(res->m[j]);
    29382943        if ((*toKill)[pC]==0)
    29392944        {
    … …  
    29432948            (*indexMap)[i]--;
    29442949        }
    2945       }
    2946       else
    2947       {
    2948         res->m[k] = pCopy(arg->m[j]);
     2950        pDelete(&(res->m[j]));
    29492951        k++;
    29502952      }
    29512953    }
    2952   }
    2953   if (rg>0)
    2954   {
    2955     res->rank=rg;
    2956     for (j=IDELEMS(res)-1;j>=0;j--)
    2957     {
    2958       while ((res->m[j]!=NULL) && ((*toKill)[pGetComp(res->m[j])]==1))
    2959         pDelete1(&res->m[j]);
    2960       p = res->m[j];
    2961       while ((p!=NULL) && (pNext(p)!=NULL))
    2962       {
    2963         pSetComp(p,(*indexMap)[pGetComp(p)]);
    2964         while ((pNext(p)!=NULL) && ((*toKill)[pGetComp(pNext(p))]==1))
    2965           pDelete1(&pNext(p));
    2966         pIter(p);
    2967       }
    2968       if (p!=NULL) pSetComp(p,(*indexMap)[pGetComp(p)]);
    2969     }
    29702954    idSkipZeroes(res);
    2971   }
    2972   else
    2973   {
    2974     idDelete(&res);
    2975     res=idFreeModule(1);
     2955    if (k==0) break;
     2956    if (rg>0)
     2957    {
     2958      res->rank=rg;
     2959      for (j=IDELEMS(res)-1;j>=0;j--)
     2960      {
     2961        while ((res->m[j]!=NULL) && ((*toKill)[pGetComp(res->m[j])]==1))
     2962          pDelete1(&res->m[j]);
     2963        p = res->m[j];
     2964        while ((p!=NULL) && (pNext(p)!=NULL))
     2965        {
     2966          pSetComp(p,(*indexMap)[pGetComp(p)]);
     2967          while ((pNext(p)!=NULL) && ((*toKill)[pGetComp(pNext(p))]==1))
     2968            pDelete1(&pNext(p));
     2969          pIter(p);
     2970        }
     2971        if (p!=NULL) pSetComp(p,(*indexMap)[pGetComp(p)]);
     2972      }
     2973      idSkipZeroes(res);
     2974    }
     2975    else
     2976    {
     2977      idDelete(&res);
     2978      res=idFreeModule(1);
     2979      break;
     2980    }
    29762981  }
    29772982  delete toKill;

  • Singular/kutil.cc

    r670667 rdc32d42  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kutil.cc,v 1.4 1997-04-08 16:49:21 Singular Exp $ */
     4/* $Id: kutil.cc,v 1.5 1997-05-21 13:05:13 obachman Exp $ */
    55/*
    66* ABSTRACT: kernel: utils for std
    … …  
    33513351      strat->posInT = posInT0;
    33523352    }
    3353     if (TEST_OPT_NOTREGULARITY) strat->posInL =posInLSpecial;
     3353    //if (strat->minim>0) strat->posInL =posInLSpecial;
    33543354  }
    33553355  else
    … …  
    33663366    }
    33673367  }
     3368  if (strat->minim>0) strat->posInL =posInLSpecial;
    33683369  // for further tests only
    33693370  if ((BTEST1(11)) || (BTEST1(12)))

  • Singular/misc.cc

    r670667 rdc32d42  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: misc.cc,v 1.13 1997-05-20 08:52:10 Singular Exp $ */
     4/* $Id: misc.cc,v 1.14 1997-05-21 13:05:15 obachman Exp $ */
    55/*
    66* ABSTRACT:
    … …  
    3333#include "intvec.h"
    3434#define SI_DONT_HAVE_GLOBAL_VARS
     35
     36#ifdef HAVE_FACTORY
    3537#include <factory.h>
     38#endif
    3639
    3740/*0 implementation*/
    … …  
    180183#define HELP_NOT_FOUND 2
    181184#ifndef macintosh
    182 #define Index_File     SINGULAR_INFODIR "singular.hlp"
    183 #define Help_File      SINGULAR_INFODIR "singular.hlp"
     185#define Index_File     SINGULAR_INFODIR "/singular.hlp"
     186#define Help_File      SINGULAR_INFODIR "/singular.hlp"
    184187#else
    185188#define Index_File     "singular.hlp"

  • Singular/mpsr_Tok.cc

    r670667 rdc32d42  
    33****************************************/
    44
    5 /* $Id: mpsr_Tok.cc,v 1.8 1997-05-02 22:09:29 obachman Exp $ */
     5/* $Id: mpsr_Tok.cc,v 1.9 1997-05-21 13:05:15 obachman Exp $ */
    66
    77/***************************************************************
    … …  
    567567#endif // GENTABLE
    568568
     569#else // NOT HAVE_MPSR
     570
     571#ifdef GENTABLE
     572
     573// simply touch mpsr_Tok.inc so that Make does not get confused
     574#ifndef macintosh
     575extern "C" int system(char *);
     576#else
     577#include <stdio.h>
     578#endif
     579
     580void mpsr_ttGen()
     581{
     582#ifndef macintosh
     583  system("touch mpsr_Tok.inc");
     584#else
     585  FILE fd = fopen("mpsr_Tok.inc", "w");
     586  close(fd);
     587#endif
     588}
     589#endif
     590
    569591#endif // HAVE_MPSR

  • Singular/tesths.cc

    r670667 rdc32d42  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: tesths.cc,v 1.14 1997-05-20 08:52:11 Singular Exp $ */
     4/* $Id: tesths.cc,v 1.15 1997-05-21 13:05:16 obachman Exp $ */
    55
    66/*
    … …  
    5959  extern ttGen1();
    6060  extern ttGen2();
    61 #ifdef HAVE_MPSR   
    6261  extern mpsr_ttGen(); // For initialization of (CMD, MP_COP) tables
    6362  mpsr_ttGen();
    64 #endif 
    6563  ttGen1();
    6664  ttGen2();
    … …  
    153151#endif
    154152#ifdef HAVE_GMP
     153#if defined (__GNU_MP_VERSION) && defined (__GNU_MP_VERSION_MINOR)
    155154              printf("\tGMP(%d.%d),\n",__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR);
     155#else
     156              printf("\tGMP(1.3),\n");
     157#endif             
    156158#endif
    157159#ifdef HAVE_DBM

  • configure

    r670667 rdc32d42  
    874874fi
    875875
     876echo $ac_n "checking whether _AIX is defined""... $ac_c" 1>&6
     877if eval "test \"`echo '$''{'ac_cv_is_aix'+set}'`\" = set"; then
     878  echo $ac_n "(cached) $ac_c" 1>&6
     879else
     880  cat > conftest.$ac_ext <<EOF
     881#line 882 "configure"
     882#include "confdefs.h"
     883#ifdef _AIX
     884    yes
     885#endif
     886
     887EOF
     888if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
     889  egrep "yes" >/dev/null 2>&1; then
     890  rm -rf conftest*
     891  ac_cv_is_aix=yes
     892else
     893  rm -rf conftest*
     894  ac_cv_is_aix=no
     895fi
     896rm -f conftest*
     897
     898fi
     899
     900if test "$ac_cv_is_aix" = yes; then
     901  echo "$ac_t""yes" 1>&6
     902else
     903  echo "$ac_t""no" 1>&6
     904fi
    876905
    877906
    … …  
    884913LIBS="-lm  $LIBS"
    885914cat > conftest.$ac_ext <<EOF
    886 #line 887 "configure"
     915#line 916 "configure"
    887916#include "confdefs.h"
    888917/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    894923; return 0; }
    895924EOF
    896 if { (eval echo configure:897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     925if { (eval echo configure:926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    897926  rm -rf conftest*
    898927  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    926955LIBS="-lgmp  $LIBS"
    927956cat > conftest.$ac_ext <<EOF
    928 #line 929 "configure"
     957#line 958 "configure"
    929958#include "confdefs.h"
    930959/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    936965; return 0; }
    937966EOF
    938 if { (eval echo configure:939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     967if { (eval echo configure:968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    939968  rm -rf conftest*
    940969  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    968997LIBS="-lMP  $LIBS"
    969998cat > conftest.$ac_ext <<EOF
    970 #line 971 "configure"
     999#line 1000 "configure"
    9711000#include "confdefs.h"
    9721001/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    9781007; return 0; }
    9791008EOF
    980 if { (eval echo configure:981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1009if { (eval echo configure:1010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    9811010  rm -rf conftest*
    9821011  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    10101039LIBS="-lMPT  $LIBS"
    10111040cat > conftest.$ac_ext <<EOF
    1012 #line 1013 "configure"
     1041#line 1042 "configure"
    10131042#include "confdefs.h"
    10141043/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    10201049; return 0; }
    10211050EOF
    1022 if { (eval echo configure:1023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1051if { (eval echo configure:1052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    10231052  rm -rf conftest*
    10241053  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    10521081LIBS="-lsingcf  $LIBS"
    10531082cat > conftest.$ac_ext <<EOF
    1054 #line 1055 "configure"
     1083#line 1084 "configure"
    10551084#include "confdefs.h"
    10561085/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    10621091; return 0; }
    10631092EOF
    1064 if { (eval echo configure:1065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1093if { (eval echo configure:1094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    10651094  rm -rf conftest*
    10661095  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    10941123LIBS="-lsingfac  $LIBS"
    10951124cat > conftest.$ac_ext <<EOF
    1096 #line 1097 "configure"
     1125#line 1126 "configure"
    10971126#include "confdefs.h"
    10981127/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    11041133; return 0; }
    11051134EOF
    1106 if { (eval echo configure:1107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1135if { (eval echo configure:1136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    11071136  rm -rf conftest*
    11081137  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    11371166else
    11381167  cat > conftest.$ac_ext <<EOF
    1139 #line 1140 "configure"
     1168#line 1169 "configure"
    11401169#include "confdefs.h"
    11411170#include <$ac_hdr>
    11421171EOF
    11431172ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1144 { (eval echo configure:1145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1173{ (eval echo configure:1174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    11451174ac_err=`grep -v '^ *+' conftest.out`
    11461175if test -z "$ac_err"; then
    … …  
    11691198if test "$ac_cv_lib_gmp_mpz_init" = yes && \
    11701199 test "$ac_cv_header_gmp_h" = yes; then
    1171   if echo $target_os | egrep aix; then
    1172     cat > conftest.$ac_ext <<EOF
    1173 #line 1174 "configure"
    1174 #include "confdefs.h"
    1175 \
    1176      #include <gmp.h>
    1177     #if defined(__GNU_MP_VERSION) &&  __GNU_MP_VERSION == 2
    1178     no
    1179     #else
    1180     yes
    1181     #endif
    1182    
    1183 EOF
    1184 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    1185   egrep "yes" >/dev/null 2>&1; then
    1186   rm -rf conftest*
    1187   ac_gmp_ok=yes
    1188 else
    1189   rm -rf conftest*
    1190   echo "configure: warning: Found gmp lib version>2 which is broken under AIX: Can not use it" 1>&2
    1191 fi
    1192 rm -f conftest*
    1193 
    1194   else
    11951200    ac_gmp_ok=yes
    1196   fi
    11971201fi
    11981202
    … …  
    12561260fi
    12571261if test "$enable_gmp" = yes && test -d gmp; then
    1258   echo "$ac_t""yes" 1>&6
    1259   CONFIG_SUBDIRS="gmp"
    1260   ac_configure_args="$ac_configure_args --enable-gmp"
     1262  if test "$ac_cv_is_aix" = yes && test "$GCC" = yes; then
     1263    echo "$ac_t""no" 1>&6
     1264    echo "configure: warning: Building gmp v2 with gcc results in a gmp lib with bugs" 1>&2
     1265    echo "configure: warning: Install gmp v2 with another compiler first or use gmp v1.3" 1>&2
     1266    echo "configure: warning: For the time being gmp is neither configured/built nor used" 1>&2
     1267    enable_gmp=no
     1268    ac_configure_args="$ac_configure_args --disable-gmp"
     1269  else
     1270    echo "$ac_t""yes" 1>&6
     1271    CONFIG_SUBDIRS="gmp"
     1272    ac_configure_args="$ac_configure_args --enable-gmp"
     1273  fi
    12611274else
    12621275  echo "$ac_t""no" 1>&6
    … …  
    12771290fi
    12781291if test "$enable_MP" = yes && test -d MP; then
    1279   echo "$ac_t""yes" 1>&6
    1280   CONFIG_SUBDIRS="$CONFIG_SUBDIRS MP"
    1281   ac_configure_args="$ac_configure_args --enable-MP"
     1292  if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
     1293    echo "$ac_t""yes" 1>&6
     1294    CONFIG_SUBDIRS="$CONFIG_SUBDIRS MP"
     1295    ac_configure_args="$ac_configure_args --enable-MP"
     1296  else
     1297    echo "$ac_t""no" 1>&6
     1298    echo "configure: warning: Can not build MP for Singular without having gmp" 1>&2
     1299    enable_MP=no
     1300    ac_configure_args="$ac_configure_args --disable-MP"
     1301  fi
    12821302else
    12831303  echo "$ac_t""no" 1>&6
    … …  
    12981318fi
    12991319if test "$enable_factory" = yes && test -d factory; then
     1320  if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
    13001321  echo "$ac_t""yes" 1>&6
    13011322  CONFIG_SUBDIRS="$CONFIG_SUBDIRS factory"
    13021323  ac_configure_args="$ac_configure_args --enable-factory"
     1324  else
     1325    echo "$ac_t""no" 1>&6
     1326    echo "configure: warning: Can not build factory without having gmp" 1>&2
     1327    enable_factory=no
     1328    ac_configure_args="$ac_configure_args --disable-factory"
     1329  fi
    13031330else
    13041331  echo "$ac_t""no" 1>&6
    … …  
    13191346fi
    13201347if test "$enable_libfac" = yes && test -d libfac; then
     1348  if test "$ac_factory_ok" = yes || test "$enable_factory" = yes; then
    13211349  echo "$ac_t""yes" 1>&6
    13221350  CONFIG_SUBDIRS="$CONFIG_SUBDIRS libfac"
    13231351  ac_configure_args="$ac_configure_args --enable-libfac"
     1352  else
     1353    echo "$ac_t""no" 1>&6
     1354    echo "configure: warning: Can not build libfac without factory" 1>&2
     1355    enable_libfac=no
     1356    ac_configure_args="$ac_configure_args --disable-libfac"
     1357  fi
    13241358else
    13251359  echo "$ac_t""no" 1>&6
    … …  
    13331367echo $ac_n "checking whether to configure and build Singular""... $ac_c" 1>&6
    13341368if test "$enable_Singular" != yes && test "$enable_Singular" != no; then
    1335   if test "$with_Singular" != no && test "$ac_Singular_ok" != yes; then
     1369  if test "$with_Singular" != no; then
    13361370    enable_Singular=yes
    13371371  else
    … …  
    13531387
    13541388
    1355 echo $ac_n "checking whether to use gmp""... $ac_c" 1>&6
    1356 if test "$with_gmp" != no; then
    1357   if test "$ac_gmp_ok" != yes; then
    1358     if test "$enable_gmp" = yes; then
    1359       if echo $target_os | egrep aix; then
    1360         ac_with_gmp=no
    1361         ac_aix_warn=yes
    1362       else
    1363         ac_with_gmp=yes
    1364       fi
    1365     else
    1366       ac_with_gmp=no
    1367     fi
    1368   else
    1369     ac_with_gmp=yes
    1370   fi
    1371   if test "$ac_with_gmp"=yes; then
    1372     if test "$with_gmp" != yes; then
    1373       with_gmp=yes
    1374       ac_configure_args="$ac_configure_args --with-gmp"
    1375     fi
     1389echo $ac_n "checking whether to use with gmp""... $ac_c" 1>&6
     1390if test "$with_gmp" != no && test "$with_gmp" != yes; then
     1391  if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
     1392    with_gmp=yes
    13761393  else
    13771394    with_gmp=no
    1378     ac_configure_args="$ac_configure_args --without-gmp"
    1379   fi
    1380 fi
    1381 if test "$with_gmp" != no; then
     1395  fi
     1396  ac_configure_args="$ac_configure_args --with-gmp=$with_gmp"
     1397fi
     1398if test "$with_gmp" = yes; then
    13821399  echo "$ac_t""yes" 1>&6
    13831400else
    13841401  echo "$ac_t""no" 1>&6
    13851402fi
    1386 if test "$ac_aix_warn" = yes; then
    1387   echo "configure: warning: gmp version 2 has a bug under AIX" 1>&2
    1388 fi
    1389 
    1390 echo $ac_n "checking whether to use MP""... $ac_c" 1>&6
    1391 if test "$with_MP" != no; then
    1392   if test "$ac_MP_ok" != yes; then
    1393     if test "$enable_MP" = yes; then
    1394       if test "$with_gmp" != yes; then
    1395         ac_with_MP=no
    1396         ac_gmp_warn=yes
    1397       else
    1398         ac_with_MP=yes
    1399       fi
    1400     else
    1401       ac_with_MP=no
    1402     fi
    1403   else
    1404     ac_with_MP=yes
    1405   fi
    1406   if test "$ac_with_MP"=yes; then
    1407     if test "$with_MP" != yes; then
    1408       with_MP=yes
    1409       ac_configure_args="$ac_configure_args --with-MP"
    1410     fi
     1403
     1404echo $ac_n "checking whether to use with MP""... $ac_c" 1>&6
     1405if test "$with_MP" != no && test "$with_MP" != yes; then
     1406  if test "$ac_MP_ok" = yes || test "$enable_MP" = yes; then
     1407    with_MP=yes
    14111408  else
    14121409    with_MP=no
    1413     ac_configure_args="$ac_configure_args --without-MP"
    1414   fi
    1415 fi
    1416 if test "$with_MP" != no; then
     1410  fi
     1411  ac_configure_args="$ac_configure_args --with-MP=$with_MP"
     1412fi
     1413if test "$with_MP" = yes; then
    14171414  echo "$ac_t""yes" 1>&6
    14181415else
    14191416  echo "$ac_t""no" 1>&6
    14201417fi
    1421 if test "$ac_gmp_warn" = yes; then
    1422   echo "configure: warning: Need gmp to use MP" 1>&2
    1423 fi
    1424 
    1425 echo $ac_n "checking whether to use factory""... $ac_c" 1>&6
    1426 if test "$with_factory" != no; then
    1427   if test "$ac_factory_ok" != yes; then
    1428     if test "$enable_factory" = yes; then
    1429       if test "$with_gmp" != yes; then
    1430         ac_with_factory=no
    1431         ac_gmp_warn=yes
    1432       else
    1433         ac_with_factory=yes
    1434       fi
    1435     else
    1436       ac_with_factory=no
    1437     fi
    1438   else
    1439     ac_with_factory=yes
    1440   fi
    1441   if test "$ac_with_factory"=yes; then
    1442     if test "$with_factory" != yes; then
    1443       with_factory=yes
    1444       ac_configure_args="$ac_configure_args --with-factory"
    1445     fi
     1418
     1419echo $ac_n "checking whether to use with factory""... $ac_c" 1>&6
     1420if test "$with_factory" != no && test "$with_factory" != yes; then
     1421  if test "$ac_factory_ok" = yes || test "$enable_factory" = yes; then
     1422    with_factory=yes
    14461423  else
    14471424    with_factory=no
    1448     ac_configure_args="$ac_configure_args --without-factory"
    1449   fi
    1450 fi
    1451 if test "$with_factory" != no; then
     1425  fi
     1426  ac_configure_args="$ac_configure_args --with-factory=$with_factory"
     1427fi
     1428if test "$with_factory" = yes; then
    14521429  echo "$ac_t""yes" 1>&6
    14531430else
    14541431  echo "$ac_t""no" 1>&6
    14551432fi
    1456 if test "$ac_gmp_warn" = yes; then
    1457   echo "configure: warning: Need gmp to use factory" 1>&2
    1458 fi
    1459  
    1460 echo $ac_n "checking whether to use libfac""... $ac_c" 1>&6
    1461 if test "$with_libfac" != no; then
    1462   if test "$ac_libfac_ok" != yes; then
    1463     if test "$enable_libfac" = yes; then
    1464       if test "$with_gmp" != yes || test "$with_factory" != yes; then
    1465         ac_with_libfac=no
    1466         ac_gmp_warn=yes
    1467       else
    1468         ac_with_libfac=yes
    1469       fi
    1470     else
    1471       ac_with_libfac=no
    1472     fi
    1473   else
    1474     ac_with_libfac=yes
    1475   fi
    1476   if test "$ac_with_libfac"=yes; then
    1477     if test "$with_libfac" != yes; then
    1478       with_libfac=yes
    1479       ac_configure_args="$ac_configure_args --with-libfac"
    1480     fi
     1433
     1434echo $ac_n "checking whether to use with libfac""... $ac_c" 1>&6
     1435if test "$with_libfac" != no && test "$with_libfac" != yes; then
     1436  if test "$ac_libfac_ok" = yes || test "$enable_libfac" = yes; then
     1437    with_libfac=yes
    14811438  else
    14821439    with_libfac=no
    1483     ac_configure_args="$ac_configure_args --without-libfac"
    1484   fi
    1485 fi
    1486 if test "$with_libfac" != no; then
     1440  fi
     1441  ac_configure_args="$ac_configure_args --with-libfac=$with_libfac"
     1442fi
     1443if test "$with_libfac" = yes; then
    14871444  echo "$ac_t""yes" 1>&6
    14881445else
    14891446  echo "$ac_t""no" 1>&6
    14901447fi
    1491 if test "$ac_gmp_warn" = yes; then
    1492   echo "configure: warning: Need gmp and factory to use libfac" 1>&2
    1493 fi
    1494 
    1495 echo $ac_n "checking whether to build with Singular""... $ac_c" 1>&6
    1496 if test "$with_Singular" != no; then
     1448
     1449echo $ac_n "checking whether to use with Singular""... $ac_c" 1>&6
     1450if test "$with_Singular" != no && test "$with_Singular" != yes; then
    14971451  if test "$enable_Singular" = yes; then
    1498         ac_with_Singular=yes
    1499   else
    1500     ac_with_Singular=no
    1501   fi
    1502   if test "$ac_with_Singular"=yes; then
    1503     if test "$with_Singular" != yes; then
    1504       with_Singular=yes
    1505       ac_configure_args="$ac_configure_args --with-Singular"
    1506     fi
     1452    with_Singular=yes
    15071453  else
    15081454    with_Singular=no
    1509     ac_configure_args="$ac_configure_args --without-Singular"
    1510   fi
    1511 fi
     1455  fi
     1456  ac_configure_args="$ac_configure_args --with-Singular=$with_Singular"
     1457fi
     1458
    15121459if test "$with_Singular" != no; then
    15131460  echo "$ac_t""yes" 1>&6
    … …  
    18681815  done
    18691816fi
     1817

  • configure.in

    r670667 rdc32d42  
    4343fi
    4444
     45AC_MSG_CHECKING(whether _AIX is defined)
     46AC_CACHE_VAL(ac_cv_is_aix,
     47AC_EGREP_CPP(yes,
     48[#ifdef _AIX
     49    yes
     50#endif
     51], ac_cv_is_aix=yes, ac_cv_is_aix=no, 1))
     52if test "$ac_cv_is_aix" = yes; then
     53  AC_MSG_RESULT(yes)
     54else
     55  AC_MSG_RESULT(no)
     56fi
    4557
    4658
    … …  
    5971if test "$ac_cv_lib_gmp_mpz_init" = yes && \
    6072 test "$ac_cv_header_gmp_h" = yes; then
    61   if echo $target_os | egrep aix; then
    62     AC_EGREP_CPP(yes,\
    63      [#include <gmp.h>
    64     #if defined(__GNU_MP_VERSION) &&  __GNU_MP_VERSION == 2
    65     no
    66     #else
    67     yes
    68     #endif
    69     ],
    70     ac_gmp_ok=yes,
    71     AC_MSG_WARN(Found gmp lib version>2 which is broken under AIX: Can not use it))
    72   else
    7373    ac_gmp_ok=yes
    74   fi
    7574fi
    7675
    … …  
    122121fi
    123122if test "$enable_gmp" = yes && test -d gmp; then
    124   AC_MSG_RESULT(yes)
    125   CONFIG_SUBDIRS="gmp"
    126   ac_configure_args="$ac_configure_args --enable-gmp"
     123  if test "$ac_cv_is_aix" = yes && test "$GCC" = yes; then
     124    AC_MSG_RESULT(no)
     125    AC_MSG_WARN(Building gmp v2 with gcc results in a gmp lib with bugs)
     126    AC_MSG_WARN(Install gmp v2 with another compiler first or use gmp v1.3)
     127    AC_MSG_WARN(For the time being gmp is neither configured/built nor used)
     128    enable_gmp=no
     129    ac_configure_args="$ac_configure_args --disable-gmp"
     130  else
     131    AC_MSG_RESULT(yes)
     132    CONFIG_SUBDIRS="gmp"
     133    ac_configure_args="$ac_configure_args --enable-gmp"
     134  fi
    127135else
    128136  AC_MSG_RESULT(no)
    … …  
    143151fi
    144152if test "$enable_MP" = yes && test -d MP; then
    145   AC_MSG_RESULT(yes)
    146   CONFIG_SUBDIRS="$CONFIG_SUBDIRS MP"
    147   ac_configure_args="$ac_configure_args --enable-MP"
     153  if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
     154    AC_MSG_RESULT(yes)
     155    CONFIG_SUBDIRS="$CONFIG_SUBDIRS MP"
     156    ac_configure_args="$ac_configure_args --enable-MP"
     157  else
     158    AC_MSG_RESULT(no)
     159    AC_MSG_WARN(Can not build MP for Singular without having gmp)
     160    enable_MP=no
     161    ac_configure_args="$ac_configure_args --disable-MP"
     162  fi
    148163else
    149164  AC_MSG_RESULT(no)
    … …  
    164179fi
    165180if test "$enable_factory" = yes && test -d factory; then
     181  if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
    166182  AC_MSG_RESULT(yes)
    167183  CONFIG_SUBDIRS="$CONFIG_SUBDIRS factory"
    168184  ac_configure_args="$ac_configure_args --enable-factory"
     185  else
     186    AC_MSG_RESULT(no)
     187    AC_MSG_WARN(Can not build factory without having gmp)
     188    enable_factory=no
     189    ac_configure_args="$ac_configure_args --disable-factory"
     190  fi
    169191else
    170192  AC_MSG_RESULT(no)
    … …  
    185207fi
    186208if test "$enable_libfac" = yes && test -d libfac; then
     209  if test "$ac_factory_ok" = yes || test "$enable_factory" = yes; then
    187210  AC_MSG_RESULT(yes)
    188211  CONFIG_SUBDIRS="$CONFIG_SUBDIRS libfac"
    189212  ac_configure_args="$ac_configure_args --enable-libfac"
     213  else
     214    AC_MSG_RESULT(no)
     215    AC_MSG_WARN(Can not build libfac without factory)
     216    enable_libfac=no
     217    ac_configure_args="$ac_configure_args --disable-libfac"
     218  fi
    190219else
    191220  AC_MSG_RESULT(no)
    … …  
    199228AC_MSG_CHECKING(whether to configure and build Singular)
    200229if test "$enable_Singular" != yes && test "$enable_Singular" != no; then
    201   if test "$with_Singular" != no && test "$ac_Singular_ok" != yes; then
     230  if test "$with_Singular" != no; then
    202231    enable_Singular=yes
    203232  else
    … …  
    222251dnl Check whether or not to use various packages
    223252dnl
    224 AC_MSG_CHECKING(whether to use gmp)
    225 if test "$with_gmp" != no; then
    226   if test "$ac_gmp_ok" != yes; then
    227     if test "$enable_gmp" = yes; then
    228       if echo $target_os | egrep aix; then
    229         ac_with_gmp=no
    230         ac_aix_warn=yes
    231       else
    232         ac_with_gmp=yes
    233       fi
    234     else
    235       ac_with_gmp=no
    236     fi
    237   else
    238     ac_with_gmp=yes
    239   fi
    240   if test "$ac_with_gmp"=yes; then
    241     if test "$with_gmp" != yes; then
    242       with_gmp=yes
    243       ac_configure_args="$ac_configure_args --with-gmp"
    244     fi
     253AC_MSG_CHECKING(whether to use with gmp)
     254if test "$with_gmp" != no && test "$with_gmp" != yes; then
     255  if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
     256    with_gmp=yes
    245257  else
    246258    with_gmp=no
    247     ac_configure_args="$ac_configure_args --without-gmp"
    248   fi
    249 fi
    250 if test "$with_gmp" != no; then
    251   AC_MSG_RESULT(yes)
    252 else
    253   AC_MSG_RESULT(no)
    254 fi
    255 if test "$ac_aix_warn" = yes; then
    256   AC_MSG_WARN(gmp version 2 has a bug under AIX)
    257 fi
    258 
    259 AC_MSG_CHECKING(whether to use MP)
    260 if test "$with_MP" != no; then
    261   if test "$ac_MP_ok" != yes; then
    262     if test "$enable_MP" = yes; then
    263       if test "$with_gmp" != yes; then
    264         ac_with_MP=no
    265         ac_gmp_warn=yes
    266       else
    267         ac_with_MP=yes
    268       fi
    269     else
    270       ac_with_MP=no
    271     fi
    272   else
    273     ac_with_MP=yes
    274   fi
    275   if test "$ac_with_MP"=yes; then
    276     if test "$with_MP" != yes; then
    277       with_MP=yes
    278       ac_configure_args="$ac_configure_args --with-MP"
    279     fi
     259  fi
     260  ac_configure_args="$ac_configure_args --with-gmp=$with_gmp"
     261fi
     262if test "$with_gmp" = yes; then
     263  AC_MSG_RESULT(yes)
     264else
     265  AC_MSG_RESULT(no)
     266fi
     267
     268AC_MSG_CHECKING(whether to use with MP)
     269if test "$with_MP" != no && test "$with_MP" != yes; then
     270  if test "$ac_MP_ok" = yes || test "$enable_MP" = yes; then
     271    with_MP=yes
    280272  else
    281273    with_MP=no
    282     ac_configure_args="$ac_configure_args --without-MP"
    283   fi
    284 fi
    285 if test "$with_MP" != no; then
    286   AC_MSG_RESULT(yes)
    287 else
    288   AC_MSG_RESULT(no)
    289 fi
    290 if test "$ac_gmp_warn" = yes; then
    291   AC_MSG_WARN(Need gmp to use MP)
    292 fi
    293 
    294 AC_MSG_CHECKING(whether to use factory)
    295 if test "$with_factory" != no; then
    296   if test "$ac_factory_ok" != yes; then
    297     if test "$enable_factory" = yes; then
    298       if test "$with_gmp" != yes; then
    299         ac_with_factory=no
    300         ac_gmp_warn=yes
    301       else
    302         ac_with_factory=yes
    303       fi
    304     else
    305       ac_with_factory=no
    306     fi
    307   else
    308     ac_with_factory=yes
    309   fi
    310   if test "$ac_with_factory"=yes; then
    311     if test "$with_factory" != yes; then
    312       with_factory=yes
    313       ac_configure_args="$ac_configure_args --with-factory"
    314     fi
     274  fi
     275  ac_configure_args="$ac_configure_args --with-MP=$with_MP"
     276fi
     277if test "$with_MP" = yes; then
     278  AC_MSG_RESULT(yes)
     279else
     280  AC_MSG_RESULT(no)
     281fi
     282
     283AC_MSG_CHECKING(whether to use with factory)
     284if test "$with_factory" != no && test "$with_factory" != yes; then
     285  if test "$ac_factory_ok" = yes || test "$enable_factory" = yes; then
     286    with_factory=yes
    315287  else
    316288    with_factory=no
    317     ac_configure_args="$ac_configure_args --without-factory"
    318   fi
    319 fi
    320 if test "$with_factory" != no; then
    321   AC_MSG_RESULT(yes)
    322 else
    323   AC_MSG_RESULT(no)
    324 fi
    325 if test "$ac_gmp_warn" = yes; then
    326   AC_MSG_WARN(Need gmp to use factory)
    327 fi
    328  
    329 AC_MSG_CHECKING(whether to use libfac)
    330 if test "$with_libfac" != no; then
    331   if test "$ac_libfac_ok" != yes; then
    332     if test "$enable_libfac" = yes; then
    333       if test "$with_gmp" != yes || test "$with_factory" != yes; then
    334         ac_with_libfac=no
    335         ac_gmp_warn=yes
    336       else
    337         ac_with_libfac=yes
    338       fi
    339     else
    340       ac_with_libfac=no
    341     fi
    342   else
    343     ac_with_libfac=yes
    344   fi
    345   if test "$ac_with_libfac"=yes; then
    346     if test "$with_libfac" != yes; then
    347       with_libfac=yes
    348       ac_configure_args="$ac_configure_args --with-libfac"
    349     fi
     289  fi
     290  ac_configure_args="$ac_configure_args --with-factory=$with_factory"
     291fi
     292if test "$with_factory" = yes; then
     293  AC_MSG_RESULT(yes)
     294else
     295  AC_MSG_RESULT(no)
     296fi
     297
     298AC_MSG_CHECKING(whether to use with libfac)
     299if test "$with_libfac" != no && test "$with_libfac" != yes; then
     300  if test "$ac_libfac_ok" = yes || test "$enable_libfac" = yes; then
     301    with_libfac=yes
    350302  else
    351303    with_libfac=no
    352     ac_configure_args="$ac_configure_args --without-libfac"
    353   fi
    354 fi
    355 if test "$with_libfac" != no; then
    356   AC_MSG_RESULT(yes)
    357 else
    358   AC_MSG_RESULT(no)
    359 fi
    360 if test "$ac_gmp_warn" = yes; then
    361   AC_MSG_WARN(Need gmp and factory to use libfac)
    362 fi
    363 
    364 AC_MSG_CHECKING(whether to build with Singular)
    365 if test "$with_Singular" != no; then
     304  fi
     305  ac_configure_args="$ac_configure_args --with-libfac=$with_libfac"
     306fi
     307if test "$with_libfac" = yes; then
     308  AC_MSG_RESULT(yes)
     309else
     310  AC_MSG_RESULT(no)
     311fi
     312
     313AC_MSG_CHECKING(whether to use with Singular)
     314if test "$with_Singular" != no && test "$with_Singular" != yes; then
    366315  if test "$enable_Singular" = yes; then
    367         ac_with_Singular=yes
    368   else
    369     ac_with_Singular=no
    370   fi
    371   if test "$ac_with_Singular"=yes; then
    372     if test "$with_Singular" != yes; then
    373       with_Singular=yes
    374       ac_configure_args="$ac_configure_args --with-Singular"
    375     fi
     316    with_Singular=yes
    376317  else
    377318    with_Singular=no
    378     ac_configure_args="$ac_configure_args --without-Singular"
    379   fi
    380 fi
     319  fi
     320  ac_configure_args="$ac_configure_args --with-Singular=$with_Singular"
     321fi
     322
    381323if test "$with_Singular" != no; then
    382324  AC_MSG_RESULT(yes)

  • libfac/ChangeLog

    r670667 rdc32d42  
     1Tue May 13 11:32:11 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
     2
     3        * Makefile.in (uninstall): took out template installation
     4        (all): added OPTOBJ target so that the dir is created, if necessary
     5
     6Tue May 13 20:09:03 1997  Olaf Bachmann  <obachman@schlupp.mathematik.uni-kl.de (Olaf Bachmann)>
     7
     8        * configure.in: Exit with error if factory.h was not found and
     9          --enable-factory option was not explicitely given
     10
    111Tue May 13 11:32:11 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
    212

  • libfac/Makefile.in

    r670667 rdc32d42  
    1 # $Id: Makefile.in,v 1.5 1997-05-13 10:09:17 obachman Exp $
     1# $Id: Makefile.in,v 1.6 1997-05-21 13:05:34 obachman Exp $
    22#################################################
    33SHELL           = /bin/sh
    … …  
    8484##
    8585
     86
     87all: OPTOBJ ${TARGETNAME}
     88
     89OPTOBJ:
     90        ${MKINSTALLDIRS} OPTOBJ
     91
    8692.SUFFIXES:      .cc .h .o
    87 
    88 all: ${TARGETNAME}
    8993
    9094OPTOBJ/%.o: %.cc

  • libfac/configure

    r670667 rdc32d42  
    794794fi
    795795
    796 ac_safe=`echo "factory.h" | tr './\055' '___'`
    797 echo $ac_n "checking for factory.h""... $ac_c" 1>&6
     796for ac_hdr in factory.h
     797do
     798ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
     799echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    798800if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    799801  echo $ac_n "(cached) $ac_c" 1>&6
    800802else
    801803  cat > conftest.$ac_ext <<EOF
    802 #line 803 "configure"
     804#line 805 "configure"
    803805#include "confdefs.h"
    804 #include <factory.h>
     806#include <$ac_hdr>
    805807EOF
    806808ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    807 { (eval echo configure:808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     809{ (eval echo configure:810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    808810ac_err=`grep -v '^ *+' conftest.out`
    809811if test -z "$ac_err"; then
    … …  
    819821if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    820822  echo "$ac_t""yes" 1>&6
    821   :
     823    ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'`
     824  cat >> confdefs.h <<EOF
     825#define $ac_tr_hdr 1
     826EOF
     827 
    822828else
    823829  echo "$ac_t""no" 1>&6
    824 echo "configure: warning: factory.h not found!" 1>&2
    825 fi
    826 
     830fi
     831done
     832
     833
     834if test "$ac_cv_header_factory_h" != yes; then
     835  if test "$enable_factory" != yes; then
     836    { echo "configure: error: Need factory.h to built libfac" 1>&2; exit 1; }
     837  else
     838    echo "configure: warning: Make sure to _install_ factory.h befor building libfac" 1>&2
     839  fi
     840fi
    827841
    828842
    … …  
    833847else
    834848  cat > conftest.$ac_ext <<EOF
    835 #line 836 "configure"
     849#line 850 "configure"
    836850#include "confdefs.h"
    837851
    … …  
    883897; return 0; }
    884898EOF
    885 if { (eval echo configure:886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     899if { (eval echo configure:900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    886900  rm -rf conftest*
    887901  ac_cv_c_const=yes
    … …  
    909923for ac_kw in inline __inline__ __inline; do
    910924  cat > conftest.$ac_ext <<EOF
    911 #line 912 "configure"
     925#line 926 "configure"
    912926#include "confdefs.h"
    913927
    … …  
    917931; return 0; }
    918932EOF
    919 if { (eval echo configure:920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     933if { (eval echo configure:934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    920934  rm -rf conftest*
    921935  ac_cv_c_inline=$ac_kw; break

  • libfac/configure.in

    r670667 rdc32d42  
    8989dnl Checks for header files.
    9090dnl
    91 AC_CHECK_HEADER(factory.h,,AC_MSG_WARN(factory.h not found!))
     91AC_CHECK_HEADERS(factory.h)
     92
     93if test "$ac_cv_header_factory_h" != yes; then
     94  if test "$enable_factory" != yes; then
     95    AC_MSG_ERROR(Need factory.h to built libfac)
     96  else
     97    AC_MSG_WARN(Make sure to _install_ factory.h befor building libfac)
     98  fi
     99fi
    92100
    93101dnl
Note: See TracChangeset for help on using the changeset viewer.