Changeset 3a40eb in git


Ignore:
Timestamp:
Aug 20, 2013, 11:36:28 PM (10 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')
Children:
1dbfb4a46972767ca8f476540e393e0f2f779abb
Parents:
737c95d182062884bee7e54bf8afd4484d84f6c6
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-08-20 23:36:28+02:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-08-21 00:31:27+02:00
Message:
Porting Mathic to SW : mostly original sources from master
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.am

    r737c95 r3a40eb  
    138138   subexpr.cc\
    139139   pyobject_setup.cc\
     140   singmathic.cc\
    140141   walk.cc\
    141142   walk_ip.cc\

  • Singular/mod_lib.h

    r737c95 r3a40eb  
    22#define MOD_LIB_H
    33
    4 // #include <config.h>         /* for EMBED_PYTHON */
     4// #include <config.h>         /* for EMBED_PYTHON, HAVE_MATHICGB */
    55
    66#include <polys/mod_raw.h>  /* for lib_types */
    … …  
    1010#ifdef EMBED_PYTHON
    1111#define SI_BUILTIN_PYOBJECT(add) add(pyobject) add(syzextra)
     12//TODO: the line above means that syzextra should be staticly embedded IFF pyobjects do so :(
    1213#else
    1314#define SI_BUILTIN_PYOBJECT(add)
     15#endif
     16
     17#ifdef HAVE_MATHICGB
     18# define SI_BUILTIN_MATHIC(add) add(singmathic)
     19#else
     20# define SI_BUILTIN_MATHIC(add)
    1421#endif
    1522
    … …  
    1825#define SI_FOREACH_BUILTIN(add)\
    1926    add(staticdemo)\
     27    SI_BUILTIN_MATHIC(add)\
    2028    SI_BUILTIN_PYOBJECT(add)
    2129
    … …  
    2331
    2432#endif
     33

  • configure.ac

    r737c95 r3a40eb  
    1010
    1111AC_CONFIG_HEADER([config.h])
     12
     13dnl Apparently, this is required for using an AC_CHECK_HEADER within AS_IF(...), at least on Cygwin.
     14AC_USE_SYSTEM_EXTENSIONS
    1215
    1316AM_MAINTAINER_MODE
    … …  
    5760LB_CHECK_NTL(5.0,,AC_MSG_WARN([Unable to find NTL (which is strongly recommended) on your machine: please use --with-ntl=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
    5861LB_CHECK_FLINT(2.3,,AC_MSG_WARN([Unable to find FLINT (which is strongly recommended) on your machine: please use --with-flint=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
     62LB_CHECK_MATHICGB
     63
    5964
    6065AX_PYTHON_DEFAULT()
    … …  
    8792### the following is needed due to the use of om_sing_opt_show_mem in misc_ip.cc...
    8893#ac_configure_args="$ac_configure_args --with-external-config_h=../Singular/omSingularConfig.h"
     94
    8995
    9096AC_ARG_ENABLE(omalloc, AS_HELP_STRING([--disable-omalloc], [do NOT use omalloc within the factory]),
Note: See TracChangeset for help on using the changeset viewer.