Changeset 812138 in git

Timestamp:

Apr 7, 2011, 2:19:51 PM (13 years ago)

Author:

Bradford Hovinen <hovinen@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

4021bbf45258a9c11212461e6d5de35fed6c4aac

Parents:

0ef3f51f0b7867a80073e246a0ce69c351adcf39

git-author:

Bradford Hovinen <hovinen@gmail.com>2011-04-07 14:19:51+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:04:19+01:00

Message:

* Create new macros SING_SYSTEM_SUPPORTS_DYNAMIC_MODULES and SING_CHECK_P_PROCS to resolve question of whether to enable p_Procs_Static and p_Procs_Dynamic
* Invoke new macro in libpolys/polys/configure.ac and use its output to direct compilation in libpolys/polys/Makefile.am

Files:

• libpolys/polys/Makefile.am (modified) (3 diffs)
• libpolys/polys/configure.ac (modified) (2 diffs)
• m4/p-procs.m4 (added)

libpolys/polys/Makefile.am

@@ -17 +17 @@
 AM_LDFLAGS      = -L${top_builddir}/../coeffs -L${top_builddir}/../reporter -L${top_builddir}/../resources -L${top_builddir}/../../omalloc -L${builddir}
 
+if ENABLE_P_PROCS_STATIC
+  USE_P_PROCS_STATIC_CC = templates/p_Procs_Static.cc
+else
+  USE_P_PROCS_STATIC_CC =
+endif
+
+if ENABLE_P_PROCS_DYNAMIC
+  USE_P_PROCS_DYNAMIC_CC = templates/p_Procs_Dynamic.cc
+else
+  USE_P_PROCS_DYNAMIC_CC =
+endif
+
 SOURCES = \
         monomials/monomials.cc monomials/p_polys.cc monomials/ring.cc monomials/maps.cc \
@@ -23 +35 @@
         templates/p_Procs_Lib.cc \
         polys0.cc prCopy.cc \
-        kbuckets.cc sbuckets.cc templates/p_Procs.cc weight.cc
+        kbuckets.cc sbuckets.cc ${USE_P_PROCS_STATIC_CC} ${USE_P_PROCS_DYNAMIC_CC} weight.cc
 
 BUILT_SOURCES = templates/p_Procs.inc
@@ -85 +97 @@
 libpolys_g_a_SOURCES = ${SOURCES}
 
+EXTRA_libpolys_a_SOURCES = templates/p_Procs_Static.cc templates/p_Procs_Dynamic.cc
+
 libpolys_a_LIBADD = $(DL_KERNEL_OBJECT)
 libpolys_a_DEPENDENCIES = $(DL_KERNEL_OBJECT)

libpolys/polys/configure.ac

@@ -9 +9 @@
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4],[../../m4])
+
+SING_CHECK_P_PROCS
 
 # Checks for programs.
@@ -21 +23 @@
 # Checks for libraries.
 LB_CHECK_GMP(,,AC_MSG_ERROR([Unable to find GMP on your machine: please use --with-gmp=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
-
 
 # Checks for header files.