Changeset af19a15 in git


Ignore:
Timestamp:
Mar 1, 2021, 11:37:17 AM (3 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
Children:
31f12ca584f1b01f47ae377d9783a9818653141c
Parents:
22ff92e70eab88027fc485df829726f2cd395149f96ab9fde129a4aa42ff025f26a09f2b9f2d7008
Message:
Merge branch 'mkoeppe-disable-python-by-default' into spielwiese
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • Singular/dyn_modules/python/CF_wrap.cc

    r22ff92 raf19a15  
    11#include "kernel/mod2.h"
    2 #ifdef HAVE_PYTHON_MOD
     2#ifdef HAVE_PYTHON
    33#include <sstream>
    44#include <boost/python.hpp>
  • Singular/dyn_modules/python/ideal_wrap.cc

    r22ff92 raf19a15  
    11#include "kernel/mod2.h"
    2 #ifdef HAVE_PYTHON_MOD
     2#ifdef HAVE_PYTHON
    33#include <boost/python.hpp>
    44#include "Poly.h"
  • Singular/dyn_modules/python/interpreter_support.cc

    r22ff92 raf19a15  
    11#include "kernel/mod2.h"
    2 #ifdef HAVE_PYTHON_MOD
     2#ifdef HAVE_PYTHON
    33#include <sstream>
    44#include <boost/python.hpp>
  • Singular/dyn_modules/python/intvec_wrap.cc

    r22ff92 raf19a15  
    11#include "kernel/mod2.h"
    2 #ifdef HAVE_PYTHON_MOD
     2#ifdef HAVE_PYTHON
    33#include <boost/python.hpp>
    44#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
     
    3535}
    3636#endif
    37 
  • Singular/dyn_modules/python/number_wrap.cc

    r22ff92 raf19a15  
    11#include "kernel/mod2.h"
    2 #ifdef HAVE_PYTHON_MOD
     2#ifdef HAVE_PYTHON
    33#include <boost/python.hpp>
    44#include "Number.h"
  • Singular/dyn_modules/python/playground.cc

    r22ff92 raf19a15  
    11#include "kernel/mod2.h"
    2 #ifdef HAVE_PYTHON_MOD
     2#ifdef HAVE_PYTHON
    33#include <boost/python.hpp>
    44#include "Poly.h"
  • Singular/dyn_modules/python/poly_wrap.cc

    r22ff92 raf19a15  
    11#include "kernel/mod2.h"
    2 #ifdef HAVE_PYTHON_MOD
     2#ifdef HAVE_PYTHON
    33#include <boost/python.hpp>
    44#include "Poly.h"
  • Singular/dyn_modules/python/python_module.cc

    r22ff92 raf19a15  
    1717
    1818#include <time.h>
    19 #if defined(HAVE_PYTHON_MOD) && defined(HAVE_PYTHON)
     19#ifdef HAVE_PYTHON
    2020#include <boost/python.hpp>
    2121#include <Python.h>
  • Singular/dyn_modules/python/ring_wrap.cc

    r22ff92 raf19a15  
    11#include "kernel/mod2.h"
    2 #ifdef HAVE_PYTHON_MOD
     2#ifdef HAVE_PYTHON
    33#include <boost/python.hpp>
    44#include "Singular/ipshell.h"
  • Singular/dyn_modules/python/vector_wrap.cc

    r22ff92 raf19a15  
    11#include "kernel/mod2.h"
    2 #ifdef HAVE_PYTHON_MOD
     2#ifdef HAVE_PYTON
    33#include <boost/python.hpp>
    44#include "Poly.h"
  • configure.ac

    r22ff92 raf19a15  
    137137LB_CHECK_CCLUSTER()
    138138
    139 AX_PYTHON_DEFAULT()
    140 AX_PYTHON_WITH()
    141 AX_PYTHON_ENABLE()
    142 AX_PYTHON_PATH()
    143 AX_PYTHON_VERSION_ENSURE([2.7])
    144 AX_PYTHON_CSPEC
    145 AX_PYTHON_LSPEC
    146 
    147139LB_CHECK_MATHICGB
    148140
     
    172164SING_CHECK_PLURAL
    173165
    174 SING_CHECK_PYTHON_MODULE
     166SING_ENABLE_MODULES
    175167SING_DISABLE_MODULES
    176168SING_BUILTIN_MODULES
     169
     170AX_PYTHON_DEFAULT()
     171  AX_PYTHON_WITH()
     172  AX_PYTHON_ENABLE()
     173  AX_PYTHON_PATH()
     174  AX_PYTHON_VERSION_ENSURE([2.7])
     175  AX_PYTHON_CSPEC
     176  AX_PYTHON_LSPEC
    177177
    178178AC_ARG_ENABLE(countedref, AS_HELP_STRING([--enable-countedref], [Enable autoloading of reference counted types]),
  • m4/options.m4

    r22ff92 raf19a15  
    264264])
    265265
    266 AC_DEFUN([SING_CHECK_PYTHON_MODULE],
    267 [
    268 AC_ARG_ENABLE(python_module, AS_HELP_STRING([--enable-python_module], [Enable python_module.so]),
    269 [if test $enableval = yes; then
    270      ENABLE_PYTHON_MODULE="yes"
    271      AC_DEFINE(HAVE_PYTHON_MOD,1,[Enable python_module.so])
    272  else
    273      ENABLE_PYTHON_MODULE="no"
    274  fi
    275 ],[ENABLE_PYTHON_MODULE="no"])
     266AC_DEFUN([SING_ENABLE_MODULES], [dnl
     267  m4_foreach([MOD], [staticdemo, bigintm, Order, python], [dnl
     268    AC_ARG_ENABLE(MOD[-module],
     269                  AS_HELP_STRING([--enable-]MOD[-module], [Enable building optional module ]MOD), [dnl
     270      dnl Nothing to do
     271    ], [dnl
     272      dnl Per default, these modules are disabled
     273      AS_VAR_SET([enable_]MOD[_module], [no])
     274    ])dnl
     275    AM_CONDITIONAL([ENABLE_]m4_toupper(MOD)[_MODULE], [test x$enable_]MOD[_module != xno])dnl
     276  ])dnl
    276277])
    277278
    278279AC_DEFUN([SING_DISABLE_MODULES], [dnl
    279   m4_foreach([MOD], [staticdemo, subsets, freealgebra, partialgb, syzextra,
    280                      pyobject, gfanlib, polymake, python, customstd,
    281                      singmathic, bigintm, Order, gitfan, interval, systhreads,
     280  m4_foreach([MOD], [subsets, freealgebra, partialgb, syzextra,
     281                     gfanlib, polymake, customstd, pyobject,
     282                     singmathic, gitfan, interval, systhreads,
    282283                     loctriv, cohomo, machinelearning], [dnl
    283284    AC_ARG_ENABLE(MOD[-module],
     
    285286      dnl Nothing to do
    286287    ], [dnl
    287       dnl Per default, all modules are enabled
     288      dnl Per default, these modules are enabled
    288289      AS_VAR_SET([enable_]MOD[_module], [yes])
    289290    ])dnl
     
    402403 AM_CONDITIONAL([SI_BUILTIN_POLYMAKE], [test x$bi_polymake = xtrue])
    403404 AM_CONDITIONAL([SI_BUILTIN_PYTHON_MODULE], [test x$bi_python = xtrue])
    404  AM_CONDITIONAL([HAVE_PYTHON_MODULE], [test x$ENABLE_PYTHON_MODULE = xyes])
    405405 AM_CONDITIONAL([SI_BUILTIN_CUSTOMSTD], [test x$bi_customstd = xtrue])
    406406 AM_CONDITIONAL([SI_BUILTIN_SINGMATHIC], [test x$bi_singmathic = xtrue])
Note: See TracChangeset for help on using the changeset viewer.