Changeset 933f32f for configure.ac


Ignore:
Timestamp:
May 24, 2019, 10:19:41 AM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
d908563
Parents:
6a9d4b4 (diff), 292642a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into cleanup-dtors

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r6a9d4b4 r933f32f  
    139139                "debug") ;;
    140140                "nolib") ;;
     141                "profile") ;;
    141142                *)
    142143                        >&2 echo "Configuration must be 'debug', 'nodebug' or 'nolib'"
     
    178179AC_PROG_CC
    179180AM_PROG_AS
    180 AM_PROG_CC_C_O  # deprecated
    181181# These are often not installed and people miss seeing the "no", so stop the configure.
    182182AC_PROG_YACC
     
    186186AC_PROG_LIBTOOL
    187187AC_PROG_INSTALL
    188 AC_PROG_MAKE_SET
    189188
    190189# Checks for libraries.
     
    192191AM_CONDITIONAL([WITH_LIBFIBRE], [test "$HAVE_LIBFIBRE" -eq 1])
    193192
     193AC_CHECK_LIB([profiler], [ProfilingIsEnabledForAllThreads], [HAVE_LIBPROFILER=1], [HAVE_LIBPROFILER=0])
     194AM_CONDITIONAL([WITH_LIBPROFILER], [test "$HAVE_LIBPROFILER" -eq 1])
     195
     196AC_CHECK_LIB([tcmalloc], [malloc], [HAVE_LIBTCMALLOC=1], [HAVE_LIBTCMALLOC=0])
     197AM_CONDITIONAL([WITH_LIBTCMALLOC], [test "$HAVE_LIBTCMALLOC" -eq 1])
     198
    194199# Checks for header files.
    195 AC_FUNC_ALLOCA
    196 AC_CHECK_HEADERS([fenv.h float.h inttypes.h libintl.h limits.h malloc.h stddef.h stdlib.h string.h unistd.h])
     200AC_CHECK_HEADERS([libintl.h malloc.h unistd.h], [], [echo "Error: Missing required header"; exit 1])
    197201
    198202# Checks for typedefs, structures, and compiler characteristics.
    199 AC_HEADER_STDBOOL
    200 AC_C_INLINE
    201 AC_TYPE_INT16_T
    202 AC_TYPE_INT32_T
    203 AC_TYPE_INT8_T
    204 AC_C_RESTRICT
    205 AC_TYPE_SIZE_T
    206 AC_TYPE_UINT16_T
    207 AC_TYPE_UINT32_T
    208 AC_TYPE_UINT8_T
    209 
    210 # Checks for library functions.
    211 AC_CHECK_FUNCS([memset putenv strchr strtol])
     203AC_CHECK_TYPES([_Float32], AC_DEFINE([HAVE_KEYWORDS_FLOATXX], [], [Have keywords _FloatXX.]), [], [[]])
     204
     205# Checks for compiler flags.
     206M4CFA_CHECK_COMPILE_FLAG([-Wcast-function-type], AC_DEFINE([HAVE_CAST_FUNCTION_TYPE], [], [Have compiler warning cast-function-type.]))
    212207
    213208#==============================================================================
     
    223218        benchmark/Makefile
    224219        tests/Makefile
    225         tests/preempt_longrun/Makefile
     220        longrun_tests/Makefile
    226221        tools/Makefile
    227222        tools/prettyprinter/Makefile
Note: See TracChangeset for help on using the changeset viewer.