changes needed to build on cygwin; also make it possible to start wit…

…h having twisted or gap installed.

src/sage/all.py

@@ -241,10 +241,13 @@ def quit_sage(verbose=True):
     from sage.misc.misc import delete_tmpfiles
     delete_tmpfiles()
 
-    # stop the twisted reactor
-    from twisted.internet import reactor
-    if reactor.running:
-        reactor.callFromThread(reactor.stop)
+    try:
+       # stop the twisted reactor
+       from twisted.internet import reactor
+       if reactor.running:
+          reactor.callFromThread(reactor.stop)
+    except ImportError:
+       pass
 
 def _quit_sage_(self):
     import sage.misc.preparser_ipython

src/sage/dsage/all.py

@@ -1,7 +1,7 @@
 """nodoctest
 """
 from sage.dsage.dsage import dsage
-from sage.dsage.dist_functions.all import *
+#from sage.dsage.dist_functions.all import *
 
 def DSage(server=None, port=8081, username=None,
           pubkey_file=None, privkey_file=None):

src/sage/interfaces/gap.py

@@ -167,8 +167,6 @@
 
 def gap_command(use_workspace_cache=True):
     if use_workspace_cache:
-        if not os.path.exists(WORKSPACE):
-            gap_reset_workspace()
         return "%s -L %s"%(gap_cmd, WORKSPACE), False
     else:
         return gap_cmd, True
@@ -231,6 +229,8 @@ def _read_in_file_command(self, filename):
 
 
     def _start(self):
+        if self.__use_workspace_cache and not os.path.exists(WORKSPACE):
+            gap_reset_workspace()
         global first_try
         n = self._session_number
         try:

src/sage/monoids/string_monoid.py

@@ -18,7 +18,6 @@
 from free_monoid import FreeMonoid_class
 from string_monoid_element import StringMonoidElement
 from string_ops import strip_encoding
-from Crypto.Util.number import bytes_to_long
 
 import weakref
 
@@ -337,6 +336,7 @@ def encoding(self,S,padic=False):
 	    sage: S.encoding(' ',padic=True)
 	    00000100
         """
+	from Crypto.Util.number import bytes_to_long
         bit_string = [ ]
         for i in range(len(S)):
             n = int(bytes_to_long(S[i]))
@@ -494,6 +494,7 @@ def encoding(self,S,padic=False):
 	    sage: S.encoding(' ',padic=True)
 	    02
         """
+	from Crypto.Util.number import bytes_to_long
         hex_string = [ ]
         for i in range(len(S)):
             n = int(bytes_to_long(S[i]))

src/sage/monoids/string_monoid_element.py

@@ -20,7 +20,6 @@
 #*****************************************************************************
 
 import operator
-from Crypto.Util.number import long_to_bytes
 from sage.rings.integer import Integer
 from sage.rings.real_mpfr import RealField
 from sage.structure.element import MonoidElement
@@ -231,6 +230,7 @@ def decoding(self,padic=False):
             'A..Za..z'
         """
         S = self.parent()
+	from Crypto.Util.number import long_to_bytes
         if isinstance(S,string_monoid.AlphabeticStringMonoid):
             return ''.join([ long_to_bytes(65+i) for i in self._element_list ])
         n = self.__len__()

src/setup.py

@@ -101,7 +101,7 @@
 
 ntl = Extension('sage.libs.ntl.ntl',
                  sources = ["sage/libs/ntl/ntl.pyx"],
-                 libraries = ["ntl", "gmp", "gmpxx", "m", "stdc++"]
+                 libraries = ["csage", "ntl", "gmp", "gmpxx", "m", "stdc++"]
                  )
 
 mwrank =  Extension("sage.libs.mwrank.mwrank",
@@ -169,8 +169,7 @@
 
 linbox = Extension('sage.libs.linbox.linbox',
                    ['sage/libs/linbox/linbox.pyx'],
-                   libraries = ['linboxwrap', 'linbox', 'ntl', 'gmp', 'gmpxx', 'stdc++', 'givaro'],
-
+                   libraries = ['ntl', 'linboxwrap', 'linbox', 'gmp', 'gmpxx', 'stdc++', 'givaro', BLAS],
                    language = 'c++')
 
 matrix_modn_dense = Extension('sage.matrix.matrix_modn_dense',
@@ -446,11 +445,11 @@
     Extension('sage.rings.integer',
               sources = ['sage/ext/arith.pyx', 'sage/rings/integer.pyx', \
                          'sage/ext/mpn_pylong.c', 'sage/ext/mpz_pylong.c'],
-              libraries=['gmp']), \
+              libraries=['ntl', 'gmp']), \
 
     Extension('sage.rings.integer_ring',
               sources = ['sage/rings/integer_ring.pyx'],
-              libraries=['gmp']), \
+              libraries=['ntl', 'gmp']), \
 
     Extension('sage.rings.memory', \
               sources = ['sage/rings/memory.pyx'], \
@@ -474,7 +473,7 @@
                          'sage/ext/arith.pyx', \
                          'sage/rings/integer.pyx', \
                          'sage/ext/mpn_pylong.c', 'sage/ext/mpz_pylong.c'],
-              libraries=['gmp']), \
+              libraries=['ntl', 'gmp']), \
 
     Extension('sage.rings.sparse_poly',
               sources = ['sage/rings/sparse_poly.pyx'],
@@ -563,7 +562,7 @@
     #ext_modules.append(mpc)
 
 for m in ext_modules:
-    m.libraries += ['csage']
+    m.libraries = ['csage'] + m.libraries + ['stdc++']
     m.library_dirs += ['%s/lib' % SAGE_LOCAL]