Changeset 0ba2b1 in git for Singular

Timestamp:

Nov 18, 2005, 1:42:43 PM (19 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

ee65efb4130ea53dab62cb8a6cf7a1c136d73f62

Parents:

c9af86890bece3aba24c40591ef527d2394370da

Message:

Makefile.in und extra.cc:
---> Python Erweiterung für 3.0.1 deaktiviert.
      Zum reaktivieren einfach in beiden Files nach python suchen


git-svn-id: file:///usr/local/Singular/svn/trunk@8802 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• Makefile.in (modified) (3 diffs)
• extra.cc (modified) (5 diffs)

Singular/Makefile.in

@@ -58 +58 @@
 else
 ## Dirs after @CPPFLAGS@ are for PySingular
-CPPFLAGS        = -I${srcdir} -I../kernel @CPPFLAGS@ -I/usr/include/python2.4 -I/usr/local/include/boost-1_32 -I../modules/python
+CPPFLAGS        = -I${srcdir} -I../kernel @CPPFLAGS@ 
+## -I/usr/include/python2.4 -I/usr/local/include -I../modules/python
 endif
 DEFS            = -DNDEBUG -DOM_NDEBUG -D@SING_UNAME@ @DEFS@
@@ -77 +78 @@
 WIN_LIBS        =
 else
-WIN_LIBS        = ../modules/python/libpython_module.a
+WIN_LIBS        = 
+##../modules/python/libpython_module.a
 endif
 
@@ -88 +90 @@
 LIBS            = -lm @NEED_LIBS@
 else
-LIBS            = -lsingfac -lsingcf -lntl  -static -lreadline -lhtmlhelp -Xlinker -Bdynamic -lgmp -lcygncurses6 -lpython_module -lpython2.4 /usr/local/lib/libboost_python-gcc-d-1_32.dll
+LIBS            = -lsingfac -lsingcf -lntl  -static -lreadline -lhtmlhelp -Xlinker -Bdynamic -lgmp -lcygncurses6 
+## -lpython_module -lpython2.4 /usr/local/lib/libboost_python-gcc-d-1_32.dll
 endif
 MP_LIBS         = @MP_LIBS@

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.231 2005-11-04 08:45:01 Singular Exp $ */
+/* $Id: extra.cc,v 1.232 2005-11-18 12:42:43 wienand Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -132 +132 @@
 
 #ifdef ix86_Win
-#include <Python.h>
-#include <python_wrapper.h>
+//#include <Python.h>
+//#include <python_wrapper.h>
 #endif
 
@@ -2665 +2665 @@
         if (!PyInitialized) {
           PyInitialized = 1;
-          Py_Initialize();
-          initPySingular();
-        }
-        PyRun_SimpleString(c);
+//          Py_Initialize();
+//          initPySingular();
+        }
+//          PyRun_SimpleString(c);
         return FALSE;
       }
@@ -2674 +2674 @@
     }
     else
-/*==================== Python Singular =================*/
+/*==================== Python Singular =================
     if (strcmp(sys_cmd, "ipython") == 0)
     {
@@ -2706 +2706 @@
     }
     else
-
+              */
 #endif
 /*==================== Error =================*/