Changeset 77ba48 in git

Timestamp:

Mar 2, 2017, 5:32:30 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

8f963e06819f6439ad1b215b1fb335013f27d607

Parents:

c33a45fa75ea4e4d477f6d9a1131e28778167816

Message:

dyn_mod/python_module: depends on HAVE_PYTHON

Files:

• Singular/dyn_modules/python/Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• m4/options.m4 (modified) (2 diffs)

Singular/dyn_modules/python/Makefile.am

@@ -42 +42 @@
 endif
 
+if HAVE_PYTHON_MODULE
  python_module_la_LIBADD   += -lboost_python-${PYTHON_VERSION} -lpython${PYTHON_VERSION}
+endif
 
 python_module_la_CXXFLAGS = ${AM_CXXFLAGS}

configure.ac

@@ -124 +124 @@
 
 SING_CHECK_PLURAL
+
+SING_CHECK_PYTHON_MODULE
 
 SING_BUILTIN_MODULES

m4/options.m4

@@ -281 +281 @@
 ])
 
+AC_DEFUN([SING_CHECK_PYTHON_MODULE],
+[ 
+AC_ARG_ENABLE(python_module, AS_HELP_STRING([--enable-python_module], [Enable python_module.so]),
+[if test $enableval = yes; then
+     ENABLE_PYTHON_MODULE="yes"
+ else
+     ENABLE_PYTHON_MODULE="no"
+ fi
+],[ENABLE_PYTHON_MODULE="no"])
+])
 
 
@@ -376 +386 @@
  AM_CONDITIONAL([SI_BUILTIN_POLYMAKE], [test x$bi_polymake = xtrue])
  AM_CONDITIONAL([SI_BUILTIN_PYTHON_MODULE], [test x$bi_python = xtrue])
- AM_CONDITIONAL([HAVE_PYTHON_MODULE], [test x$bi_python = xtrue])
+ AM_CONDITIONAL([HAVE_PYTHON_MODULE], [test x$ENABLE_PYTHON_MODULE = xyes])
  AM_CONDITIONAL([SI_BUILTIN_CUSTOMSTD], [test x$bi_customstd = xtrue])
  AM_CONDITIONAL([SI_BUILTIN_SINGMATHIC], [test x$bi_singmathic = xtrue])