Changeset af87fd in git

Timestamp:

May 7, 2014, 6:47:20 AM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

dc7ba42a521ebf650d813702dec7f058433ae1d6

Parents:

f476eb1bf2ea54c67bf845b953fb483fcddbbe8c

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-07 06:47:20+02:00

git-committer:

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

Message:

BS Support for builtin modules (with-builtinmodules, BUILTIN_LIB)

Files:

• Singular/Makefile.am (modified) (4 diffs)
• Singular/dyn_modules/callgfanlib/Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• m4/options.m4 (modified) (1 diff)

Singular/Makefile.am

@@ -5 +5 @@
 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(FACTORY_INCLUDES)  $(GMP_CFLAGS) $(NTL_CFLAGS) $(FLINT_CFLAGS) -DGIT_VERSION='"$(GIT_VERSION)"'
 
-########################### Dynamic Modules... #########################
 SUBDIRS = dyn_modules
 
+########################### Possible builtin modules... #########################
+BUILTIN_FLAGS = ${BUILTIN_LIBS}
+## ${EMBED_SYZEXTRA} ${EMBED_PYOBJECT} ${EMBED_GFANLIB} ${EMBED_PM}
+
+## EMBED_SYZEXTRA = 
+if SI_BUILTIN_SYZEXTRA
+  BUILTIN_FLAGS += ${builddir}/dyn_modules/syzextra/syzextra.la
+endif
+
+## EMBED_GFANLIB = 
 if HAVE_GFANLIB
-  USE_GFANLIB = ${builddir}/dyn_modules/callgfanlib/gfanlib.la ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS}
-else
-  USE_GFANLIB = 
-endif
-
+  GF = ${builddir}/dyn_modules/callgfanlib/gfanlib.la
+endif
+
+if SI_BUILTIN_GFANLIB
+  BUILTIN_FLAGS += ${GF}
+endif
+
+
+## EMBED_PM 
+if SI_BUILTIN_PM 
+  PM=${builddir}/dyn_modules/callpolymake/polymake.la
+endif
+
+if SING_HAVE_POLYMAKE
+  BUILTIN_FLAGS += ${PM}
+endif
+
+## EMBED_PYOBJECT = 
+if SI_BUILTIN_PYOBJECT 
+if SI_EMBED_PYTHON 
 if PYTHON_USE
-  PY=${builddir}/dyn_modules/pyobject/pyobject.la
-else !PYTHON_USE
-  PY=
-endif !PYTHON_USE
-
-if SI_EMBED_PYTHON
- EMBED_PYOBJECT   = ${PY} ${builddir}/dyn_modules/syzextra/syzextra.la ${USE_GFANLIB}
-else !SI_EMBED_PYTHON
-  EMBED_PYOBJECT = 
-endif !SI_EMBED_PYTHON
+  BUILTIN_FLAGS += ${builddir}/dyn_modules/pyobject/pyobject.la    
+endif
+endif
+endif
 
 ########################### libSingular* #########################
@@ -141 +159 @@
 
 libSingular_la_LDFLAGS    =${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION} ${PTHREAD_LDFLAGS}
-libSingular_la_LIBADD     =${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT} ${top_builddir}/kernel/libkernel.la ${PTHREAD_LIBS}
+libSingular_la_LIBADD     =${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${BUILTIN_FLAGS} ${top_builddir}/kernel/libkernel.la ${PTHREAD_LIBS}
 
 libSingular_includedir = ${includedir}/singular/Singular
@@ -177 +195 @@
 Singular_SOURCES = tesths.cc mmalloc.cc fegetopt.c fegetopt.h utils.cc  utils.h
 
-Singular_LDADD = libSingular.la ${EMBED_PYOBJECT}
-
-Singular_LDFLAGS = -static ${EMBED_PYOBJECT}
+Singular_LDADD = libSingular.la ${BUILTIN_FLAGS}
+
+Singular_LDFLAGS = -static ${BUILTIN_FLAGS}
 
 Singulars_SOURCES = tesths.cc mmalloc.cc fegetopt.c fegetopt.h utils.cc  utils.h
 
-#  ${EMBED_PYOBJECT_LDFLAGS}  ${EMBED_PYOBJECT_LDFLAGS}
-Singulars_LDADD = libSingular.la ${EMBED_PYOBJECT}
-
-Singulars_LDFLAGS = -static ${AM_LDFLAGS} ${EMBED_PYOBJECT}
+Singulars_LDADD = libSingular.la ${BUILTIN_FLAGS}
+
+Singulars_LDFLAGS = -static ${AM_LDFLAGS} ${BUILTIN_FLAGS}
 
 scriptdir = $(libexecdir)/singular/MOD
@@ -247 +264 @@
 
 test_SOURCES = test.cc
-# ${EMBED_PYOBJECT_LDFLAGS}
 test_LDADD = libSingular.la 
 

Singular/dyn_modules/callgfanlib/Makefile.am

@@ -28 +28 @@
 
 gfanlib_la_LIBADD   = ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS}
+#  ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS}
 
 

configure.ac

@@ -121 +121 @@
 
 SING_CHECK_PLURAL
+
+SING_BUILTIN_MODULES
 
 ### the following is needed due to the use of om_sing_opt_show_mem in misc_ip.cc...

m4/options.m4

@@ -289 +289 @@
 
 ])
+
+
+
+AC_DEFUN([SING_BUILTIN_MODULES],
+[
+ AC_MSG_CHECKING([whether for builtin modules])
+
+ AC_ARG_VAR( [BUILTIN_LIBS], [LIBS for building-in] )
+ AC_ARG_WITH(builtinmodules, AS_HELP_STRING([--with-builtinmodules], [list? of builtin modules (experimental)]))
+
+ if test "x$with_builtinmodules" == xno; then
+  AC_MSG_RESULT(no)
+ else
+  AC_DEFINE_UNQUOTED([SI_BUILTINMODULES],"$with_builtinmodules",[List? of Builtin modules])
+  AC_MSG_RESULT(yes)
+  
+  if test "x$with_builtinmodules" == xyes; then
+    with_builtinmodules=pyobject,syzextra,callgfanlib,callpolymake
+  fi
+
+  L=""
+  for a in ${with_builtinmodules//,/ }; do
+    echo "Will build-in '$a'..."
+    case "$a" in
+      pyobject ) BUILTIN_PYOBJECT=yes;;
+      syzextra ) BUILTIN_SYZEXTRA=yes;;
+      callgfanlib ) BUILTIN_GFAN=yes;;
+      callpolymake ) BUILTIN_PM=yes;;
+    esac
+     L+="add($a)"
+  done # for
+  echo "L=$L"
+  
+ fi # else
+ 
+ AC_SUBST(BUILTIN_LIBS)
+
+ AM_CONDITIONAL([SI_BUILTIN_PYOBJECT],[test "x$BUILTIN_PYOBJECT" == xyes])
+ AM_CONDITIONAL([SI_BUILTIN_SYZEXTRA],[test "x$BUILTIN_SYZEXTRA" == xyes])
+ AM_CONDITIONAL([SI_BUILTIN_GFANLIB],[test "x$BUILTIN_GFAN" == xyes])
+ AM_CONDITIONAL([SI_BUILTIN_PM],[test "x$BUILTIN_PM" == xyes])
+
+ AC_MSG_CHECKING([BUILTIN_LIBS?..])
+ AC_MSG_RESULT(${BUILTIN_LIBS:-unset})
+
+ AC_MSG_CHECKING([builtinmodules?..])
+ AC_MSG_RESULT(${with_builtinmodules:-unset})
+
+
+])