Changeset 2961

Timestamp:

06/06/08 19:07:30 (6 months ago)

Author:

pernet

Message:

Adds the sage interface enabled by the m4 macro --enable-sage

Location:

trunk/linbox

Files:

• Makefile.am (modified) (1 diff)
• configure.in (modified) (3 diffs)
• interfaces/Makefile.am (modified) (1 diff)
• interfaces/driver (modified) (1 prop)
• interfaces/kaapi (modified) (1 prop)
• interfaces/maple (modified) (1 prop)
• interfaces/sage (added)
• interfaces/sage/Makefile.am (added)
• interfaces/sage/linbox-sage.C (added)
• interfaces/sage/linbox-sage.h (added)
• macros/maple-check.m4 (modified) (1 diff)

trunk/linbox/Makefile.am

@@ -13 +13 @@
 bin_SCRIPTS=linbox-config
 
-VERSION=1.1.5
+VERSION=1.1.6rc0

trunk/linbox/configure.in

@@ -1 +1 @@
 AC_PREREQ(2.50)
 #AC_INIT(linbox/linbox.doxy)
-AC_INIT(linbox, 1.1.5,linbox-use@googlegroups.com) 
+AC_INIT(linbox, 1.1.6rc0,linbox-use@googlegroups.com) 
 AM_INIT_AUTOMAKE([1.8 gnu no-dependencies])
 AM_CONFIG_HEADER([config.h])
@@ -127 +127 @@
 LB_CHECK_LIDIA
 LB_CHECK_MAPLE
+LB_CHECK_SAGE
 #LB_CHECK_ATLAS
 LB_CHECK_BLAS(,,[
@@ -179 +180 @@
 interfaces/maple/Makefile
 interfaces/kaapi/Makefile
+interfaces/sage/Makefile
 macros/Makefile
 ])

trunk/linbox/interfaces/Makefile.am

@@ -1 @@
-SUBDIRS=driver kaapi maple
+SUBDIRS=driver kaapi maple sage
 
 

trunk/linbox/macros/maple-check.m4

@@ -131 +131 @@
 AM_CONDITIONAL(LINBOX_COMPILE_DRIVERS, test "x$compile_drivers" = "xyes" -o "x$HAVE_MAPLE" = "xyes" )
 
-
-
-
 ])
 
 
+AC_DEFUN([LB_CHECK_SAGE],
+[
+AC_MSG_CHECKING([whether to compile the sage interface])
+
+AC_ARG_ENABLE(sage, [ --enable-sage     Enable the compilation of the sage interface],
+[
+AC_MSG_RESULT(yes)
+sage_interface="yes"
+],[
+AC_MSG_RESULT(no)
+sage_interface="no"
+])
+AM_CONDITIONAL(LINBOX_HAVE_SAGE, test "x$sage_interface" = "xyes")
+])