Changeset d19881 in git


Ignore:
Timestamp:
Feb 27, 2021, 8:44:23 PM (3 years ago)
Author:
Matthias Koeppe <mkoeppe@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
Children:
fba40bd20c43a0fa08dce03d6c5846f476cec7e9
Parents:
efa2e20d43fc41bb7d2f002794c9545fde4c719a
Message:
configure.ac, m4/options.m4: Replace SING_CHECK_PYTHON_MODULE by SING_ENABLE_MODULES
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    refa2e20 rd19881  
    172172SING_CHECK_PLURAL
    173173
    174 SING_CHECK_PYTHON_MODULE
     174SING_ENABLE_MODULES
    175175SING_DISABLE_MODULES
    176176SING_BUILTIN_MODULES
  • m4/options.m4

    refa2e20 rd19881  
    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], [pyobject, 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
    279280  m4_foreach([MOD], [staticdemo, subsets, freealgebra, partialgb, syzextra,
    280                      pyobject, gfanlib, polymake, python, customstd,
     281                     gfanlib, polymake, customstd,
    281282                     singmathic, bigintm, Order, gitfan, interval, systhreads,
    282283                     loctriv, cohomo, machinelearning], [dnl
     
    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
Note: See TracChangeset for help on using the changeset viewer.