diff options
Diffstat (limited to 'sci-mathematics/singular/files')
13 files changed, 647 insertions, 0 deletions
diff --git a/sci-mathematics/singular/files/60singular-gentoo.el b/sci-mathematics/singular/files/60singular-gentoo.el new file mode 100644 index 000000000000..7be8c08ef7e9 --- /dev/null +++ b/sci-mathematics/singular/files/60singular-gentoo.el @@ -0,0 +1,10 @@ + +;; site-file for sci-mathematics/singular + +(add-to-list 'load-path "@SITELISP@") +(autoload 'singular "singular" + "Start Singular using default values." t) +(autoload 'singular-other "singular" + "Ask for arguments and start Singular." t) + +(add-to-list 'auto-mode-alist '("\\.sing\\'" . c++-mode)) diff --git a/sci-mathematics/singular/files/singular-3.0.4.4-nostrip.patch b/sci-mathematics/singular/files/singular-3.0.4.4-nostrip.patch new file mode 100644 index 000000000000..5884b6cd2d60 --- /dev/null +++ b/sci-mathematics/singular/files/singular-3.0.4.4-nostrip.patch @@ -0,0 +1,12 @@ +diff -Naur Singular-3-0-4/IntegerProgramming/Makefile.in Singular-3-0-4.new/IntegerProgramming/Makefile.in +--- Singular-3-0-4/IntegerProgramming/Makefile.in 2008-07-09 07:55:13.000000000 -0400 ++++ Singular-3-0-4.new/IntegerProgramming/Makefile.in 2008-10-19 22:40:41.000000000 -0400 +@@ -21,7 +21,7 @@ + endif + + INSTALL = @INSTALL@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ + MKINSTALLDIRS = ../mkinstalldirs + + ## diff --git a/sci-mathematics/singular/files/singular-3.1.0-emacs-22.patch b/sci-mathematics/singular/files/singular-3.1.0-emacs-22.patch new file mode 100644 index 000000000000..3f4f3c76203c --- /dev/null +++ b/sci-mathematics/singular/files/singular-3.1.0-emacs-22.patch @@ -0,0 +1,13 @@ +diff -Naur Singular-3-1-0/emacs/singular.el Singular-3-1-0.new/emacs/singular.el +--- Singular-3-1-0/emacs/singular.el 2008-11-03 09:16:38.000000000 -0500 ++++ Singular-3-1-0.new/emacs/singular.el 2009-08-20 22:16:57.000000000 -0400 +@@ -865,7 +865,8 @@ + (add-hook 'singular-post-output-filter-functions 'singular-prompt-remove-filter nil t) + + ;; some relict from Comint mode +- (setq comint-prompt-regexp singular-comint-prompt-regexp)) ++ (setq comint-prompt-regexp singular-comint-prompt-regexp) ++ (setq comint-use-prompt-regexp-instead-of-fields 1)) + ;; required to use prompt-regexp + (setq comint-use-prompt-regexp t) + ;;}}} diff --git a/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch b/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch new file mode 100644 index 000000000000..ebb402289386 --- /dev/null +++ b/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch @@ -0,0 +1,81 @@ +--- kernel/feResource.cc.orig 2010-04-30 10:20:14.000000000 +0000 ++++ kernel/feResource.cc 2010-10-11 09:19:01.431179334 +0000 +@@ -41,7 +41,7 @@ + #define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"S_VERSION1 + #endif + #else // ! defined(MAKE_DISTRIBUTION) +-#define SINGULAR_DEFAULT_DIR S_ROOT_DIR ++#define SINGULAR_DEFAULT_DIR "@GENTOO_PORTAGE_EPREFIX@/usr" + #endif // defined(MAKE_DISTRIBUTION) + + /***************************************************************** +@@ -73,33 +73,31 @@ + { + {"SearchPath", 's', feResPath, NULL, + "$SINGULARPATH;" +- "%b/LIB;" +- "%b/MOD;" ++ "%r/share/singular/MOD;" + "%r/LIB;" +- "%r/../LIB;" ++ "%r/share/singular/LIB;" + "%d/LIB;" +- "%d/../LIB" + ""}, +- {"Singular", 'S', feResBinary,"SINGULAR_EXECUTABLE", "%d/"S_UNAME"/Singular",(char *)""}, +- {"BinDir", 'b', feResDir, "SINGULAR_BIN_DIR", "%d/"S_UNAME, (char *)""}, +- {"RootDir", 'r', feResDir, "SINGULAR_ROOT_DIR", "%b/..", (char *)""}, ++ {"Singular", 'S', feResBinary,"SINGULAR_EXECUTABLE", "%d/bin/Singular",(char *)""}, ++ {"BinDir", 'b', feResDir, "SINGULAR_BIN_DIR", "%d/bin", (char *)""}, ++ {"RootDir", 'r', feResDir, "SINGULAR_ROOT_DIR", "%d", (char *)""}, + {"DefaultDir",'d', feResDir, "SINGULAR_DEFAULT_DIR", SINGULAR_DEFAULT_DIR, (char *)""}, +- {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%r/info/singular.hlp", (char *)""}, +- {"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%r/doc/singular.idx", (char *)""}, +- {"HtmlDir", 'h', feResDir, "SINGULAR_HTML_DIR", "%r/html", (char *)""}, ++ {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%r/share/info/singular.info.bz2", (char *)""}, ++ {"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%r/share/singular/singular.idx", (char *)""}, ++ {"HtmlDir", 'h', feResDir, "SINGULAR_HTML_DIR", "%r/share/doc/PFSUBST/html", (char *)""}, + #ifdef ix86_Win + {"HtmlHelpFile",'C', feResFile, "SINGULAR_CHM_FILE", "%r/doc/Manual.chm", (char *)""}, + #endif + {"ManualUrl", 'u', feResUrl, "SINGULAR_URL", "http://www.singular.uni-kl.de/Manual/"S_VERSION1, (char *)""}, +- {"ExDir", 'm', feResDir, "SINGULAR_EXAMPLES_DIR","%r/examples", (char *)""}, ++ {"ExDir", 'm', feResDir, "SINGULAR_EXAMPLES_DIR","%r/share/doc/PFSUBST/examples", (char *)""}, + {"Path", 'p', feResPath, NULL, "%b;$PATH", (char *)""}, + + #ifdef ESINGULAR + {"emacs", 'E', feResBinary,"ESINGULAR_EMACS", "%b/emacs", (char *)""}, + {"xemacs", 'A', feResBinary,"ESINGULAR_EMACS", "%b/xemacs", (char *)""}, + {"SingularEmacs",'M', feResBinary,"ESINGULAR_SINGULAR", "%b/Singular", (char *)""}, +- {"EmacsLoad", 'l', feResFile, "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular", (char *)""}, +- {"EmacsDir", 'e', feResDir, "ESINGULAR_EMACS_DIR", "%r/emacs", (char *)""}, ++ {"EmacsLoad", 'l', feResFile, "ESINGULAR_EMACS_LOAD", "%r/share/emacs/site-lisp/singular/.emacs-singular", (char *)""}, ++ {"EmacsDir", 'e', feResDir, "ESINGULAR_EMACS_DIR", "%r/share/emacs/site-lisp/singular", (char *)""}, + #elif defined(TSINGULAR) + {"SingularXterm",'M', feResBinary,"TSINGULAR_SINGULAR", "%b/Singular", (char *)""}, + #ifdef ix86_Win +@@ -108,7 +106,7 @@ + {"xterm", 'X', feResBinary,"XTERM", "%b/xterm", (char *)""}, + #endif + #else +- {"EmacsDir", 'e', feResDir, "SINGULAR_EMACS_DIR", "%r/emacs", (char *)""}, ++ {"EmacsDir", 'e', feResDir, "SINGULAR_EMACS_DIR", "%r/share/emacs/site-lisp/singular", (char *)""}, + #endif + {NULL, 0, feResUndef, NULL, NULL, NULL}, // must be the last record + }; +--- kernel/mod_raw.cc.orig 2009-11-02 10:12:22.000000000 +0000 ++++ kernel/mod_raw.cc 2010-10-11 09:19:01.432179264 +0000 +@@ -109,11 +109,11 @@ + void* dynl_open_binary_warn(const char* binary_name, const char* msg) + { + void* handle = NULL; +- const char* bin_dir = feGetResource('b'); ++ const char* bin_dir = feGetResource('r'); + if (bin_dir != NULL) + { + char path_name[MAXPATHLEN]; +- sprintf(path_name, "%s%s%s.%s", bin_dir, DIR_SEPP, binary_name, ++ sprintf(path_name, "%s%s%s%s.%s", bin_dir,"/lib/singular", DIR_SEPP, binary_name, + DL_TAIL); + handle = dynl_open(path_name); + if (handle == NULL && ! warn_handle) diff --git a/sci-mathematics/singular/files/singular-3.1.3.2-python.patch b/sci-mathematics/singular/files/singular-3.1.3.2-python.patch new file mode 100644 index 000000000000..2cc29c9a553b --- /dev/null +++ b/sci-mathematics/singular/files/singular-3.1.3.2-python.patch @@ -0,0 +1,45 @@ +--- Singular/pyobject.cc.orig 2011-01-31 15:03:16.000000000 +0100 ++++ Singular/pyobject.cc 2011-08-24 17:22:57.000000000 +0200 +@@ -14,7 +14,7 @@ + + + +- ++#include <Python.h> + + #include <Singular/mod2.h> + +@@ -27,7 +27,7 @@ + + #include <Singular/lists.h> + +-#include <Python.h> ++ + #include <iterator> // std::distance + #include <stdio.h> + +@@ -592,11 +592,12 @@ + long len = newElts.size(); + for (long idx = 0; idx < len; ++idx) + { +- char* name = newElts[idx][0].str(); ++ PythonObject current (newElts[idx]); ++ char* name = current.operator[](0).str(); + if (name && (*name != '\0') && (*name != '_')) + { + Py_XDECREF(get_current_definition(name)); +- newElts[idx][1].import_as(name); ++ newElts[idx].operator[](1).import_as(name); + } + + } +--- Singular/pyobject_setup.cc.orig 2011-02-10 19:15:30.000000000 +0100 ++++ Singular/pyobject_setup.cc 2011-08-24 17:23:55.000000000 +0200 +@@ -12,6 +12,7 @@ + **/ + //***************************************************************************** + ++#include <Python.h> + #include <Singular/mod2.h> + #include <kernel/febase.h> + #include "static.h" diff --git a/sci-mathematics/singular/files/singular-3.1.3.3-Minor.h.patch b/sci-mathematics/singular/files/singular-3.1.3.3-Minor.h.patch new file mode 100644 index 000000000000..1d03e61ae308 --- /dev/null +++ b/sci-mathematics/singular/files/singular-3.1.3.3-Minor.h.patch @@ -0,0 +1,10 @@ +--- src/Singular/Minor.h 2010-02-02 08:22:24.000000000 -0500 ++++ patches/Minor.h 2011-06-28 13:26:01.000000000 -0400 +@@ -2,6 +2,7 @@ + #define MINOR_H + + #include <assert.h> ++#include <time.h> + #include <iostream> + #include <string> + diff --git a/sci-mathematics/singular/files/singular-3.1.3.3-install_name.patch b/sci-mathematics/singular/files/singular-3.1.3.3-install_name.patch new file mode 100644 index 000000000000..6a7826c390f6 --- /dev/null +++ b/sci-mathematics/singular/files/singular-3.1.3.3-install_name.patch @@ -0,0 +1,23 @@ +--- kernel/Makefile.in.orig 2011-10-13 23:36:54.000000000 +0200 ++++ kernel/Makefile.in 2011-10-13 23:37:46.000000000 +0200 +@@ -267,7 +267,7 @@ + -rm -f p_Procs_Dynamic p_Procs_Dynamic.exe + + p_Procs_%.so: p_Procs_Lib_%.dl_o +- $(LD) ${SLDFLAGS} -o $@ $^ ++ $(LD) ${SLDFLAGS} -install_name @GENTOO_PORTAGE_EPREFIX@/usr/lib/singular/$@ -o $@ $^ + + ## + ## install targets + +--- Singular/Makefile.in.orig 2011-10-14 23:59:07.000000000 +0200 ++++ Singular/Makefile.in 2011-10-14 23:58:34.000000000 +0200 +@@ -492,7 +492,7 @@ + $(LD) ${SLDFLAGS} -o $@ $^ -L${libdir} ${MP_LIBS} ${GLIBC_DYN_FIX} + + dbmsr.so: $(DBMSR_SOURCES:.cc=.dl_o) +- $(LD) ${SLDFLAGS} -o $@ $^ ${GLIBC_DYN_FIX} ++ $(LD) ${SLDFLAGS} -install_name @GENTOO_PORTAGE_EPREFIX@/usr/lib/singular/$@ -o $@ $^ ${GLIBC_DYN_FIX} + + # dynamic module for python bject support + pyobject.${MODULE_SUFFIX}: pyobject.dl_o diff --git a/sci-mathematics/singular/files/singular-3.1.6-factory_template_instantiation.patch b/sci-mathematics/singular/files/singular-3.1.6-factory_template_instantiation.patch new file mode 100644 index 000000000000..edf764a758eb --- /dev/null +++ b/sci-mathematics/singular/files/singular-3.1.6-factory_template_instantiation.patch @@ -0,0 +1,26 @@ +diff --git a/libfac/factor/tmpl_inst.cc b/libfac/factor/tmpl_inst.cc +index bda287a..2f5ba49 100644 +Index: libfac/factor/tmpl_inst.cc +=================================================================== +--- a/libfac/factor/tmpl_inst.cc ++++ b/libfac/factor/tmpl_inst.cc +@@ -3,7 +3,7 @@ + //////////////////////////////////////////////////////////// + + +-//#include <templates/ftmpl_array.cc> ++#include <factory/templates/ftmpl_array.cc> + //#include <templates/ftmpl_factor.cc> + #include <templates/ftmpl_list.h> + #include <factory/templates/ftmpl_list.cc> +@@ -75,8 +75,8 @@ template OSTREAM & operator << ( OSTREAM &, const List<Variable> & ); + template OSTREAM & operator << ( OSTREAM &, const Array<int> & ); + #endif + +-template class Array<int>; +-template class Array<Variable>; ++//template class Array<int>; ++//template class Array<Variable>; + //template class Array<REvaluation>; + + // for database diff --git a/sci-mathematics/singular/files/singular-3.1.6-ntl6compat.patch b/sci-mathematics/singular/files/singular-3.1.6-ntl6compat.patch new file mode 100644 index 000000000000..b0330ccdfc86 --- /dev/null +++ b/sci-mathematics/singular/files/singular-3.1.6-ntl6compat.patch @@ -0,0 +1,44 @@ +diff --git a/Singular/claptmpl.cc b/Singular/claptmpl.cc +index 0fa6109..553afa5 100644 +Index: Singular/claptmpl.cc +=================================================================== +--- a/Singular/claptmpl.cc ++++ b/Singular/claptmpl.cc +@@ -123,3 +123,37 @@ template class std::list<PolyMinorValue>; + template class Cache<MinorKey, IntMinorValue>; + template class Cache<MinorKey, PolyMinorValue>; + ++#ifdef HAVE_NTL ++#include<NTL/version.h> ++#if NTL_MAJOR_VERSION == 6 ++ ++#include<NTL/tools.h> ++#include<NTL/lzz_pE.h> ++#include<NTL/lzz_pEX.h> ++#include<NTL/lzz_p.h> ++#include<NTL/vector.h> ++#include<NTL/pair.h> ++#include<NTL/GF2X.h> ++#include<NTL/GF2EX.h> ++#include<NTL/ZZ.h> ++#include<NTL/ZZX.h> ++#include<NTL/ZZ_pX.h> ++#ifdef NTL_CLIENT // in <NTL/tools.h>: using of name space NTL ++NTL_CLIENT ++#endif ++template class Vec<zz_p>; ++template class Vec<zz_pE>; ++template class Mat<zz_p>; ++template class Mat<zz_pE>; ++template class Mat<ZZ>; ++template class Vec<Pair<zz_pEX, long> >; ++template class Vec<Pair<GF2EX, long> >; ++template class Vec<Pair<ZZX, long> >; ++template class Vec<Pair<ZZ_pX, long> >; ++template class Vec<Pair<GF2X, long> >; ++template void swap<zz_pE>(Vec<zz_pE>&, Vec<zz_pE>&); ++template long operator==<zz_p>(Vec<zz_p> const&, Vec<zz_p> const&); ++template Vec<Pair<zz_pX, long> >& Vec<Pair<zz_pX, long> >::operator=(const Vec<Pair<zz_pX, long> >&); ++#endif ++ ++#endif diff --git a/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch b/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch new file mode 100644 index 000000000000..87b44234af5f --- /dev/null +++ b/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch @@ -0,0 +1,12 @@ +diff -U 3 -dHrN singular-4.0.0.orig/omalloc/configure.ac singular-4.0.0/omalloc/configure.ac +--- singular-4.0.0.orig/omalloc/configure.ac 2014-03-06 18:07:49.000000000 +0100 ++++ singular-4.0.0/omalloc/configure.ac 2014-05-09 15:41:19.755097185 +0200 +@@ -117,7 +117,7 @@ + dnl check for programs + dnl + AC_CHECK_PROG(AR, ar, ar, :) +-if test "$ac_cv_prog_AR" != ar; then ++if test "$ac_cv_prog_AR" = no; then + AC_MSG_ERROR(*** ar program not found) + fi + AC_CHECK_PROGS(PERL, perl, "no") diff --git a/sci-mathematics/singular/files/singular-4.0.2-ntl8-compat.patch b/sci-mathematics/singular/files/singular-4.0.2-ntl8-compat.patch new file mode 100644 index 000000000000..d3e6b77a28e9 --- /dev/null +++ b/sci-mathematics/singular/files/singular-4.0.2-ntl8-compat.patch @@ -0,0 +1,38 @@ +diff --git a/factory/NTLconvert.cc b/factory/NTLconvert.cc +index 41ce9b2..e32093d 100644 +--- a/factory/NTLconvert.cc ++++ b/factory/NTLconvert.cc +@@ -30,6 +30,7 @@ + #include <NTL/GF2EXFactoring.h> + #include <NTL/tools.h> + #include <NTL/mat_ZZ.h> ++#include <NTL/version.h> + #include "int_int.h" + #include <limits.h> + #include "NTLconvert.h" +@@ -500,8 +501,14 @@ convertZZ2CF (const ZZ & a) + return CanonicalForm(coeff_long); + } + else +- { +- long sizeofrep= ((long *) a.rep) [1]; ++ { ++ const long * rep = ++#if NTL_MAJOR_VERSION <= 6 ++ static_cast<long *>( a.rep ); ++#else ++ static_cast<long *>( a.rep.rep ); // what about NTL7? ++#endif ++ long sizeofrep= rep[1]; + bool lessZero= false; + if (sizeofrep < 0) + { +@@ -519,7 +526,7 @@ convertZZ2CF (const ZZ & a) + cf_stringtemp_l= sizeofrep*sizeof(mp_limb_t)*2; + cf_stringtemp= (unsigned char*) Alloc (cf_stringtemp_l); + } +- int cc= mpn_get_str (cf_stringtemp, 16, (mp_limb_t *) (((long *) (a.rep)) + 2), sizeofrep); ++ int cc= mpn_get_str (cf_stringtemp, 16, (mp_limb_t *) ((rep) + 2), sizeofrep); + + char* cf_stringtemp2; + if (lessZero) diff --git a/sci-mathematics/singular/files/singular-4.0.3-fix-destdir.patch b/sci-mathematics/singular/files/singular-4.0.3-fix-destdir.patch new file mode 100644 index 000000000000..caeed33f1fc3 --- /dev/null +++ b/sci-mathematics/singular/files/singular-4.0.3-fix-destdir.patch @@ -0,0 +1,26 @@ +From 7eac42b467723a83a951218be53785411be3dbc4 Mon Sep 17 00:00:00 2001 +From: jgmbenoit <quatermaster@rezozer.net> +Date: Thu, 28 Apr 2016 05:47:53 +0000 +Subject: [PATCH] automake: install-data-local: missing DESTDIR prefix + +--- + Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 32778f7..24dd251 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -17,9 +17,9 @@ dist-hook: + $(srcdir)/git-version-gen $(srcdir)/.tarball-git-version > $(distdir)/.tarball-git-version + + install-data-local: +- -cat ${top_srcdir}/doc/doc.tbz2| (cd $(datadir)/singular;tar jxf -) +- -mkdir $(datadir)/info +- -mv $(datadir)/singular/singular.hlp $(datadir)/info/. ++ -cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar jxf -) ++ -mkdir $(DESTDIR)$(datadir)/info ++ -mv $(DESTDIR)$(datadir)/singular/singular.hlp $(DESTDIR)$(datadir)/info/. + + configheaderdir = ${includedir}/singular + nodist_configheader_HEADERS = singularconfig.h diff --git a/sci-mathematics/singular/files/singular-4.0.3-fix-resources-name.patch b/sci-mathematics/singular/files/singular-4.0.3-fix-resources-name.patch new file mode 100644 index 000000000000..bcda4ced6472 --- /dev/null +++ b/sci-mathematics/singular/files/singular-4.0.3-fix-resources-name.patch @@ -0,0 +1,307 @@ +From a3a6a07858b7e91c4c8a3c8d07e53957a8547af2 Mon Sep 17 00:00:00 2001 +From: Hans Schoenemann <hannes@mathematik.uni-kl.de> +Date: Thu, 1 Sep 2016 10:48:08 +0200 +Subject: [PATCH] change library name: libresources -> libsingular_resources + +--- + Singular/Makefile.am | 4 ++-- + autogen.sh | 1 + + factory/configure.ac | 8 ++++---- + gfanlib/configure.ac | 2 +- + libpolys/configure.ac | 8 ++++---- + m4/options.m4 | 10 +++++----- + resources/Makefile.am | 18 +++++++++--------- + resources/configure.ac | 6 +++--- + resources/feFopen.cc | 2 +- + resources/feResource.cc | 2 +- + resources/omFindExec.c | 2 +- + resources/resources.pc.in | 17 ----------------- + resources/singular_resources.pc.in | 17 +++++++++++++++++ + 13 files changed, 49 insertions(+), 48 deletions(-) + delete mode 100644 resources/resources.pc.in + create mode 100644 resources/singular_resources.pc.in + +diff --git a/Singular/Makefile.am b/Singular/Makefile.am +index e2bcc23..be84a08 100644 +--- a/Singular/Makefile.am ++++ b/Singular/Makefile.am +@@ -176,7 +176,7 @@ ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DESINGULAR -DPROTO + # ESingular_LDFLAGS = -static ${AM_LDFLAGS} + ESingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \ + ${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \ +-${top_builddir}/resources/libresources.la ++${top_builddir}/resources/libsingular_resources.la + + + ESingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptES.inc feOpt.cc +@@ -186,7 +186,7 @@ TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR -DPROTO + # TSingular_LDFLAGS = -static ${AM_LDFLAGS} + TSingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \ + ${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \ +-${top_builddir}/resources/libresources.la ++${top_builddir}/resources/libsingular_resources.la + + TSingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptTS.inc feOpt.cc + # utils.cc utils.h +diff --git a/autogen.sh b/autogen.sh +index d027997..0d09c08 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -4,6 +4,7 @@ cd `dirname "$0"` + + # -d --warnings=all + autoreconf -v -f -i ++find . -name configure -exec sed -i "s/-g -O2/-g/g" {} \; -print + + cd - + +diff --git a/factory/configure.ac b/factory/configure.ac +index 7ea255b..a9caf73 100644 +--- a/factory/configure.ac ++++ b/factory/configure.ac +@@ -120,10 +120,10 @@ AM_CONDITIONAL( + [WITH_PARSER_FOR_CANONICAL_FORM], + [test "x$enable_streamio" = xyes]) + +-AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libresources] ) +-AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libresources] ) ++AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libsingular_resources] ) ++AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libsingular_resources] ) + +-AC_MSG_CHECKING(whether libresources should be used) ++AC_MSG_CHECKING(whether libsingular_resources should be used) + if test "x$with_Singular" = xyes; + then + AC_MSG_RESULT(yes) +@@ -134,7 +134,7 @@ then + AC_MSG_CHECKING([ RESOURCES_LIBS?..]) + AC_MSG_RESULT(${RESOURCES_LIBS:-unset}) + +- PKG_REQUIRE="$PKG_REQUIRE resources" ++ PKG_REQUIRE="$PKG_REQUIRE singular_resources" + AC_SUBST(PKG_REQUIRE) + else + AC_MSG_RESULT(no) +diff --git a/gfanlib/configure.ac b/gfanlib/configure.ac +index 015134c..d3d2cd7 100644 +--- a/gfanlib/configure.ac ++++ b/gfanlib/configure.ac +@@ -2,7 +2,7 @@ + # Process this file with autoconf to produce a configure script. + + AC_PREREQ([2.63]) +-AC_INIT([libgfan], [0.1], [ren@mathematik.uni-kl.de]) ++AC_INIT([libgfan], [0.6], [ren@mathematik.uni-kl.de]) + AC_CONFIG_MACRO_DIR([../m4]) + AC_CONFIG_AUX_DIR([../build-aux]) + AC_CONFIG_SRCDIR([gfanlib.h]) +diff --git a/libpolys/configure.ac b/libpolys/configure.ac +index 049e44d..4b2f1ae 100644 +--- a/libpolys/configure.ac ++++ b/libpolys/configure.ac +@@ -90,10 +90,10 @@ SING_CHECK_OMALLOC() + + ENABLE_RESOURCES="yes" + +-AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libresources] ) +-AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libresources] ) ++AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libsingular_resources] ) ++AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libsingular_resources] ) + +-AC_MSG_CHECKING(whether libresources should be used) ++AC_MSG_CHECKING(whether libsingular_resources should be used) + + if test "x$ENABLE_RESOURCES" = xyes; + then +@@ -105,7 +105,7 @@ then + AC_MSG_CHECKING([ RESOURCES_LIBS?..]) + AC_MSG_RESULT(${RESOURCES_LIBS:-unset}) + +- PKG_REQUIRE="$PKG_REQUIRE resources" ++ PKG_REQUIRE="$PKG_REQUIRE singular_resources" + AC_SUBST(PKG_REQUIRE) + else + AC_MSG_RESULT(no) +diff --git a/m4/options.m4 b/m4/options.m4 +index 31b86e4..066dc4d 100644 +--- a/m4/options.m4 ++++ b/m4/options.m4 +@@ -150,19 +150,19 @@ AC_DEFUN([SING_USE_OMALLOC], + + AC_DEFUN([SING_USE_RESOURCES], + [ +- AC_ARG_ENABLE(resources, +- [AS_HELP_STRING([--disable-resources], [do NOT use libresources within the factory])], ++ AC_ARG_ENABLE(singular_resources, ++ [AS_HELP_STRING([--disable-singular_resources], [do NOT use libsingular_resources within the factory])], + [if test "x$enableval" = "xyes"; then + ENABLE_RESOURCES=yes + fi], + ENABLE_RESOURCES=yes) + +- AC_MSG_CHECKING(whether to use libresources in factory and co.) ++ AC_MSG_CHECKING(whether to use libsingular_resources in factory and co.) + if test "x$ENABLE_RESOURCES" = xyes; then + AC_MSG_RESULT(yes) + RESOURCES_INCLUDES="-I$ac_abs_top_srcdir " + +- RESOURCES_LIBS="$ac_abs_top_builddir/resources/libresources.la" ++ RESOURCES_LIBS="$ac_abs_top_builddir/resources/libsingular_resources.la" + + AC_SUBST(RESOURCES_INCLUDES) + AC_SUBST(RESOURCES_LIBS) +@@ -171,7 +171,7 @@ AC_DEFUN([SING_USE_RESOURCES], + + ac_configure_args="$ac_configure_args $ENABLE_ARG" + +- PKG_REQUIRE="$PKG_REQUIRE resources" ++ PKG_REQUIRE="$PKG_REQUIRE singular_resources" + AC_SUBST(PKG_REQUIRE) + else + AC_MSG_RESULT(no) +diff --git a/resources/Makefile.am b/resources/Makefile.am +index fa69ccc..934175b 100644 +--- a/resources/Makefile.am ++++ b/resources/Makefile.am +@@ -1,24 +1,24 @@ + ACLOCAL_AMFLAGS = -I ../m4 + +-libresources_LTLIBRARIES = libresources.la ++libsingular_resources_LTLIBRARIES = libsingular_resources.la + +-libresourcesdir = $(libdir) ++libsingular_resourcesdir = $(libdir) + + + AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} + + + SOURCES = omFindExec.c feResource.cc feFopen.cc +-libresources_la_SOURCES = $(SOURCES) ++libsingular_resources_la_SOURCES = $(SOURCES) + +-libresources_la_LDFLAGS = -release ${PACKAGE_VERSION} ++libsingular_resources_la_LDFLAGS = -release ${PACKAGE_VERSION} + +-libresources_includedir =$(includedir)/resources ++libsingular_resources_includedir =$(includedir)/resources + +-libresources_include_HEADERS = omFindExec.h feResource.h feFopen.h ++libsingular_resources_include_HEADERS = omFindExec.h feResource.h feFopen.h + +-nodist_libresources_include_HEADERS = resourcesconfig.h +-DISTCLEANFILES = $(nodist_libresources_include_HEADERS) ++nodist_libsingular_resources_include_HEADERS = singular_resourcesconfig.h ++DISTCLEANFILES = $(nodist_libsingular_resources_include_HEADERS) + + pkgconfigdir = $(libdir)/pkgconfig +-pkgconfig_DATA = resources.pc ++pkgconfig_DATA = singular_resources.pc +diff --git a/resources/configure.ac b/resources/configure.ac +index bc5f294..212a1d5 100644 +--- a/resources/configure.ac ++++ b/resources/configure.ac +@@ -1,4 +1,4 @@ +-AC_INIT([resources], [4.0.3]) ++AC_INIT([singular_resources], [4.0.3]) + + AC_CONFIG_MACRO_DIR([../m4]) + AC_CONFIG_AUX_DIR([../build-aux]) +@@ -14,7 +14,7 @@ dnl Check if build env is sane + AM_SANITY_CHECK + + # Add pre'prefixed config +-AX_PREFIX_CONFIG_H([resourcesconfig.h],[],[_config.h]) ++AX_PREFIX_CONFIG_H([singular_resourcesconfig.h],[],[_config.h]) + + SING_RESET_FLAGS() + SING_CHECK_SET_ARGS() +@@ -70,5 +70,5 @@ AX_RECURSIVE_EVAL([[$]datadir], [config_datadir]) + AX_NORMALIZE_PATH([config_datadir],['/']) + AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir]) + +-AC_CONFIG_FILES([resources.pc Makefile]) ++AC_CONFIG_FILES([singular_resources.pc Makefile]) + AC_OUTPUT +diff --git a/resources/feFopen.cc b/resources/feFopen.cc +index 98cfd44..10800a0 100644 +--- a/resources/feFopen.cc ++++ b/resources/feFopen.cc +@@ -1,4 +1,4 @@ +-#include "resourcesconfig.h" ++#include "singular_resourcesconfig.h" + #include "feResource.h" + #include "feFopen.h" + +diff --git a/resources/feResource.cc b/resources/feResource.cc +index 49a6855..a3accf9 100644 +--- a/resources/feResource.cc ++++ b/resources/feResource.cc +@@ -5,7 +5,7 @@ + * ABSTRACT: management of resources + */ + +-#include "resourcesconfig.h" ++#include "singular_resourcesconfig.h" + #include "feResource.h" + #include "omFindExec.h" + +diff --git a/resources/omFindExec.c b/resources/omFindExec.c +index e79f2c8..1d5852a 100644 +--- a/resources/omFindExec.c ++++ b/resources/omFindExec.c +@@ -6,7 +6,7 @@ + *******************************************************************/ + + +-#include "resourcesconfig.h" ++#include "singular_resourcesconfig.h" + + + #if defined(HAVE_UNISTD_H) && defined(STDC_HEADERS) +diff --git a/resources/resources.pc.in b/resources/resources.pc.in +deleted file mode 100644 +index d040056..0000000 +--- a/resources/resources.pc.in ++++ /dev/null +@@ -1,17 +0,0 @@ +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ +- +-Name: @PACKAGE@ +-Description: The Singular resources manager +-Version: @PACKAGE_VERSION@ +-URL: https://github.com/Singular/Sources/tree/spielwiese/@PACKAGE@ +- +-# Requires: +-# Conflicts: +- +-Cflags: -I${includedir} @SINGULAR_CFLAGS@ +-Libs: -L${libdir} -l@PACKAGE@ +-# Libs.private: +- +diff --git a/resources/singular_resources.pc.in b/resources/singular_resources.pc.in +new file mode 100644 +index 0000000..d040056 +--- /dev/null ++++ b/resources/singular_resources.pc.in +@@ -0,0 +1,17 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: @PACKAGE@ ++Description: The Singular resources manager ++Version: @PACKAGE_VERSION@ ++URL: https://github.com/Singular/Sources/tree/spielwiese/@PACKAGE@ ++ ++# Requires: ++# Conflicts: ++ ++Cflags: -I${includedir} @SINGULAR_CFLAGS@ ++Libs: -L${libdir} -l@PACKAGE@ ++# Libs.private: ++ |