Changeset 7593:2caef7952cfd

Timestamp:

11/23/07 09:02:38 (6 years ago)

Author:

Burcin Erocal <burcin@…>

Branch:

default

Parents:

7592:62b9ea6da235 (diff), 7402:cad57dea1832 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with 2.8.13.

Files:

• setup.py (modified) (1 diff)
• setup.py (modified) (3 diffs)

setup.py

@@ -879 +879 @@
               ), \
 
+    Extension('sage.rings.polynomial.polybori',
+              sources = ['sage/rings/polynomial/polybori.pyx'],
+              libraries=['polybori','pboriCudd','groebner'],
+              include_dirs=[SAGE_ROOT+'/local/include/cudd',
+                            SAGE_ROOT+'/local/include/polybori',
+                            SAGE_ROOT+'/local/include/polybori/groebner'],
+              language = 'c++'), \
                             
     ]

setup.py

@@ -211 +211 @@
                  sources = ["sage/libs/pari/gen.pyx"],
                  libraries = ['pari', 'gmp'])
+
+cremona_mat = Extension('sage.libs.cremona.mat',
+                       sources = ["sage/libs/cremona/mat.pyx"],
+                       libraries = ['g0nntl', 'jcntl', 'gmpxx', 'ntl', 'gmp', 'm', 'stdc++', ],
+                       language='c++',
+                       define_macros = [("NTL_ALL",None)]
+                       )
+
+cremona_homspace = Extension('sage.libs.cremona.homspace',
+                       sources = ["sage/libs/cremona/homspace.pyx"],
+                       libraries = ['g0nntl', 'jcntl', 'gmpxx', 'ntl', 'gmp', 'm', 'stdc++', 'pari', 'curvesntl'],
+                       language='c++',
+                       define_macros = [("NTL_ALL",None)]
+                       )
 
 
@@ -507 +521 @@
      matrix_mod2_dense,
      matrix_mpolynomial_dense, \
+
+     cremona_mat, \
+     cremona_homspace, \
 
      finite_field_givaro, \
@@ -1112 +1129 @@
                      'sage.libs.pari',
                      'sage.libs.singular',
-                     'sage.libs.symmetrica', 
+                     'sage.libs.symmetrica',
+                     'sage.libs.cremona',
 
                      'sage.logic',