Changeset 897139 in git


Ignore:
Timestamp:
Sep 7, 2011, 2:05:51 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'e4953e241ca9796e2dcaa9e6228345429b6f4a96')
Children:
1f4ff97259ae27b025c548fb6d8003d111f373a3
Parents:
213d649793d02bccc46292a68beead7b202af509
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-07 14:05:51+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:33+01:00
Message:
FIX: numerics need GMP (NTL/FACTORY?) => changes to build system
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • Makefile.am

    r213d64 r897139  
    88endif
    99 
    10 PACKAGES=$(ALLOC) $(USE_FACTORY) libpolys numeric kernel Singular
     10PACKAGES=$(ALLOC) $(USE_FACTORY) libpolys kernel numeric Singular
    1111
    1212SUBDIRS=$(PACKAGES)

  • configure.ac

    r213d64 r897139  
    55AC_PROG_CC
    66AC_PROG_CXX
     7AM_PROG_CC_C_O
    78AC_PROG_RANLIB
    89
    910SING_CHECK_FACTORY
     11# Checks for libraries.
     12LB_CHECK_GMP(3.1.1,,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)]))
     13LB_CHECK_NTL(5.0,,AC_MSG_WARN([Unable to find NTL (which is strongly recommended) on your machine: please use --with-ntl=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
    1014
    1115AC_CONFIG_FILES([Makefile])
    12 
    13 
    1416AC_CONFIG_SUBDIRS(omalloc)
    1517if test x$ENABLE_FACTORY = xyes; then
    … …  
    1719fi
    1820AC_CONFIG_SUBDIRS(libpolys)
    19 
    2021AC_CONFIG_FILES([numeric/Makefile])
    2122

  • libpolys/configure.ac

    r213d64 r897139  
    2121# Checks for libraries.
    2222LB_CHECK_GMP(3.1.1,,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 
    2423LB_CHECK_NTL(5.0,,AC_MSG_WARN([Unable to find NTL (which is strongly recommended) on your machine: please use --with-ntl=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
    2524

  • numeric/Makefile.am

    r213d64 r897139  
    1313libnumeric_g_a_CPPFLAGS = -DHAVE_CONFIG_H
    1414
    15 INCLUDES = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys
     15INCLUDES = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys ${GMP_CFLAGS} ${FACTORY_CFLAGS} ${NTL_CFLAGS}
    1616
    1717SOURCES  = mpr_base.cc mpr_inout.cc mpr_numeric.cc
Note: See TracChangeset for help on using the changeset viewer.