Changeset 854710 in git

Timestamp:

May 21, 2014, 7:03:14 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

2f2b44ec520d0cdac6307ff03eff817d26037079

Parents:

8bfb5a987b8667694fff99ef21cd33497441a3da

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-21 19:03:14+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-26 19:09:37+02:00

Message:

Changed the default setting for builtin modules: syzextra if empty!

Files:

• Singular/dyn_modules/syzextra/Makefile.am (modified) (1 diff)
• m4/options.m4 (modified) (3 diffs)

Singular/dyn_modules/syzextra/Makefile.am

@@ -8 +8 @@
 if SI_BUILTIN_SYZEXTRA
   noinst_LTLIBRARIES=syzextra.la
-##  moduledir = $(libdir)/singular
   P_PROCS_CPPFLAGS_COMMON = -DSTATIC_VERSION 
   P_PROCS_MODULE_LDFLAGS = -module

m4/options.m4

@@ -299 +299 @@
  AC_ARG_VAR( [BUILTIN_LIBS], [LIB FLAGS for buildins] )
  AC_ARG_WITH(builtinmodules, 
-   AS_HELP_STRING([--with-builtinmodules], [List of builtin modules (experimental), default: all of internal]),
+   AS_HELP_STRING([--with-builtinmodules], [List of builtin modules (experimental), default: staticdemo,bigintm,syzextra]),
    [if test "x$with_builtinmodules" == xyes; then
-    with_builtinmodules=staticdemo,bigintm,syzextra,pyobject,gfanlib,polymake,singmathic
+    with_builtinmodules=syzextra
    fi], 
    [with_builtinmodules=""]
  )
+ # staticdemo,bigintm,
+ # ,pyobject,gfanlib,polymake,singmathic
 
  AH_TEMPLATE([SI_BUILTINMODULES_ADD],[Add(list) for Builtin modules])
@@ -319 +321 @@
   
   
- if test "x$with_builtinmodules" == xno; then
+ if test -z "$with_builtinmodules"; then
   AC_MSG_RESULT(no)
  else
@@ -352 +354 @@
     fi
     
-    A=`echo "SI_BUILTIN_$a" | sed -e "y:m4_cr_letters-:m4_cr_LETTERS[]_:"  -e "/^@<:@m4_cr_digits@:>@/s/^/_/"`      
-    echo "A:: $A"
-#    AM_CONDITIONAL(m4_unquote([A]),[test -d "Singular/dyn_modules/$a"])    
+#    A=`echo "SI_BUILTIN_$a" | sed -e "y:m4_cr_letters-:m4_cr_LETTERS[]_:"  -e "/^@<:@m4_cr_digits@:>@/s/^/_/"`      
+#    echo "A:: $A"
+#    AM_CONDITIONAL(m4_unquote([A]),[test -d "Singular/dyn_modules/$a"]) ## :(((
   done # for