Changeset 810238 in git

Timestamp:

May 13, 2014, 6:57:51 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

3c7cefec02dda99293f86b874f8fae348dc2a2f3

Parents:

a3aecc9c7c70c1bbabe64e5bc98299e0d162e87a

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-13 18:57:51+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-26 18:59:33+02:00

Message:

List internal builtins in m4/options.m4

Files:

• Singular/dyn_modules/bigintm/mod_main.cc (modified) (1 diff)
• Singular/dyn_modules/staticdemo/Makefile.am (modified) (2 diffs)
• Singular/iplib.cc (modified) (1 diff)
• Singular/mod_lib.cc (modified) (1 diff)
• Singular/mod_lib.h (modified) (1 diff)
• m4/options.m4 (modified) (4 diffs)

Singular/dyn_modules/bigintm/mod_main.cc

@@ -1 +1 @@
 #include <kernel/mod2.h>
+
+#include <Singular/mod_lib.h>
 
 #include <Singular/blackbox.h>

Singular/dyn_modules/staticdemo/Makefile.am

@@ -3 +3 @@
 if SI_BUILTIN_STATICDEMO
   noinst_LTLIBRARIES=staticdemo.la
-  P_PROCS_MODULE_LDFLAGS=
+  P_PROCS_MODULE_LDFLAGS=-module
   P_PROCS_CPPFLAGS_COMMON=-DSTATIC_VERSION 
 
@@ -11 +11 @@
       $(FLINT_CFLAGS) $(NTL_CFLAGS) $(GMP_CFLAGS) $(GOOGLE_PERFTOOLS_CFLAGS)
 
-  syzextra_la_SOURCES   = staticdemo.cc
-  syzextra_la_CPPFLAGS  = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
-  syzextra_la_LDFLAGS   = ${AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS}
+  staticdemo_la_SOURCES   = staticdemo.cc
+  staticdemo_la_CPPFLAGS  = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
+  staticdemo_la_LDFLAGS   = ${AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS}
 else
   EXTRA_DIST=staticdemo.cc

Singular/iplib.cc

@@ -716 +716 @@
 }
 
-#define SI_GET_BUILTIN_MOD_INIT(name) \
- if (strcmp(libname, #name ".so") == 0){ int SI_MOD_INIT(name)(SModulFunctions*); return SI_MOD_INIT(name); }
+#define SI_GET_BUILTIN_MOD_INIT(name) if (strcmp(libname, #name ".so") == 0){ extern "C" int SI_MOD_INIT0(name)(SModulFunctions*); return SI_MOD_INIT0(name); }
 
 SModulFunc_t

Singular/mod_lib.cc

@@ -1 @@
-
-
-
-
 #include <kernel/mod2.h>
 

Singular/mod_lib.h

@@ -2 +2 @@
 #define MOD_LIB_H
 
+#define SI_MOD_INIT0(name) name##_mod_init
+
 #ifdef STATIC_VERSION
-#  define SI_MOD_INIT(name) name##_mod_init
+#  define SI_MOD_INIT(name) SI_MOD_INIT0(name)
 #elif defined(DYNAMIC_VERSION)
 #  define SI_MOD_INIT(name) mod_init
-#else
-#  error Please use SI_MOD_INIT inside a Singular (dynamic/shared/static/builtin) module only!
 #endif
 

m4/options.m4

@@ -298 +298 @@
 
  AC_ARG_VAR( [BUILTIN_LIBS], [LIB FLAGS for buildins] )
- AC_ARG_WITH(builtinmodules, AS_HELP_STRING([--with-builtinmodules], [List of builtin modules (experimental)]))
- 
+ AC_ARG_WITH(builtinmodules, 
+   AS_HELP_STRING([--with-builtinmodules], [List of builtin modules (experimental), default: all of internal]),
+   [if test "x$with_builtinmodules" == xyes; then
+    with_builtinmodules=staticdemo,bigintm,syzextra,pyobject,gfanlib,polymake,singmathic
+   fi], 
+   [with_builtinmodules=""]
+ )
+
  AH_TEMPLATE([SI_BUILTINMODULES_ADD],[Add(list) for Builtin modules])
 
  #### TODO Dynamic Modules???
- L=""
+  L=""
+  bi_staticdemo=false
+  bi_syzextra=false
+  bi_pyobject=false
+  bi_gfanlib=false
+  bi_polymake=false
+  bi_singmathic=false
+  bi_bigintm=false
+  
   
  if test "x$with_builtinmodules" == xno; then
@@ -310 +324 @@
   AC_MSG_RESULT(yes)
   
-  if test "x$with_builtinmodules" == xall; then
-    with_builtinmodules=staticdemo,syzextra,pyobject,gfanlib,polymake,singmathic
-  fi
+  L=""
   
-  LL=""
   for a in ${with_builtinmodules//,/ }; 
   do
@@ -324 +335 @@
       BUILTIN_LIBS+=" dyn_modules/$a/$a.la"
       AC_MSG_RESULT(yes)
+      
+# *) AC_MSG_ERROR([bad value ${enableval} for       --enable-debug]) ;;
+
+      case "${a}" in
+       staticdemo ) bi_staticdemo=true;;
+       syzextra ) bi_syzextra=true ;;
+       pyobject ) bi_pyobject=true ;;
+       gfanlib ) bi_gfanlib=true ;;
+       polymake ) bi_polymake=true ;;
+       singmathic ) bi_singmathic=true ;;
+       bigintm ) bi_bigintm=true ;;       
+      esac
+
     else
       AC_MSG_RESULT(no)
     fi
     
-    A=`echo "$a" | sed -e "y:m4_cr_letters-:m4_cr_LETTERS[]_:"  -e "/^@<:@m4_cr_digits@:>@/s/^/_/"`      
-    AM_CONDITIONAL([SI_BUILTIN_$A],[test -d "Singular/dyn_modules/$a"]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
 
@@ -340 +365 @@
  
  AC_DEFINE_UNQUOTED([SI_BUILTINMODULES_ADD(add)],[$L],[Add(list) for Builtin modules])
- 
  AC_SUBST(BUILTIN_LIBS)
-
+ 
+ AM_CONDITIONAL([SI_BUILTIN_STATICDEMO], [test x$bi_staticdemo = xtrue])
+ AM_CONDITIONAL([SI_BUILTIN_SYZEXTRA], [test x$bi_syzextra = xtrue])
+ AM_CONDITIONAL([SI_BUILTIN_PYOBJECT], [test x$bi_pyobject = xtrue])
+ AM_CONDITIONAL([SI_BUILTIN_GFANLIB], [test x$bi_gfanlib = xtrue])
+ AM_CONDITIONAL([SI_BUILTIN_POLYMAKE], [test x$bi_polymake = xtrue])
+ AM_CONDITIONAL([SI_BUILTIN_SINGMATHIC], [test x$bi_singmathic = xtrue])
+ AM_CONDITIONAL([SI_BUILTIN_BIGINTM], [test x$bi_bigintm = xtrue])
+ 
  AC_MSG_CHECKING([BUILTIN_LIBS...])
  AC_MSG_RESULT(${BUILTIN_LIBS:-unset})