Changeset 97b5d5 in git

Timestamp:

Nov 23, 2010, 4:45:24 PM (13 years ago)

Author:

Bradford Hovinen <hovinen@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

9ddc41b14e688827f10b1d157e5f7aff8521d1b0

Parents:

deca086fe821db633c79d0199acc9007b1a2096d

git-author:

Bradford Hovinen <hovinen@gmail.com>2010-11-23 16:45:24+01:00

git-committer:

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

Message:

Fix build-process:
 * Add templates to AC_DEFINES in configure.ac so that autoheader works
 * Remove omConfig.h.in since that is now automatically generated by autoheader
 * Add -I${top_srcdir}/.. -I${top_builddir}/.. to INCLUDES according to header-file-scheme
 * Add BUILT_SOURCES with sources built at compile-time

Location:

omalloc

Files:

• Makefile.am (modified) (2 diffs)
• configure.ac (modified) (27 diffs)
• omConfig.h.in (deleted)

omalloc/Makefile.am

@@ -20 +20 @@
 omalloc_provide.c omAllocFunc.c
 
+INCLUDES=-I${top_srcdir}/.. -I${top_builddir}/..
+
 libomalloc_a_SOURCES=$(SOURCES) $(noinst_HEADERS)
 libomalloc_debug_a_SOURCES=$(SOURCES) $(noinst_HEADERS)
@@ -27 +29 @@
 
 libomalloc_a_CPPFLAGS= -DOM_NDEBUG
+
+BUILT_SOURCES = omalloc.h omTables.inc
 
 omalloc.h: $(noinst_HEADERS) omTables.h

omalloc/configure.ac

@@ -103 +103 @@
 AC_PROG_LN_S
 AC_PROG_INSTALL
+AM_PROG_CC_C_O
 AC_C_CONST
 AC_C_INLINE
@@ -144 +145 @@
 AC_CHECK_PROG(ADDR2LINE, addr2line, addr2line, no)
 if test "$ac_cv_prog_ADDR2LINE" = addr2line; then
-  AC_DEFINE_UNQUOTED(OM_PROG_ADDR2LINE, "$ac_cv_prog_ADDR2LINE")
+  AC_DEFINE_UNQUOTED(OM_PROG_ADDR2LINE, "$ac_cv_prog_ADDR2LINE", "Name of addr2line")
 fi
 
@@ -199 +200 @@
 AC_MSG_RESULT($ac_cv_pagesize)
 if test "$ac_cv_pagesize" = 4096 || test "$ac_cv_pagesize" = 8192; then
-  AC_DEFINE_UNQUOTED(SIZEOF_SYSTEM_PAGE, $ac_cv_pagesize)
+  AC_DEFINE_UNQUOTED(SIZEOF_SYSTEM_PAGE, $ac_cv_pagesize, "Page-size of the build-system")
 else
 AC_MSG_ERROR(need sytem page to be of size 4096 or 8192, but is $ac_cv_pagesize)
@@ -221 +222 @@
 AC_MSG_RESULT($ac_cv_working_mmap)
 if test "$ac_cv_working_mmap" = yes; then
-  AC_DEFINE(HAVE_WORKING_MMAP)
+  AC_DEFINE(HAVE_WORKING_MMAP,1,"Whether we have a working mmap")
 fi
 fi
@@ -247 +248 @@
 AC_MSG_CHECKING(for external config files)
 if test "${with_external_config_h+set}" = set; then
-    AC_DEFINE(OM_HAVE_EXTERNAL_CONFIG_H)
+    AC_DEFINE(OM_HAVE_EXTERNAL_CONFIG_H,1,"Whether we have external config.h")
     EXTERNAL_CONFIG_HEADER=${with_external_config_h}
     rm -f omExternalConfig.h
@@ -253 +254 @@
 fi
 if test "${with_external_config_c+set}" = set; then
-    AC_DEFINE(OM_HAVE_EXTERNAL_CONFIG_C)
+    AC_DEFINE(OM_HAVE_EXTERNAL_CONFIG_C,1,"Wether we have an external config.c")
     EXTERNAL_CONFIG_SOURCE=${with_external_config_c}
 fi
@@ -270 +271 @@
 if test "${with_malloc}" = system; then
   OM_MALLOC_HEADER=omMallocSystem.h
-  AC_DEFINE(OMALLOC_USES_MALLOC)
+  AC_DEFINE(OMALLOC_USES_MALLOC,1,"Whether 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")
@@ -289 +290 @@
   OM_MALLOC_HEADER=$with_external_malloc_h
   OM_MALLOC_SOURCE=$with_external_malloc_c
-  AC_DEFINE(OMALLOC_USES_MALLOC)
+  AC_DEFINE(OMALLOC_USES_MALLOC,1,"Whether omalloc uses malloc ()")
 elif test "${with_malloc}" = dlmalloc; then
   with_malloc=dlmalloc
@@ -296 +297 @@
 else
   OM_MALLOC_HEADER=omMallocSystem.h
-  AC_DEFINE(OMALLOC_USES_MALLOC)
+  AC_DEFINE(OMALLOC_USES_MALLOC,1,"Whether 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")
@@ -306 +307 @@
 AC_SUBST(OM_MALLOC_SOURCE)
 if test "${OM_MALLOC_SOURCE+set}" = set; then
-  AC_DEFINE(OM_HAVE_MALLOC_SOURCE)
+  AC_DEFINE(OM_HAVE_MALLOC_SOURCE,1,"Whether we have the source for malloc ()")
 fi
 
@@ -336 +337 @@
 fi
 if test "$ac_cv_malloc_sizeof_addr" != no; then
-AC_DEFINE(OM_MALLOC_PROVIDES_SIZEOF_ADDR)
+AC_DEFINE(OM_MALLOC_PROVIDES_SIZEOF_ADDR,1,"Whether malloc provides SIZEOF_ADDR")
 fi
 
 if test "${with_provide_malloc}" = malloc; then
-   AC_DEFINE(OM_PROVIDE_MALLOC, 3)
+   AC_DEFINE(OM_PROVIDE_MALLOC, 3, "Malloc type 3")
 elif test "${with_provide_malloc}" = debug; then
-   AC_DEFINE(OM_PROVIDE_MALLOC, 2)
+   AC_DEFINE(OM_PROVIDE_MALLOC, 2, "Malloc debug-mode")
 elif test "${with_provide_malloc}" = yes; then
-  AC_DEFINE(OM_PROVIDE_MALLOC, 1)
-else
-  AC_DEFINE(OM_PROVIDE_MALLOC, 0)
+  AC_DEFINE(OM_PROVIDE_MALLOC, 1, "Malloc type 1")
+else
+  AC_DEFINE(OM_PROVIDE_MALLOC, 0, "No malloc")
 fi
 
@@ -387 +388 @@
   if test "${ac_cv_working_mmap}" = yes; then
     with_valloc=mmap
-    AC_DEFINE(OM_HAVE_VALLOC_MMAP)
+    AC_DEFINE(OM_HAVE_VALLOC_MMAP,1,"Have valloc")
   else
     with_valloc=malloc
@@ -394 +395 @@
 if test "${with_valloc}" = malloc; then
   if test "${ac_cv_working_valloc}" != no; then
-    AC_DEFINE(OM_HAVE_VALLOC_MALLOC)
+    AC_DEFINE(OM_HAVE_VALLOC_MALLOC,1,"Have valloc")
   else
     with_valloc=emulate
@@ -406 +407 @@
 AC_MSG_CHECKING(whether to emulate omalloc)
 if test "${with_emulate_omalloc}" = yes; then
-  AC_DEFINE(OM_EMULATE_OMALLOC)
+  AC_DEFINE(OM_EMULATE_OMALLOC,1,"Emulate omalloc")
   AC_MSG_RESULT(yes)
 else
@@ -418 +419 @@
 if test "$with_align" = 8 || test "$ac_cv_sizeof_long" = 8; then
   ac_cv_align=8
-  AC_DEFINE(OM_ALIGN_8)
+  AC_DEFINE(OM_ALIGN_8,1,"Align to 8 bytes")
 else
 if test "$ac_cv_align_need_strict" = "yes" || test "$with_align" = "strict"; then
-  AC_DEFINE(OM_ALIGNMENT_NEEDS_WORK)
+  AC_DEFINE(OM_ALIGNMENT_NEEDS_WORK,1,"Whether alignment needs work")
   ac_cv_align="strict"
 else
@@ -435 +436 @@
 if test "$with_dense_bins" = yes; then
 AC_MSG_RESULT(yes)
-AC_DEFINE(OM_HAVE_DENSE_BIN_DISTRIBUTION)
+AC_DEFINE(OM_HAVE_DENSE_BIN_DISTRIBUTION,1,"Whether we have dense bins")
 else
 AC_MSG_RESULT(no)
@@ -448 +449 @@
 else
 AC_MSG_RESULT(yes)
-AC_DEFINE(OM_NDEBUG)
+AC_DEFINE(OM_NDEBUG,1,"Disable debug")
 with_track=no
 fi
@@ -455 +456 @@
 if test "$with_track" != no; then
 AC_MSG_RESULT(yes)
-AC_DEFINE(OM_HAVE_TRACK)
+AC_DEFINE(OM_HAVE_TRACK,1,"Have track")
 else
 AC_MSG_RESULT(no)
@@ -463 +464 @@
 if test "$with_internal_debug" = yes; then
 AC_MSG_RESULT(yes)
-AC_DEFINE(OM_INTERNAL_DEBUG)
+AC_DEFINE(OM_INTERNAL_DEBUG,1,"Internal debug")
 with_inline=no
 else
@@ -471 +472 @@
 AC_MSG_CHECKING(whether to inline)
 if test "$ac_cv_c_inline" != no && test "$with_inline" != no; then
-  AC_DEFINE_UNQUOTED(OM_INLINE, static $ac_cv_c_inline)
-  AC_DEFINE_UNQUOTED(OM_INLINE_DECL, static $ac_cv_c_inline)
-  AC_DEFINE_UNQUOTED(OM_INLINE_IMPL, static $ac_cv_c_inline)
-  AC_DEFINE_UNQUOTED(OM_INLINE_LOCAL, static $ac_cv_c_inline)
+  AC_DEFINE_UNQUOTED(OM_INLINE, static $ac_cv_c_inline, "inline-declaration")
+  AC_DEFINE_UNQUOTED(OM_INLINE_DECL, static $ac_cv_c_inline, "inline-declaration")
+  AC_DEFINE_UNQUOTED(OM_INLINE_IMPL, static $ac_cv_c_inline, "inline-declaration")
+  AC_DEFINE_UNQUOTED(OM_INLINE_LOCAL, static $ac_cv_c_inline, "inline-declaration")
   AC_MSG_RESULT(yes)
 else
-  AC_DEFINE_UNQUOTED(OM_INLINE_DECL, extern)
-  AC_DEFINE_UNQUOTED(OM_INLINE_IMPL,)
-  AC_DEFINE_UNQUOTED(OM_INLINE_LOCAL, static)
+  AC_DEFINE_UNQUOTED(OM_INLINE_DECL, extern, "inline-declaration")
+  AC_DEFINE_UNQUOTED(OM_INLINE_IMPL,, "inline-declaration")
+  AC_DEFINE_UNQUOTED(OM_INLINE_LOCAL, static, "inline-declaration")
   AC_MSG_RESULT(no)
 fi
@@ -505 +506 @@
 AC_MSG_RESULT($ac_cv_get_return_addr_works)
 if test "$ac_cv_get_return_addr_works" = yes; then
-AC_DEFINE(OM_GET_RETURN_ADDR_WORKS)
+AC_DEFINE(OM_GET_RETURN_ADDR_WORKS,1, "Whether get return address works")
 fi
 
@@ -532 +533 @@
 AC_MSG_RESULT($ac_cv_get_backtrace_works)
 if test "$ac_cv_get_backtrace_works" = yes; then
-AC_DEFINE(OM_GET_BACKTRACE_WORKS)
+AC_DEFINE(OM_GET_BACKTRACE_WORKS,1,"Whether omInitGetBackTrace () works")
 fi
 
@@ -574 +575 @@
   with_track_return=no
 else
-  AC_DEFINE(OM_TRACK_RETURN)
+  AC_DEFINE(OM_TRACK_RETURN,1,"Whether to track return")
   with_track_return=yes
 fi
@@ -592 +593 @@
 AC_MSG_RESULT($with_track_fl)
 if test "$with_track_fl" = yes; then
-  AC_DEFINE(OM_TRACK_FILE_LINE)
+  AC_DEFINE(OM_TRACK_FILE_LINE,1,"Whether to track file-line")
 fi
 
@@ -598 +599 @@
 if test "$with_track" != no && test "$ac_cv_get_backtrace_works" = yes && test "$with_track_backtrace" != no && test "$ac_cv_prog_addr2line_works" = yes; then
   with_track_backtrace=yes
-  AC_DEFINE(OM_TRACK_BACKTRACE)
+  AC_DEFINE(OM_TRACK_BACKTRACE,1,"Whether to track backtrace")
 else
   with_track_backtrace=no
@@ -606 +607 @@
 AC_MSG_CHECKING(whether to track custom values)
 if test "$with_track" != no && test "$with_track_custom" = yes; then
-  AC_DEFINE(OM_TRACK_CUSTOM)
+  AC_DEFINE(OM_TRACK_CUSTOM,1,"Enable custom tracking")
 else
   with_track_custom=no
@@ -623 +624 @@
 void *sbrk();
 ,
-AC_DEFINE(Void_t,void),
-AC_DEFINE(Void_t,char),
+AC_DEFINE(Void_t,void,"Type of void"),
+AC_DEFINE(Void_t,char,"Type of void"),
 )
 AC_MSG_RESULT(Void_t)