Changeset 3a40eb in git

Timestamp:

Aug 20, 2013, 11:36:28 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

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:

• Singular/Makefile.am (modified) (1 diff)
• Singular/mod_lib.h (modified) (4 diffs)
• Singular/singmathic.cc (added)
• configure.ac (modified) (3 diffs)
• m4/mathic-check.m4 (added)

Singular/Makefile.am

@@ -138 +138 @@
    subexpr.cc\
    pyobject_setup.cc\
+   singmathic.cc\
    walk.cc\
    walk_ip.cc\

Singular/mod_lib.h

@@ -2 +2 @@
 #define MOD_LIB_H
 
-// #include <config.h>         /* for EMBED_PYTHON */
+// #include <config.h>         /* for EMBED_PYTHON, HAVE_MATHICGB */
 
 #include <polys/mod_raw.h>  /* for lib_types */
@@ -10 +10 @@
 #ifdef EMBED_PYTHON
 #define SI_BUILTIN_PYOBJECT(add) add(pyobject) add(syzextra)
+//TODO: the line above means that syzextra should be staticly embedded IFF pyobjects do so :(
 #else
 #define SI_BUILTIN_PYOBJECT(add) 
+#endif
+
+#ifdef HAVE_MATHICGB
+# define SI_BUILTIN_MATHIC(add) add(singmathic)
+#else
+# define SI_BUILTIN_MATHIC(add) 
 #endif
 
@@ -18 +25 @@
 #define SI_FOREACH_BUILTIN(add)\
     add(staticdemo)\
+    SI_BUILTIN_MATHIC(add)\
     SI_BUILTIN_PYOBJECT(add)
 
@@ -23 +31 @@
 
 #endif
+

configure.ac

@@ -10 +10 @@
 
 AC_CONFIG_HEADER([config.h])
+
+dnl Apparently, this is required for using an AC_CHECK_HEADER within AS_IF(...), at least on Cygwin.
+AC_USE_SYSTEM_EXTENSIONS
 
 AM_MAINTAINER_MODE
@@ -57 +60 @@
 LB_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)]))
 LB_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)]))
+LB_CHECK_MATHICGB
+
 
 AX_PYTHON_DEFAULT()
@@ -87 +92 @@
 ### the following is needed due to the use of om_sing_opt_show_mem in misc_ip.cc...
 #ac_configure_args="$ac_configure_args --with-external-config_h=../Singular/omSingularConfig.h"
+
 
 AC_ARG_ENABLE(omalloc, AS_HELP_STRING([--disable-omalloc], [do NOT use omalloc within the factory]),