[SCM] an open source computer algebra system branch, master, updated. upstream/3-1-3-1-3664-g4d18530

[Felix Salfelder]

The following commit has been merged in the master branch:
commit e1ecdc23d5e68adfe37099cf3e3a0d5ac9a9fbec
Author: Felix Salfelder <felix at salfelder.org>
Date:   Tue Feb 7 22:55:37 2012 +0100

    disable_NTL workaround

diff --git a/debian/rules b/debian/rules
index c5d4c2f..3761e4d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,7 @@ CXXFLAGS += -Wall
 #PREFIX=$(CURDIR)/debian/tmp/usr
 # ouch. no
 PREFIX=/usr
+									  #--enable-omalloc \
 DEB_CONFIGURE_EXTRA_FLAGS += --with-apint=gmp --with-gmp=/usr/lib --disable-NTL \
                              --with-ntl --with-NTL --without-MP --enable-gmp=/usr/lib \
                              --enable-Singular --enable-factory --enable-libfac \
@@ -29,6 +30,8 @@ DEB_CONFIGURE_EXTRA_FLAGS += --with-apint=gmp --with-gmp=/usr/lib --disable-NTL
                              --without-bison --enable-doc --without-Boost \
                              --with-factory=$(CURDIR)/factory \
                              --with-libfac=$(CURDIR)/libfac \
+                             --disable-ntl \
+                             --disable-NTL \
                              --with-omalloc=$(CURDIR)/omalloc
 DEB_MAKE_INVOKE += slibdir=$(PREFIX)/share/singular install_slibdir=$(PREFIX)/share/singular
 DEB_MAKE_BUILD_TARGET = clean
@@ -147,13 +150,16 @@ configure-stamp:
 	CXXFLAGS="$(CXXFLAGS) -fPIC" \
 	CPPFLAGS="$(CPPFLAGS) -I../omalloc -I$(CURDIR)/factory" \
 	LDFLAGS="$(LDFLAGS) -L$(CURDIR)/factory -L$(CURDIR)/libfac -L$(CURDIR)/omalloc" \
+	enable_NTL=no \
 	./configure $(DEB_CONFIGURE_EXTRA_FLAGS)
+	rm -f install-stamp
 	touch $@
 
 build: build-stamp
 
 build-stamp: configure-stamp
 	make
+	rm -f install-stamp
 	touch $@
 
 install: install-stamp

-- 
an open source computer algebra system