[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323

[Bernhard R. Link]

The following commit has been merged in the cleanedupstream branch:
commit 5669c2e8963122daad1ce6d4d398f8965d4c549e
Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
Date:   Fri Feb 24 18:17:00 2012 +0100

    fix: use configured options (HAVE_FANS)

diff --git a/Singular/Makefile.in b/Singular/Makefile.in
index f73705c..7a59327 100644
--- a/Singular/Makefile.in
+++ b/Singular/Makefile.in
@@ -231,10 +231,6 @@ CXXSOURCES=grammar.cc scanner.cc attrib.cc \
     denom_list.cc \
     minpoly.cc
 
-ifdef HAVE_FANS
-CXXSOURCES+= bbcone.cc bbpolytope.cc bbfan.cc
-endif
-
 # stuff for MP
 MPSR_SOURCES = mpsr_Put.cc mpsr_PutPoly.cc mpsr_GetPoly.cc mpsr_sl.cc\
 	mpsr_Get.cc mpsr_GetMisc.cc mpsr_Error.cc \
diff --git a/callgfanlib/bbcone.cc b/callgfanlib/bbcone.cc
index 987a231..e364465 100644
--- a/callgfanlib/bbcone.cc
+++ b/callgfanlib/bbcone.cc
@@ -1,6 +1,6 @@
 #include <Singular/mod2.h>
 
-// #ifdef HAVE_FANS
+#ifdef HAVE_FANS
 
 #include <Singular/ipid.h>
 #include <Singular/blackbox.h>
@@ -1349,5 +1349,5 @@ void bbcone_setup()
   //Print("created type %d (cone)\n",coneID); 
 }
 
-// #endif
+#endif
 /* HAVE_FANS */
diff --git a/callgfanlib/bbcone.h b/callgfanlib/bbcone.h
index 56b1323..026eb09 100755
--- a/callgfanlib/bbcone.h
+++ b/callgfanlib/bbcone.h
@@ -1,7 +1,7 @@
 #ifndef BBCONE_H
 #define BBCONE_H
 
-// #ifdef HAVE_FANS
+#ifdef HAVE_FANS
 #include <gfanlib/gfanlib.h>
 #include <kernel/intvec.h>
 
@@ -24,5 +24,5 @@ int isSimplicial(gfan::ZCone* zc);
 bool containsInSupport(gfan::ZCone* zc, gfan::ZCone* zd);
 bool containsInSupport(gfan::ZCone* zc, intvec* vec);
 
-// #endif
+ #endif
 #endif
diff --git a/callgfanlib/bbfan.cc b/callgfanlib/bbfan.cc
index 905106d..ea56ec6 100644
--- a/callgfanlib/bbfan.cc
+++ b/callgfanlib/bbfan.cc
@@ -1,5 +1,5 @@
 #include <Singular/mod2.h>
-// #ifdef HAVE_FANS
+#ifdef HAVE_FANS
 
 #include <Singular/ipid.h>
 #include <Singular/blackbox.h>
@@ -730,5 +730,5 @@ void bbfan_setup()
   //Print("created type %d (fan)\n",fanID); 
 }
 
-// #endif
+#endif
 /* HAVE_FANS */
diff --git a/callgfanlib/bbfan.h b/callgfanlib/bbfan.h
index c5edfc4..86ad31d 100755
--- a/callgfanlib/bbfan.h
+++ b/callgfanlib/bbfan.h
@@ -1,7 +1,7 @@
 #ifndef BBFAN_H
 #define BBFAN_H
 
-// #ifdef HAVE_FANS
+#ifdef HAVE_FANS
 #include <gfanlib/gfanlib.h>
 
 extern int fanID;
@@ -13,5 +13,5 @@ int getCodimension(gfan::ZFan* zf);
 int getDimension(gfan::ZFan* zf);
 int getLinealityDimension(gfan::ZFan* zf);
 
-// #endif
+#endif
 #endif
diff --git a/callgfanlib/bbpolytope.cc b/callgfanlib/bbpolytope.cc
index 92e34fc..3046a08 100644
--- a/callgfanlib/bbpolytope.cc
+++ b/callgfanlib/bbpolytope.cc
@@ -1,6 +1,6 @@
 #include <Singular/mod2.h>
 
-// #ifdef HAVE_FANS
+#ifdef HAVE_FANS
 
 #include <Singular/ipid.h>
 #include <Singular/blackbox.h>
@@ -556,5 +556,5 @@ void bbpolytope_setup()
   //Print("created type %d (polytope)\n",polytopeID); 
 }
 
-// #endif
+#endif
 /* HAVE_FANS */
diff --git a/callgfanlib/bbpolytope.h b/callgfanlib/bbpolytope.h
index fd2e6fc..d75683f 100755
--- a/callgfanlib/bbpolytope.h
+++ b/callgfanlib/bbpolytope.h
@@ -1,7 +1,7 @@
 #ifndef BBPOLYTOPE_H
 #define BBPOLYTOPE_H
 
-// #ifdef HAVE_FANS
+#ifdef HAVE_FANS
 #include <gfanlib/gfanlib.h>
 
 extern int polytopeID;
@@ -13,5 +13,5 @@ int getAmbientDimension(gfan::ZCone* zc); // zc is meant to represent a polytope
 int getCodimension(gfan::ZCone *zc);
 int getDimension(gfan::ZCone* zc);
 
-// #endif
+#endif
 #endif
diff --git a/callgfanlib/gfanlib.cc b/callgfanlib/gfanlib.cc
index 8286785..632ebb7 100644
--- a/callgfanlib/gfanlib.cc
+++ b/callgfanlib/gfanlib.cc
@@ -1,4 +1,5 @@
 #include <Singular/mod2.h>
+#ifdef HAVE_FANS
 #include <callgfanlib/bbcone.h>
 #include <callgfanlib/bbfan.h>
 #include <callgfanlib/bbpolytope.h>
@@ -14,3 +15,4 @@ extern "C" int mod_init(void* gfanlibsingular)
   bbfan_setup();
   bbpolytope_setup();
 }
+#endif

-- 
an open source computer algebra system