Changeset f3ea6ce in git for factory


Ignore:
Timestamp:
Aug 24, 2011, 4:55:49 PM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')
Children:
737a6818d978503b25a6d61c5cfca9f03239756e
Parents:
06aafe1435abc46caaf98845d6df8e3da8ade1f1
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-24 16:55:49+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:26+01:00
Message:
ADD: defining DISABLE_GMP_CPP makes cf_gmp.h to use our UGLY! hack to disable C++ functionality from gmp.h
FIX: libpolys should define SINGULAR and NOSTREAMIO before using
factory => went to misc/auxiliary.h
Location:
factory
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • factory/cf_gmp.h

    r06aafe1 rf3ea6ce  
    55#ifdef __cplusplus
    66//  #define __cplusplus_backup __cplusplus
    7   #undef __cplusplus
    8   extern "C"
    9   {
    10     #include <gmp.h>
    11   }
     7
     8# ifdef DISABLE_GMP_CPP
     9#  undef __cplusplus
     10extern "C"
     11{
     12#  include <gmp.h>
     13}
    1214  #include <factory/cplusplus.h>
     15#else
     16  #include <gmp.h>
     17#endif
    1318//  #define __cplusplus __cplusplus_backup
    1419#else

  • factory/configure.ac

    r06aafe1 rf3ea6ce  
    1717AC_CONFIG_MACRO_DIR([../m4])
    1818AC_CONFIG_AUX_DIR([.])
     19AC_CONFIG_HEADER(config.h)
    1920AM_MAINTAINER_MODE
    2021AM_INIT_AUTOMAKE
    … …  
    349350if test "x$with_Singular" = xyes; then
    350351  AC_DEFINE([SINGULAR],[1],[SINGULAR])
     352  AC_DEFINE([DISABLE_GMP_CPP],[1],[DISABLE_GMP_CPP])
     353  AC_DEFINE([NOSTREAMIO],[1],[DISABLE_GMP_CPP])
    351354fi
    352355
    … …  
    466469AC_DEFINE_UNQUOTED([GFTABLEDIR], "$explicit_gftabledir", [GFTABLEDIR])
    467470
    468 AC_CONFIG_HEADER(config.h)
    469471AC_OUTPUT(Makefile ftest/GNUmakefile)
Note: See TracChangeset for help on using the changeset viewer.