Changeset 1122b2 in git for omalloc/configure.in

Timestamp:

Mar 20, 2009, 3:39:14 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

85a3423ebc096b98588fc3cb37d019fd3033d269

Parents:

2e5f59996ea62adb5223bd59681c6fe2d5fcfa86

Message:

*hannes: default: malloc=system


git-svn-id: file:///usr/local/Singular/svn/trunk@11580 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• omalloc/configure.in (modified) (3 diffs)

omalloc/configure.in

@@ -4 +4 @@
 dnl Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
 dnl Created: 11/99
-dnl Version: $Id: configure.in,v 1.16 2005-11-08 08:49:16 bricken Exp $
+dnl Version: $Id: configure.in,v 1.17 2009-03-20 14:39:14 Singular Exp $
 dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
 
 AC_INIT(om_Alloc.c)
 
-VERSION=0.9.5
+VERSION=0.9.6
 AC_SUBST(VERSION)
 
@@ -26 +26 @@
   malloc,
   [ --with-malloc=system|dlmalloc|gmalloc|pmalloc|external
-                    which malloc to use, default: dlmalloc ])
+                    which malloc to use, default: malloc ])
 AC_ARG_WITH(
   external-malloc_h,
@@ -259 +259 @@
   OM_MALLOC_SOURCE=$with_external_malloc_c
   AC_DEFINE(OMALLOC_USES_MALLOC)
-else
+elif test "${with_malloc}" = dlmalloc; then
   with_malloc=dlmalloc
   OM_MALLOC_HEADER=dlmalloc.h
   OM_MALLOC_SOURCE=dlmalloc.c
+else
+  OM_MALLOC_HEADER=omMallocSystem.h
+  AC_DEFINE(OMALLOC_USES_MALLOC)
+  if test "${with_provide_malloc}" = yes || test "${with_provide_malloc}" = debug; then
+    AC_MSG_ERROR("can not provide malloc for --with-malloc=system")
+  fi
 fi
 AC_MSG_RESULT($with_malloc)