Changeset a2f973 in git for omalloc/configure.ac

Timestamp:

Dec 8, 2010, 4:15:41 PM (13 years ago)

Author:

Mohamed Barakat <mohamed.barakat@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

20b794b84c950b9228e04900a5ccb47c0926cb2e

Parents:

f769719de615ce331ad5f46a18fe1e75de401f68

git-author:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2010-12-08 16:15:41+01:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:57:47+01:00

Message:

- modified and added omMalloc.h (should not be installed)
- configure.ac no longer generates omMalloc.h

File:

• omalloc/configure.ac (modified) (2 diffs)

omalloc/configure.ac

@@ -247 +247 @@
 if test "${with_malloc}" = system; then
   OM_MALLOC_HEADER=omMallocSystem.h
-  AC_DEFINE(OMALLOC_USES_MALLOC,1,"Whether omalloc uses malloc ()")
+  AC_DEFINE(OMALLOC_USES_MALLOC,1,the system allocator is called malloc)
+  AC_DEFINE(OMALLOC_USES_SYSTEM_MALLOC,1,use system malloc as system allocator)
   if test "${with_provide_malloc}" = yes || test "${with_provide_malloc}" = debug; then
     AC_MSG_ERROR("can not provide malloc for --with-malloc=system")
   fi
 elif test "${with_malloc}" = gmalloc; then
+  AC_DEFINE(OMALLOC_USES_GMALLOC,1,use gmalloc as system allocator)
   OM_MALLOC_HEADER=gmalloc.h
   OM_MALLOC_SOURCE=gmalloc.c
 elif test "${with_malloc}" = pmalloc; then
+  AC_DEFINE(OMALLOC_USES_PMALLOC,1,use pmalloc as system allocator)
   OM_MALLOC_HEADER=pmalloc.h
   OM_MALLOC_SOURCE=pmalloc.c
@@ -264 +267 @@
     AC_MSG_ERROR("can not provide malloc for --with_malloc=external")
   fi
+  AC_DEFINE(OMALLOC_USES_EXTERNAL_MALLOC,1,use external malloc as system allocator)
   OM_MALLOC_HEADER=$with_external_malloc_h
   OM_MALLOC_SOURCE=$with_external_malloc_c
-  AC_DEFINE(OMALLOC_USES_MALLOC,1,"Whether omalloc uses malloc ()")
+  AC_DEFINE(OMALLOC_USES_MALLOC,1,the system allocator is called malloc)
 elif test "${with_malloc}" = dlmalloc; then
   with_malloc=dlmalloc
+  AC_DEFINE(OMALLOC_USES_DLMALLOC,1,use dlmalloc as system allocator)
   OM_MALLOC_HEADER=dlmalloc.h
   OM_MALLOC_SOURCE=dlmalloc.c
-else
+else    ## default
   OM_MALLOC_HEADER=omMallocSystem.h
-  AC_DEFINE(OMALLOC_USES_MALLOC,1,"Whether omalloc uses malloc ()")
+  AC_DEFINE(OMALLOC_USES_MALLOC,1,the system allocator is called malloc)
+  AC_DEFINE(OMALLOC_USES_SYSTEM_MALLOC,1,use system malloc as system allocator)
   if test "${with_provide_malloc}" = yes || test "${with_provide_malloc}" = debug; then
     AC_MSG_ERROR("can not provide malloc for --with-malloc=system")