diff --git a/configure.ac b/configure.ac index fe0a3f7906860ca2f5cc98f1864d740132f8f659..895aa8156439d934692b055ed4e252c9c6278dc8 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,7 @@ AC_SUBST([pkglibexecdir]) AC_CONFIG_FILES([Makefile gnu-compat/Makefile alberta_util/Makefile alberta_util/src/Makefile alberta_util/src/alberta_util_inlines.h.in + alberta_util/src/alberta_util.h.in add_ons/Makefile add_ons/libalbas/Makefile add_ons/libalbas/src/Makefile @@ -127,6 +128,18 @@ else alberta_util/src/alberta_util_inlines.h fi]) +AC_CONFIG_COMMANDS([alberta_util/src/alberta_util.h], +[if test -f alberta_util/src/alberta_util.h && \ + cmp alberta_util/src/alberta_util.h alberta_util/src/alberta_util.h.in +then + AC_MSG_NOTICE([alberta_util/src/alberta_util.h is unchanged]) +else + AC_MSG_NOTICE([Creating alberta_util/src/alberta_util.h]) + cp \ + alberta_util/src/alberta_util.h.in \ + alberta_util/src/alberta_util.h +fi]) + # Control of features which may be disabled/enabled as needed AC_ARG_ENABLE([dim-of-world], @@ -587,6 +600,13 @@ AM_CONDITIONAL(GEOMVIEW, true) # # Malloc debugging # +ALBERTA_ENABLE_FLAG([allocrecord], + [use some hand-made malloc debugger, which logs allocations in a round-robin + data-base. The optized liberaries will still use the default allocators.], + 0, + [ALBERTA_ALLOC_RECORD], + [DEFINE SUBST COND]) + ALBERTA_ENABLE_FLAG([efence], [use the malloc debugger "Electric Fence" for all allocations for the DEBUG libraries, the optimized libraries will still use the default allocators.], @@ -609,14 +629,14 @@ fi # # OpenMP # -ALBERTA_OPENMP -if test -n "${OPENMP_CFLAGS}"; then - ALBERTA_OPTIMIZE_CFLAGS="${ALBERTA_OPTIMIZE_CFLAGS} ${OPENMP_CFLAGS}" - ALBERTA_DEBUG_CFLAGS="${ALBERTA_DEBUG_CFLAGS} ${OPENMP_CFLAGS}" - ALBERTA_PROFILE_CFLAGS="${ALBERTA_PROFILE_CFLAGS} ${OPENMP_CFLAGS}" - ALBERTA_FFLAGS="${ALBERTA_FFLAGS} ${OPENMP_CFLAGS}" - LDFLAGS="${LDFLAGS} `echo ${OPENMP_CFLAGS}|sed -e 's/-/-XCClinker -/g'`" -fi +dnl ALBERTA_OPENMP +dnl if test -n "${OPENMP_CFLAGS}"; then +dnl ALBERTA_OPTIMIZE_CFLAGS="${ALBERTA_OPTIMIZE_CFLAGS} ${OPENMP_CFLAGS}" +dnl ALBERTA_DEBUG_CFLAGS="${ALBERTA_DEBUG_CFLAGS} ${OPENMP_CFLAGS}" +dnl ALBERTA_PROFILE_CFLAGS="${ALBERTA_PROFILE_CFLAGS} ${OPENMP_CFLAGS}" +dnl ALBERTA_FFLAGS="${ALBERTA_FFLAGS} ${OPENMP_CFLAGS}" +dnl LDFLAGS="${LDFLAGS} `echo ${OPENMP_CFLAGS}|sed -e 's/-/-XCClinker -/g'`" +dnl fi # # Install libtool.alberta for shared libraries?