Changeset f3ea6ce in git


Ignore:
Timestamp:
Aug 24, 2011, 4:55:49 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')
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
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • Singular/test.cc

    r06aafe1 rf3ea6ce  
    5252#ifdef HAVE_FACTORY
    5353int initializeGMP(){ return 1; } // NEEDED FOR MAIN APP. LINKING!!!
     54int mmInit(void) {return 1; } // ? due to SINGULAR!!!...???
    5455#endif
    5556

  • 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)

  • kernel/mod2.h

    r06aafe1 rf3ea6ce  
    1212
    1313#include <misc/auxiliary.h>
     14
    1415#define SINGULAR_MAJOR_VERSION 0
    1516#define SINGULAR_MINOR_VERSION 0

  • libpolys/configure.ac

    r06aafe1 rf3ea6ce  
    8080AC_DEFINE_UNQUOTED(INSTALL_PREFIX,"$PREFIX",Prefix)
    8181
     82AC_DEFINE([SINGULAR],[1],[SINGULAR])
     83AC_DEFINE([DISABLE_GMP_CPP],[1],[DISABLE_GMP_CPP])
     84AC_DEFINE([NOSTREAMIO],[1],[DISABLE_GMP_CPP])
     85
    8286AC_SUBST(LIBPREFIX)
    8387

  • libpolys/misc/auxiliary.h.in

    r06aafe1 rf3ea6ce  
    4242#undef HAVE_POLYEXTENSIONS
    4343#endif
     44
     45#ifndef DISABLE_GMP_CPP
     46#undef DISABLE_GMP_CPP
     47#endif
     48
     49#ifdef HAVE_FACTORY
     50
     51#ifndef SINGULAR
     52#undef SINGULAR
     53#endif
     54
     55#ifndef NOSTREAMIO
     56#undef NOSTREAMIO
     57#endif
     58
     59#endif
     60// #ifdef HAVE_FACTORY
     61
    4462// ----------------  end of parts/extensions
    4563// -----------------  configure stuff
Note: See TracChangeset for help on using the changeset viewer.