Changeset 76f3a18 in git

Timestamp:

Jan 27, 2012, 7:07:56 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

fea2afe12a425d875d707eb7393d52b070f19b49

Parents:

ddaf2700f95c21ac48ebb35fcee012aa8c08033e

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-27 19:07:56+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-27 19:28:00+01:00

Message:

added building binary programs from IntegerProgramming: toric_ideal, solve_IP, change_cost, gen_test and LLL

ADD: IntegerProgramming is a SUBPACKAGE of the main package
CHG: removing obsolette stuff (gccversion.sh)
CHG: use gmp.h instead of si_gmp.h!

TODO: install help files properly (only distributed for now)

Files:

• IntegerProgramming/BigInt.h (modified) (1 diff)
• IntegerProgramming/COPYING (deleted)
• IntegerProgramming/LLL_lattice_to_send.cc (modified) (1 diff)
• IntegerProgramming/Makefile.am (added)
• IntegerProgramming/Makefile.in.SAVE (moved) (moved from IntegerProgramming/Makefile.in)
• IntegerProgramming/gccversion.sh.SAVE (moved) (moved from IntegerProgramming/gccversion.sh)
• IntegerProgramming/globals.h (modified) (1 diff)
• IntegerProgramming/si_gmp.h (deleted)
• Makefile.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)

IntegerProgramming/BigInt.h

@@ -12 +12 @@
 #include <ctype.h>
 #include <string.h>
-#include <si_gmp.h>
+#include <gmp.h>
 
 class BigInt

IntegerProgramming/LLL_lattice_to_send.cc

@@ -58 +58 @@
 #include <new>
 #include <cstring>
-#include <si_gmp.h>
+#include <gmp.h>
 
 #define LLL_MAX(a,b) (a > b ? a : b)

IntegerProgramming/globals.h

@@ -13 +13 @@
 // Include facilities needed by several files:
 
-#include "si_gcc_v.h"
-#ifdef SI_GCC2
-#define HAVE_IOSTREAM_H
-#endif
+// the following is not good! TODO: move to all including sources...
+#include "config.h"
 
 #include <stdio.h>

Makefile.am

@@ -9 +9 @@
 endif
  
-PACKAGES=findexec $(ALLOC) $(USE_FACTORY) libpolys kernel numeric Singular
+PACKAGES=findexec $(ALLOC) $(USE_FACTORY) libpolys kernel numeric Singular IntegerProgramming
 
 SUBDIRS=$(PACKAGES)

configure.ac

@@ -37 +37 @@
 
 AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
+AC_CHECK_HEADERS(unistd.h iostream.h)
 
 AC_CHECK_FUNCS(readlink getcwd getwd)
@@ -108 +108 @@
 AC_CONFIG_FILES([numeric/Makefile])
 AC_CONFIG_FILES([Singular/Makefile])
+AC_CONFIG_FILES([IntegerProgramming/Makefile])
 AC_CONFIG_FILES([libsingular-config])