Changeset 812138 in git


Ignore:
Timestamp:
Apr 7, 2011, 2:19:51 PM (13 years ago)
Author:
Bradford Hovinen <hovinen@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '79dfb9a6d258bfeb991428bdb25b8f55e9e809b2')
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:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • libpolys/polys/Makefile.am

    r0ef3f51 r812138  
    1717AM_LDFLAGS      = -L${top_builddir}/../coeffs -L${top_builddir}/../reporter -L${top_builddir}/../resources -L${top_builddir}/../../omalloc -L${builddir}
    1818
     19if ENABLE_P_PROCS_STATIC
     20  USE_P_PROCS_STATIC_CC = templates/p_Procs_Static.cc
     21else
     22  USE_P_PROCS_STATIC_CC =
     23endif
     24
     25if ENABLE_P_PROCS_DYNAMIC
     26  USE_P_PROCS_DYNAMIC_CC = templates/p_Procs_Dynamic.cc
     27else
     28  USE_P_PROCS_DYNAMIC_CC =
     29endif
     30
    1931SOURCES = \
    2032        monomials/monomials.cc monomials/p_polys.cc monomials/ring.cc monomials/maps.cc \
     
    2335        templates/p_Procs_Lib.cc \
    2436        polys0.cc prCopy.cc \
    25         kbuckets.cc sbuckets.cc templates/p_Procs.cc weight.cc
     37        kbuckets.cc sbuckets.cc ${USE_P_PROCS_STATIC_CC} ${USE_P_PROCS_DYNAMIC_CC} weight.cc
    2638
    2739BUILT_SOURCES = templates/p_Procs.inc
     
    8597libpolys_g_a_SOURCES = ${SOURCES}
    8698
     99EXTRA_libpolys_a_SOURCES = templates/p_Procs_Static.cc templates/p_Procs_Dynamic.cc
     100
    87101libpolys_a_LIBADD = $(DL_KERNEL_OBJECT)
    88102libpolys_a_DEPENDENCIES = $(DL_KERNEL_OBJECT)
  • libpolys/polys/configure.ac

    r0ef3f51 r812138  
    99AC_CONFIG_HEADERS([config.h])
    1010AC_CONFIG_MACRO_DIR([m4],[../../m4])
     11
     12SING_CHECK_P_PROCS
    1113
    1214# Checks for programs.
     
    2123# Checks for libraries.
    2224LB_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)]))
    23 
    2425
    2526# Checks for header files.
Note: See TracChangeset for help on using the changeset viewer.