Changeset f28640 in git

Timestamp:

Jan 17, 2013, 1:10:48 PM (11 years ago)

Author:

Alexander Dreyer <adreyer@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

09860ed72ea0caff2c769837c87c7e5e9de3ea442700bdee638e6b68b5244f3aa4024a6086403007

Parents:

4255b3043708f588a7d04551706cf38e6aa02ccd

Message:

Really avoid building pyobject.so avoid without python

Files:

• Singular/Makefile.am (modified) (1 diff)
• Singular/pyobject.cc (modified) (2 diffs)
• m4/ax_python_with_version.m4 (modified) (1 diff)

Singular/Makefile.am

@@ -405 +405 @@
         ln -snf ${top_builddir}/libpolys/polys/.libs/ ${builddir}/MOD
 
+moduledir = $(bindir)/MOD
+
+module_LTLIBRARIES =
+pyobject_la_SOURCES = 
 if PYTHON_MODULE
-   moduledir = $(bindir)/MOD
-   module_LTLIBRARIES = pyobject.la
-   pyobject_la_SOURCES = pyobject.cc
-
-   pyobject_la_CPPFLAGS   = ${AM_CPPFLAGS} ${NODEBUGDEFS}
-   pyobject_g_la_CPPFLAGS = ${AM_CPPFLAGS}
-
-   pyobject_la_CXXFLAGS   = ${NODEBUGCXXFLAGS} @PYTHON_CSPEC@ 
-   pyobject_g_la_CXXFLAGS = ${DEBUGCXXFLAGS} @PYTHON_CSPEC@ 
-
-   pyobject_la_LDFLAGS = -export-dynamic -shared -module -avoid-version \
-     ${AMLDFLAGS} @PYTHON_LSPEC@ 
-endif
+module_LTLIBRARIES += pyobject.la
+pyobject_la_SOURCES += pyobject.cc
+endif
+pyobject_la_SOURCES = pyobject.cc
+pyobject_la_CPPFLAGS   = ${AM_CPPFLAGS} ${NODEBUGDEFS}
+pyobject_g_la_CPPFLAGS = ${AM_CPPFLAGS}
+
+pyobject_la_CXXFLAGS   = ${NODEBUGCXXFLAGS} @PYTHON_CSPEC@ 
+pyobject_g_la_CXXFLAGS = ${DEBUGCXXFLAGS} @PYTHON_CSPEC@ 
+
+pyobject_la_LDFLAGS = -export-dynamic -shared -module -avoid-version \
+  ${AMLDFLAGS} @PYTHON_LSPEC@
+

Singular/pyobject.cc

@@ -18 +18 @@
   //#include "newstruct.h"
 
-#ifdef HAVE_PYTHON
 
 #include <Singular/ipid.h>
@@ -752 +751 @@
 }
 #endif
-
-#endif /* HAVE_PYTHON */

m4/ax_python_with_version.m4

@@ -105 +105 @@
     
     AM_CONDITIONAL(PYTHON_USE, test x"$ax_python_use" = x"true")
-    AM_CONDITIONAL(SI_EMBED_PYTHON, test x"$si_embed_python" = x"true")
-    AM_CONDITIONAL(PYTHON_MODULE, test x"$si_embed_python" != x"true")
+    AM_CONDITIONAL(SI_EMBED_PYTHON, test x"$ax_python_use$si_embed_python" = x"truetrue")
+    AM_CONDITIONAL(PYTHON_MODULE, test x"$ax_python_use" = x"true" -a x"$si_embed_python" != x"true" )
 
 ])