[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 68ff9b8e1af7e25bff164d1609caf2a676d6adee
Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
Date:   Fri Feb 24 19:58:05 2012 +0100

    fix: callfanlib as static lib if --enable-gfanlib

diff --git a/Singular/LIB/help.cnf b/Singular/LIB/help.cnf
index 4e72f7b..b8479db 100644
--- a/Singular/LIB/help.cnf
+++ b/Singular/LIB/help.cnf
@@ -36,7 +36,7 @@ firefox!xDhE:firefox:!firefox %h &
 konqueror!xDhE:konqueror:!konqueror %h &
 galeon!xDhE:galeon:!galeon -n %h &
 netscape!xDhE:netscape:!(netscape -remote "openURL(%h)")||(netscape %h) &
-safari!xh:E:/Applications/Safari.app:!open /Applications/Safari.app %h
+safari!xhE:/Applications/Safari.app:!open /Applications/Safari.app %h
 tkinfo!xDiE:tkinfo:!tkinfo '(%i)%n' &
 xinfo!xDiE:xterm:E:info:!xterm -e info -f %i --node='%n' &
 info!xiE:info:!info -f %i --node='%n'
diff --git a/Singular/configure b/Singular/configure
index 6615b4a..adee155 100755
--- a/Singular/configure
+++ b/Singular/configure
@@ -5744,7 +5744,7 @@ if test "$enable_gfanlib" = yes; then
   cat >> confdefs.h <<\EOF
 #define HAVE_FANS 1
 EOF
-  NEED_LIBS="-lgfan -lcddgmp ${NEED_LIBS}"
+  NEED_LIBS="-L../callgfanlib -lcallgfan -lgfan -lcddgmp ${NEED_LIBS}"
 else
   echo "$ac_t""can not build with gfan lib" 1>&6
 fi
diff --git a/Singular/configure.in b/Singular/configure.in
index 9442595..2bed0ec 100644
--- a/Singular/configure.in
+++ b/Singular/configure.in
@@ -1213,7 +1213,7 @@ AC_MSG_CHECKING(gfanlib)
 if test "$enable_gfanlib" = yes; then
   AC_MSG_RESULT(yes)
   AC_DEFINE(HAVE_FANS)
-  NEED_LIBS="-lgfan -lcddgmp ${NEED_LIBS}"
+  NEED_LIBS="-L../callgfanlib -lcallgfan -lgfan -lcddgmp ${NEED_LIBS}"
 else
   AC_MSG_RESULT(can not build with gfan lib)
 fi
diff --git a/callgfanlib/Makefile b/callgfanlib/Makefile
deleted file mode 100755
index 51543f7..0000000
--- a/callgfanlib/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-all: gfanlib
-
-gfanlib: 
-	g++ -DOM_DEBUG -DNDEBUG -o bbcone.o -fpic -I../ -c -g bbcone.cc
-	g++ -DOM_DEBUG -DNDEBUG -o bbfan.o -fpic -I../ -c -g bbfan.cc
-	g++ -DOM_DEBUG -DNDEBUG -o bbpolytope.o -fpic -I../ -c -g bbpolytope.cc
-	g++ -DOM_DEBUG -DNDEBUG -o gfanlib.o -fpic -I../ -c -g gfanlib.cc
-	g++ -DOM_DEBUG -DNDEBUG -o gfan.o -fpic -I../ -c -g gfan.cc
-	g++ -shared -o gfanlib.so bbcone.o bbfan.o bbpolytope.o gfanlib.o gfan.o ../gfanlib/*.o -L/usr/local/lib -lcddgmp -lgmpxx 
-	cp gfanlib.so ../Singular/gfanlib.so
-
-clean:
-	rm *.so *.o
-	rm ../Singular/gfanlib.so
diff --git a/callgfanlib/Makefile.in b/callgfanlib/Makefile.in
new file mode 100755
index 0000000..c900db5
--- /dev/null
+++ b/callgfanlib/Makefile.in
@@ -0,0 +1,25 @@
+CXX             = @CXX@
+PIPE            = @PIPE@
+DEFS            = -DNDEBUG -DOM_NDEBUG -D at SING_UNAME@ @DEFS@
+CXXFLAGS        = @CXXFLAGS@ -I.. -I at prefix@ ${PIPE}
+CPPFLAGS        = -I${srcdir} -I.. -I at prefix@ @CPPFLAGS@
+
+all: callgfan libcallgfan.a
+
+callgfan: 
+	$(CXX) ${CXXFLAGS} ${CPPFLAGS} ${DEFS} -o bbcone.o  -c bbcone.cc
+	$(CXX) ${CXXFLAGS} ${CPPFLAGS} ${DEFS} -o bbfan.o  -c bbfan.cc
+	$(CXX) ${CXXFLAGS} ${CPPFLAGS} ${DEFS} -o bbpolytope.o -c bbpolytope.cc
+	$(CXX) ${CXXFLAGS} ${CPPFLAGS} ${DEFS} -o gfanlib.o -c gfanlib.cc
+	$(CXX) ${CXXFLAGS} ${CPPFLAGS} ${DEFS} -o gfan.o -c gfan.cc
+
+gfanlib.so:
+	$(CXX) -shared -o gfanlib.so bbcone.o bbfan.o bbpolytope.o gfanlib.o gfan.o ../gfanlib/*.o -L/usr/local/lib -lcddgmp -lgmpxx 
+	cp gfanlib.so ../Singular/gfanlib.so
+
+libcallgfan.a: bbcone.o bbfan.o bbpolytope.o  gfanlib.o gfan.o
+	ar cr $@ $^
+
+clean:
+	rm *.so *.o
+	rm ../Singular/gfanlib.so
diff --git a/configure b/configure
index 09b5334..d5806f2 100755
--- a/configure
+++ b/configure
@@ -612,6 +612,9 @@ export SINGULAR_ROOT_DIR
 
 # determine Makefiles to output
 OUTPUT_MAKEFILES="Makefile"
+if test "$enable_gfanlib" = yes; then
+   OUTPUT_MAKEFILES="$OUTPUT_MAKEFILES callgfanlib/Makefile"
+fi
 if test -d "doc"; then
    OUTPUT_MAKEFILES="$OUTPUT_MAKEFILES doc/Makefile doc/version.texi doc/uname.texi"
 fi
@@ -2278,8 +2281,8 @@ echo "configure:2286: checking whether to configure and build gfan lib" >&5
 if test "$enable_gfanlib" = yes; then
   if test -d gfanlib; then
     echo "$ac_t""yes" 1>&6
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS gfanlib"
-    BUILD1_SUBDIRS="$BUILD1_SUBDIRS gfanlib"
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS gfanlib callgfanlib"
+    BUILD1_SUBDIRS="$BUILD1_SUBDIRS gfanlib callgfanlib"
   else
     echo "$ac_t""no" 1>&6
   fi
diff --git a/configure.in b/configure.in
index 56bb9da..5a6beb0 100644
--- a/configure.in
+++ b/configure.in
@@ -39,6 +39,9 @@ dnl Makefiles to output
 dnl
 # determine Makefiles to output
 OUTPUT_MAKEFILES="Makefile"
+if test "$enable_gfanlib" = yes; then
+   OUTPUT_MAKEFILES="$OUTPUT_MAKEFILES callgfanlib/Makefile"
+fi
 if test -d "doc"; then
    OUTPUT_MAKEFILES="$OUTPUT_MAKEFILES doc/Makefile doc/version.texi doc/uname.texi"
 fi
@@ -360,8 +363,8 @@ AC_MSG_CHECKING(whether to configure and build gfan lib)
 if test "$enable_gfanlib" = yes; then
   if test -d gfanlib; then
     AC_MSG_RESULT(yes)
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS gfanlib"
-    BUILD1_SUBDIRS="$BUILD1_SUBDIRS gfanlib"
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS gfanlib callgfanlib"
+    BUILD1_SUBDIRS="$BUILD1_SUBDIRS gfanlib callgfanlib"
   else
     AC_MSG_RESULT(no)
   fi

-- 
an open source computer algebra system