Changeset 02a9da in git

Timestamp:

Mar 29, 2020, 4:54:15 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2bfe11f5ed0110942c196d6d89b3fd6b1c5dc64a

Parents:

4c91232abfbd1cac10432e5bf113c6d96c55977d

Message:

fix: PYTHON_USE

Files:

• Singular/dyn_modules/machinelearning/Makefile.am (modified) (2 diffs)
• Singular/dyn_modules/pyobject/Makefile.am (modified) (2 diffs)
• Singular/dyn_modules/python/Makefile.am (modified) (4 diffs)
• configure.ac (modified) (1 diff)

Singular/dyn_modules/machinelearning/Makefile.am

@@ -20 +20 @@
               -I${top_builddir}/libpolys $(FACTORY_INCLUDES) $(GMP_CPPFLAGS) \
               -DDATA_PATH=\"$(datadir)\" \
-              -DBIN_PATH=\"$(bindir)\" -I/usr/include/python2.7
+              -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???
@@ -39 +43 @@
 check_PROGRAMS          = test_bufsize test_init_ml
 
-#test_bufsize_LDFLAGS   = -lpython3.6m
-test_bufsize_LDFLAGS    = -lpython2.7
+test_bufsize_LDFLAGS    = ${PYTHON_LSPEC}
 test_bufsize_SOURCES    = tests/test_bufsize.c mlpredict.c
-test_bufsize_CFLAGS     = -Wall -Wextra -I/usr/include/python2.7
+test_bufsize_CFLAGS     = -Wall -Wextra ${PYTHON_CSPEC}
 
-#test_init_ml_LDFLAGS   = -lpython3.6m
-test_init_ml_LDFLAGS    = -lpython2.7
+test_init_ml_LDFLAGS    = ${PYTHON_LSPEC}
 test_init_ml_SOURCES    = tests/test_init_ml.c mlpredict.c
-test_init_ml_CFLAGS     = -Wall -Wextra -I/usr/include/python2.7
+test_init_ml_CFLAGS     = -Wall -Wextra ${PYTHON_CSPEC}
 
 

Singular/dyn_modules/pyobject/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I ../../m4
 
+if PYTHON_USE
 if SI_BUILTIN_PYOBJECT
   noinst_LTLIBRARIES = pyobject.la
@@ -14 +15 @@
 ###  -export-dynamic -shared -module -avoid-version (add to all DMs?)
 endif !SI_BUILTIN_PYOBJECT
+pyobject_la_SOURCES = pyobject.cc
+else
+pyobject_la_SOURCES =
+endif
+
 
 ##########################################################################
 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(FACTORY_INCLUDES)  $(GMP_CPPFLAGS) $(NTL_CPPFLAGS) $(FLINT_CFLAGS)
 
-pyobject_la_SOURCES = pyobject.cc
 
 ### if HAVE_PYTHON???

Singular/dyn_modules/python/Makefile.am

@@ -3 +3 @@
 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 \
@@ -9 +10 @@
   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} \
@@ -29 +33 @@
 python_module_la_SOURCES  = $(SOURCES)
 
-python_module_la_CPPFLAGS = -I/usr/include/python${PYTHON_VERSION} ${AM_CPPFLAGS} ${P_PROCS_CPPFLAGS_COMMON}
+python_module_la_CPPFLAGS = ${PYTHON_CSPEC} ${AM_CPPFLAGS} ${P_PROCS_CPPFLAGS_COMMON}
 python_module_la_LDFLAGS  = ${P_PROCS_MODULE_LDFLAGS} $(SINGULAR_LDFLAGS)
 
@@ -43 +47 @@
 
 if HAVE_PYTHON_MODULE
- python_module_la_LIBADD   += -lboost_python-${PYTHON_VERSION} -lpython${PYTHON_VERSION}
+ python_module_la_LIBADD   += -lboost_python-${PYTHON_VERSION} ${PYTHON_LSPEC}
 endif
 

configure.ac

@@ -127 +127 @@
 
 AX_PYTHON_DEFAULT()
-AX_PYTHON_WITH_VERSION([2.4])
-AX_PYTHON_DEVEL()
+AX_PYTHON_WITH()
 
 LB_CHECK_MATHICGB