Changeset 47e8b04 in git


Ignore:
Timestamp:
Jul 18, 2013, 3:03:17 PM (10 years ago)
Author:
Yue Ren <ren@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')
Children:
87977c77f3d3666b9c0306a8fd7e7e93a76b25e6
Parents:
c8e1159b19cf2962fcc89a7d558f7fc2ef5222ec
git-author:
Yue Ren <ren@mathematik.uni-kl.de>2013-07-18 15:03:17+02:00
git-committer:
Yue Ren <ren@mathematik.uni-kl.de>2013-07-18 15:27:11+02:00
Message:
new: first try in polymake interface
Files:
7 added
6 edited

Legend:

Unmodified
Added
Removed

  • Makefile.am

    rc8e115 r47e8b04  
    88libpolys kernel numeric gfanlib dyn_modules \
    99IntegerProgramming Singular dox \
    10 emacs debian redhat desktop 
     10emacs debian redhat desktop
    1111
    1212# PACKAGES = $(SUBDIRS)

  • configure.ac

    rc8e115 r47e8b04  
    4242if test -z "$DOXYGEN";
    4343   then AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])
    44 fi 
     44fi
    4545AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
    46                                                                    
     46
    4747LT_INIT
    4848
    … …  
    8282SING_CHECK_DBM
    8383SING_CHECK_GFANLIB
     84SING_CHECK_POLYMAKE
    8485
    8586### the following is needed due to the use of om_sing_opt_show_mem in misc_ip.cc...
    … …  
    142143AC_DEFINE_UNQUOTED([LDFLAGS],"$LDFLAGS",[LDFLAGS])
    143144AC_DEFINE_UNQUOTED([LIBS],"$LIBS",[LIBS])
    144  
    145  
     145
     146
    146147SING_SHOW_FLAGS([Compiler/linker flags: ])
    147148
    148    
     149
    149150AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([dox/Doxyfile])])
    150151AC_CONFIG_FILES([dox/Makefile])
    … …  
    170171AC_CONFIG_FILES([dyn_modules/syzextra/Makefile])
    171172AC_CONFIG_FILES([dyn_modules/callgfanlib/Makefile])
     173AC_CONFIG_FILES([dyn_modules/callpolymake/Makefile])
    172174
    173175AC_CONFIG_FILES([Singular/Makefile])

  • dyn_modules/Makefile.am

    rc8e115 r47e8b04  
    11ACLOCAL_AMFLAGS = -I ../m4
    22
    3 PACKAGES=bigintm syzextra callgfanlib
     3PACKAGES=bigintm syzextra callgfanlib callpolymake
    44SUBDIRS=$(PACKAGES)
    55

  • dyn_modules/callgfanlib/Makefile.am

    rc8e115 r47e8b04  
    66if ENABLE_P_PROCS_DYNAMIC
    77  module_LTLIBRARIES=gfanlib.la
    8 
    9 if WANT_DEBUG
    10   module_LTLIBRARIES+=gfanlib_g.la
    11 endif
    12 
    138endif
    149endif
    1510
    16 CXXTEMPLFLAGS   = ${PIPE} -lcddgmp
     11
     12CXXTEMPLFLAGS   =
    1713## -fno-implicit-templates
    1814## --no-exceptions
    … …  
    5248# gfanlib_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
    5349
    54 gfanlib_la_LIBADD = ${abs_top_builddir}/gfanlib/libgfan.la -lcddgmp
     50
     51gfanlib_la_LIBADD = ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS}
    5552# gfanlib_g_la_LIBADD = ${gfanlib_la_LIBADD}
    5653

  • dyn_modules/callgfanlib/gfanlib.cc

    rc8e115 r47e8b04  
     1#ifdef HAVE_CONFIG_H
     2#include "config.h"
     3#endif /* HAVE_CONFIG_H */
     4
    15#include <kernel/mod2.h>
    26
    … …  
    59#include <bbpolytope.h>
    610#include <gitfan.h>
    7 #include"Singular/ipid.h"
     11#include "Singular/ipid.h"
    812
    913template class gfan::Vector<gfan::Integer>;

  • m4/gfanlib-check.m4

    rc8e115 r47e8b04  
    1212if test "x$ENABLE_GFANLIB" = xyes; then
    1313 AC_MSG_RESULT(yes)
     14 AC_CHECK_LIB(cddgmp,dd_set_global_constants,[
     15  CDDGMPLDFLAGS="-lcddgmp"
     16  PASSED_ALL_TESTS_FOR_GFANLIB="yes";
     17  ],[
     18  PASSED_ALL_TESTS_FOR_GFANLIB="no";
     19  echo "Error! cddgmp needed!"
     20  exit -1
     21  ])
    1422else
    1523 AC_MSG_RESULT(no)
     24 PASSED_ALL_TESTS_FOR_GFANLIB="no";
    1625fi
    1726
    18 AM_CONDITIONAL(HAVE_GFANLIB, test "x$ENABLE_GFANLIB" = xyes)
     27AM_CONDITIONAL(HAVE_GFANLIB, test "x$PASSED_ALL_TESTS_FOR_GFANLIB" = xyes)
    1928
    2029])
Note: See TracChangeset for help on using the changeset viewer.