X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=blobdiff_plain;f=folly%2Fconfigure.ac;h=2d5ca29c1e76cf9cef29ceaa001635a14eb5d2c2;hp=4aecd66f3f943b46950459557f5046ec8011df02;hb=46c5dbce6c04234ae0185d3fadb62556c7e7625b;hpb=a595dcb51fd3f23343f6e11438f887f72df1ef31 diff --git a/folly/configure.ac b/folly/configure.ac index 4aecd66f..2d5ca29c 100644 --- a/folly/configure.ac +++ b/folly/configure.ac @@ -28,13 +28,6 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2 nostdinc subdir-objects]) AC_CONFIG_MACRO_DIR([m4]) -AX_CONFIG_FEATURE_DEFAULT_DISABLED -AX_CONFIG_FEATURE( - [deprecated-assoc], - [supports deprecated associative containers (hash_map/hash_set)], - [HAVE_DEPRECATED_ASSOC], - [Define if you want to support deprecated associative containers]) - AC_PROG_INSTALL AM_PROG_LIBTOOL @@ -160,7 +153,7 @@ AM_PATH_PYTHON # Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS([fcntl.h features.h inttypes.h limits.h stdint.h stdlib.h string.h sys/time.h unistd.h mutex.h malloc.h bits/functexcept.h bits/c++config.h]) +AC_CHECK_HEADERS([features.h malloc.h bits/functexcept.h bits/c++config.h]) AC_CHECK_HEADER(double-conversion/double-conversion.h, [], [AC_MSG_ERROR( [Couldn't find double-conversion.h, please download from \ @@ -182,7 +175,6 @@ AC_ARG_WITH([jemalloc], [ ]) # Checks for typedefs, structures, and compiler characteristics. -AC_HEADER_STDBOOL AC_C_CONST AC_C_INLINE AC_TYPE_SIZE_T @@ -210,7 +202,7 @@ static_assert( fi fi -AC_CHECK_TYPES([ptrdiff_t, pthread_spinlock_t]) +AC_CHECK_TYPES([pthread_spinlock_t]) AC_CACHE_CHECK( [for ifunc support], @@ -252,21 +244,6 @@ AC_DEFINE_UNQUOTED( [OVERRIDE], [$override_val], [Define to "override" if the compiler supports C++11 "override"]) -AC_CACHE_CHECK( - [for constexpr strlen], - [folly_cv_func_constexpr_strlen], - [AC_COMPILE_IFELSE( - [AC_LANG_SOURCE[ - #include - static constexpr int val = strlen("foo");]], - [folly_cv_func_constexpr_strlen=yes], - [folly_cv_func_constexpr_strlen=no])]) - -if test "$folly_cv_func_constexpr_strlen" = yes; then - AC_DEFINE([HAVE_CONSTEXPR_STRLEN], [1], - [Define to 1 if strlen(3) is constexpr.]) -fi - AC_CACHE_CHECK( [for libc++], [folly_cv_lib_libcpp], @@ -305,11 +282,16 @@ if test "$folly_cv_lib_libatomic" = no; then [Please install the GNU Atomic library])]) fi +if test "$build_os" = "linux-gnu"; then + AC_HAVE_LIBRARY([dl],[],[AC_MSG_ERROR( + [Folly depends on libdl])]) +fi + AC_CACHE_CHECK( [for liblinux-vdso support], [folly_cv_lib_liblinux_vdso], [AC_RUN_IFELSE( - [AC_LANG_PROGRAM[ + [AC_LANG_SOURCE[ #include int main() { void *h = dlopen("linux-vdso.so.1", RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD); @@ -327,6 +309,8 @@ if test "$folly_cv_lib_liblinux_vdso" = yes; then AC_DEFINE([HAVE_LINUX_VDSO], [1], [Define to 1 if liblinux-vdso is available]) fi +AC_DEFINE([HAVE_PTHREAD], [1], [Define to 1 if pthread is avaliable]) + AC_CACHE_CHECK( [for usable std::is_trivially_copyable], [folly_cv_decl_std_is_trivially_copyable], @@ -542,13 +526,7 @@ AC_DEFINE_UNQUOTED( otherwise define to 0]) # Checks for library functions. -AC_CHECK_FUNCS([getdelim \ - gettimeofday \ - memmove \ - memset \ - pow \ - strerror \ - malloc_size \ +AC_CHECK_FUNCS([malloc_size \ malloc_usable_size \ memrchr \ pipe2 \ @@ -561,13 +539,13 @@ AC_CHECK_HEADER([snappy.h], AC_CHECK_LIB([snappy], [main])) AC_CHECK_HEADER([zlib.h], AC_CHECK_LIB([z], [main])) AC_CHECK_HEADER([lzma.h], AC_CHECK_LIB([lzma], [main])) AC_CHECK_HEADER([zstd.h], AC_CHECK_LIB([zstd], [ZSTD_compressStream])) +AC_CHECK_HEADER([bzlib.h], AC_CHECK_LIB([bz2], [main])) AC_CHECK_HEADER([linux/membarrier.h], AC_DEFINE([HAVE_LINUX_MEMBARRIER_H], [1], [Define to 1 if membarrier.h is available])) AC_ARG_ENABLE([follytestmain], AS_HELP_STRING([--enable-follytestmain], [enables using main function from folly for tests]), - [follytestmain=${enableval}], [follytestmain=no]) + [use_follytestmain=${enableval}], [use_follytestmain=yes]) -use_follytestmain=yes # libdwarf used to install in /usr/include, now installs in /usr/include/libdwarf. AC_CHECK_HEADERS([libdwarf/dwarf.h dwarf.h], [break]) # Check whether we have both the library and the header @@ -585,6 +563,10 @@ AS_IF([test "x${mobile}" = "xyes"], [ [Define to 1 for compiler guards for mobile targets.]) ]) +AC_ARG_ENABLE([exception-tracer], + AS_HELP_STRING([--enable-exception-tracer], [enables building exception tracer]), + [build_exception_tracer=${enableval}], [build_exception_tracer=no]) + # Include directory that contains "folly" so #include works AM_CPPFLAGS='-I$(top_srcdir)/..' AM_CPPFLAGS="$AM_CPPFLAGS $BOOST_CPPFLAGS $OPENSSL_INCLUDES" @@ -611,6 +593,7 @@ AM_CONDITIONAL([HAVE_EXTRANDOM_SFMT19937], AM_CONDITIONAL([FOLLY_TESTMAIN], [test "x${use_follytestmain}" = "xyes"]) AM_CONDITIONAL([HAVE_LIBDWARF], [test "x${have_libdwarf}" = "xyes"]) AM_CONDITIONAL([HAVE_BOOST_CONTEXT], [test "x${ax_cv_boost_context}" = "xyes"]) +AM_CONDITIONAL([EXCEPTION_TRACER], [test "x${build_exception_tracer}" = "xyes"]) # remove pkg-config deps from dependent libraries # (at least for pkg-config file purposes) @@ -618,10 +601,18 @@ FB_FILTER_PKG_LIBS([$AM_LDFLAGS $LIBS]) # Output AC_CONFIG_FILES([Makefile + io/test/Makefile libfolly.pc test/Makefile test/function_benchmark/Makefile experimental/Makefile + experimental/io/test/Makefile + experimental/logging/Makefile + experimental/logging/example/Makefile experimental/symbolizer/Makefile - init/Makefile]) + init/Makefile + stats/test/Makefile]) + +AM_COND_IF([EXCEPTION_TRACER], + [AC_CONFIG_FILES([experimental/exception_tracer/Makefile])]) AC_OUTPUT