fix: python stuff

Singular/dyn_modules/machinelearning/Makefile.am

@@ -21,11 +21,7 @@ AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/kernel \
 	      -DDATA_PATH=\"$(datadir)\" \
 	      -DBIN_PATH=\"$(bindir)\" ${PYTHON_CSPEC}
 
-if PYTHON_USE
 machinelearning_la_SOURCES = machinelearning.cc mlpredict.c mlpredict.h
-else
-machinelearning_la_SOURCES =
-endif
 
 ### if HAVE_PYTHON???
 machinelearning_la_CXXFLAGS = $(PYTHON_CSPEC)

Singular/dyn_modules/pyobject/Makefile.am

@@ -1,6 +1,5 @@
 ACLOCAL_AMFLAGS = -I ../../m4
 
-if PYTHON_USE
 if SI_BUILTIN_PYOBJECT
   noinst_LTLIBRARIES = pyobject.la
 ##  moduledir = $(libdir)/singular
@@ -15,9 +14,6 @@ else !SI_BUILTIN_PYOBJECT
 ###  -export-dynamic -shared -module -avoid-version (add to all DMs?)
 endif !SI_BUILTIN_PYOBJECT
 pyobject_la_SOURCES = pyobject.cc
-else
-pyobject_la_SOURCES =
-endif
 
 
 ##########################################################################

Singular/dyn_modules/python/Makefile.am

@@ -2,16 +2,12 @@ ACLOCAL_AMFLAGS = -I ../../m4
 
 PYTHON_VERSION=2.7
 
-if PYTHON_USE
 SOURCES =  python_module.cc poly_wrap.cc vector_wrap.cc CF_wrap.cc\
   number_wrap.cc ring_wrap.cc ideal_wrap.cc intvec_wrap.cc \
   interpreter_support.cc \
   CF_wrap.h  Number.h ideal_wrap.h number_wrap.h  ring_wrap.h \
   IIntvec.h  Poly.h   interpreter_support.h  vector_wrap.h \
   Ideal.h    PowerSeries.h  intvec_wrap.h poly_wrap.h wrapper.h
-else
-SOURCES=
-endif
 
 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} \
 -I${top_srcdir}/libpolys -I${top_builddir}/libpolys \

configure.ac

@@ -127,6 +127,11 @@ LB_CHECK_CCLUSTER()
 
 AX_PYTHON_DEFAULT()
 AX_PYTHON_WITH()
+AX_PYTHON_ENABLE()
+AX_PYTHON_PATH()
+AX_PYTHON_VERSION_ENSURE([2.7])
+AX_PYTHON_CSPEC
+AX_PYTHON_LSPEC
 
 LB_CHECK_MATHICGB