Changeset c2ff413 in git

Timestamp:

Jan 9, 2013, 6:09:44 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

538512de5ab210253d8edeee07e4a22b42392e56

Parents:

7649f8a6c86d9e16fbb5ceb98a83a9647c360d53

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-01-09 18:09:44+01:00

git-committer:

Oleksandr Motsak <http://goo.gl/mcpzY>2013-01-09 18:13:19+01:00

Message:

Fix building without Python

Files:

• Singular/pyobject.cc (modified) (3 diffs)
• m4/ax_python_with_version.m4 (modified) (2 diffs)

Singular/pyobject.cc

@@ -18 +18 @@
   //#include "newstruct.h"
 
-#include <Python.h>
+#ifdef HAVE_PYTHON
 
 #include <Singular/ipid.h>
@@ -40 +40 @@
 #include "blackbox.h"
 #include "ipshell.h"
-
-
-
-
-  //#include <Python.h>
+#include "newstruct.h"
+
+#include <Python.h>
+
 // #include <iterator>             // std::distance
 // #include <stdio.h>
@@ -753 +752 @@
 }
 #endif
+
+#endif /* HAVE_PYTHON */

m4/ax_python_with_version.m4

@@ -91 +91 @@
             fi
         fi   
-        AM_CONDITIONAL(PYTHON_USE, test x"$ax_python_use" = x"true")
-        AM_CONDITIONAL(SI_EMBED_PYTHON, test x"$si_embed_python" = x"true")
 
         if  test x"$si_embed_python" = x"true"
@@ -100 +98 @@
           AC_SUBST(EMBED_PYOBJECT_LDFLAGS,"\${PYTHON_LSPEC}")
         fi
-
-        AM_CONDITIONAL(PYTHON_MODULE, test x"$si_embed_python" != x"true")
+        if test x"$ax_python_use" = x"true" 
+        then 
+          AC_DEFINE(HAVE_PYTHON,1,[compile python-related stuff])
+        fi
     fi
+    
+    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")
 
 ])