Changeset 044989 in git

Timestamp:

Jan 10, 2014, 2:51:42 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

89b9eef73c1e69428b33ae8cb73f2cc92253c3b49bf3ee2b60c993fa1cfc2d47f1c2e2a0ae5c34c2

Parents:

2707fd7eac2fec84d7e73fbc434093e31ea9069d3732678c5215bf8158d6a378e61cfc1d2f71329f

Message:

Merge pull request #473 from ederc/sba-fixes

Fixes for SBA

Files:

• configure.ac (modified) (2 diffs)
• factory/configure.ac (modified) (2 diffs)
• gfanlib/configure.ac (modified) (2 diffs)
• kernel/kstd2.cc (modified) (1 diff)
• kernel/kutil.cc (modified) (1 diff)
• libpolys/configure.ac (modified) (3 diffs)
• omalloc/configure.ac (modified) (2 diffs)
• resources/configure.ac (modified) (2 diffs)

configure.ac

@@ -9 +9 @@
 AC_CONFIG_SRCDIR([Singular/tesths.cc])
 
-AC_CONFIG_HEADER([singularconfig.h])
+AC_CONFIG_HEADER([_config.h])
+# Add pre'prefixed config
+AX_PREFIX_CONFIG_H([singularconfig.h],[],[_config.h])
 
 dnl Apparently, this is required for using an AC_CHECK_HEADER within AS_IF(...), at least on Cygwin.
@@ -22 +24 @@
 AM_SANITY_CHECK
 
-# Add pre'prefixed config
-AX_PREFIX_CONFIG_H([singularconfig.h],[],[singularconfig.h])
 
 SING_RESET_FLAGS()

factory/configure.ac

@@ -17 +17 @@
 AC_CONFIG_MACRO_DIR([../m4])
 AC_CONFIG_AUX_DIR([.])
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER([_config.h])
 
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
@@ -26 +26 @@
 
 # Add pre'prefixed config
-AX_PREFIX_CONFIG_H([config.h],[],[config.h])
+AX_PREFIX_CONFIG_H([config.h],[],[_config.h])
 
 #

gfanlib/configure.ac

@@ -6 +6 @@
 AC_CONFIG_MACRO_DIR([../m4])
 AC_CONFIG_SRCDIR([gfanlib.h])
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADER([_config.h])
 
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
@@ -13 +13 @@
 
 # Add pre'prefixed config
-AX_PREFIX_CONFIG_H([config.h],[],[config.h])
+AX_PREFIX_CONFIG_H([config.h],[],[_config.h])
 
 AM_MAINTAINER_MODE([enable])

kernel/kstd2.cc

@@ -2817 +2817 @@
     cc++;
   }
+  for (cc=strat->sl+1; cc<IDELEMS(strat->Shdl); ++cc)
+    strat->Shdl->m[cc]  = NULL;
 //#if 1
 #if DEBUGF5

kernel/kutil.cc

@@ -5163 +5163 @@
   pWrite(sig);
 #endif
-  for(int k = strat->sl; k>start; k--)
+  for(int k = strat->sl; k>=start; k--)
   {
 //#if 1

libpolys/configure.ac

@@ -4 +4 @@
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_SRCDIR([reporter/reporter.h])
-AC_CONFIG_HEADER([libpolysconfig.h misc/auxiliary.h])
+AC_CONFIG_HEADER([_config.h])
 
 AM_MAINTAINER_MODE([enable])
@@ -16 +16 @@
 
 # Add pre'prefixed config
-AX_PREFIX_CONFIG_H([libpolysconfig.h],[],[libpolysconfig.h])
+AX_PREFIX_CONFIG_H([libpolysconfig.h],[],[_config.h])
 
 # - Check for CC and CXX but be careful about CFLAGS.
@@ -122 +122 @@
 AC_CONFIG_FILES([polys/Makefile])
 AC_CONFIG_FILES([tests/Makefile])
-AC_CONFIG_FILES([libpolys-config libpolys.pc])
+AC_CONFIG_FILES([libpolys-config libpolys.pc  misc/auxiliary.h])
 AC_OUTPUT

omalloc/configure.ac

@@ -11 +11 @@
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_SRCDIR(om_Alloc.c)
-AC_CONFIG_HEADER(omConfig.h)
+AC_CONFIG_HEADER([_config.h])
 
 SING_RESET_FLAGS()
@@ -23 +23 @@
 
 # Add pre'prefixed config
-AX_PREFIX_CONFIG_H([omConfig.h],[],[omConfig.h])
+AX_PREFIX_CONFIG_H([omConfig.h],[],[_config.h])
 
 # SING_CHECK_SET_ARGS()

resources/configure.ac

@@ -4 +4 @@
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_SRCDIR([omFindExec.h])
-AC_CONFIG_HEADER([resourcesconfig.h])
+AC_CONFIG_HEADER([_config.h])
 
 AM_MAINTAINER_MODE([enable])
@@ -15 +15 @@
 
 # Add pre'prefixed config
-AX_PREFIX_CONFIG_H([resourcesconfig.h],[],[resourcesconfig.h])
+AX_PREFIX_CONFIG_H([resourcesconfig.h],[],[_config.h])
 
 SING_RESET_FLAGS()