Changeset eeae6e3 in git

Timestamp:

Sep 12, 2011, 1:57:48 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

d6039dfbb647e2775d91661b9541f7600bf05058

Parents:

4c96a0cd273d9c6ff0433025794e8092191e18e7

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-12 13:57:48+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:43+01:00

Message:

FIX: the use of "om_sing_opt_show_mem" in Singular/misc_ip.cc now depends on whether "--with-external-config_h=../Singular/omSingularConfig.h" was used, which is thus not necessary for building Singular anymore
CHG: minor cleanup in configure.ac

Files:

• Singular/misc_ip.cc (modified) (1 diff)
• configure.ac (modified) (1 diff)

Singular/misc_ip.cc

@@ -677 +677 @@
   } while (v!=NULL);
    
-  // set global variable to show memory usage
+#ifdef OM_SINGULAR_CONFIG_H
+   // set global variable to show memory usage
   extern int om_sing_opt_show_mem;
   if (BVERBOSE(V_SHOW_MEM)) om_sing_opt_show_mem = 1;
   else om_sing_opt_show_mem = 0;
+#endif
    
   return FALSE;

configure.ac

@@ -16 +16 @@
 
 
-#if test x$ac_configure_args != x; then
-#  old_ac_configure_args="$ac_configure_args"
-#  ac_configure_args="$ac_configure_args --with-external-config_h=../Singular/omSingularConfig.h"
-#else
-#  old_ac_configure_args=""
-#fi
-
-ac_configure_args="$ac_configure_args --with-external-config_h=../Singular/omSingularConfig.h"
+### the following is needed due to the use of om_sing_opt_show_mem in misc_ip.cc...
+#ac_configure_args="$ac_configure_args --with-external-config_h=../Singular/omSingularConfig.h"
 
 AC_CONFIG_SUBDIRS(omalloc)
-
-# ac_configure_args="$old_ac_configure_args"
 
 if test x$ENABLE_FACTORY = xyes; then