X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=blobdiff_plain;f=folly%2Fconfigure.ac;h=22e2f9fae8937bd2d7c58a32e2b9d06b0a3e6f2e;hp=90771eabb4e8f53a3a360e8821d1302fcc04ea6e;hb=8a56900338f3fccf82a35f5e4de9e9680abb05ad;hpb=e44d8a6211a820ce24c358dc63515278ccf23d64 diff --git a/folly/configure.ac b/folly/configure.ac index 90771eab..22e2f9fa 100644 --- a/folly/configure.ac +++ b/folly/configure.ac @@ -102,9 +102,9 @@ AC_CACHE_CHECK( ) if test "$folly_cv_prog_cc_gflags" != "yes"; then - AC_MSG_ERROR(["libgflags invalid, see config.log for details"]) + AC_MSG_ERROR(["gflags invalid, see config.log for details"]) fi -FB_CHECK_PKG_CONFIG([GFLAGS], [libgflags]) +FB_CHECK_PKG_CONFIG([GFLAGS], [gflags]) AC_HAVE_LIBRARY([glog],[],[AC_MSG_ERROR( [Please install google-glog library])]) @@ -130,8 +130,18 @@ if test "$folly_cv_prog_cc_glog" != "yes"; then fi FB_CHECK_PKG_CONFIG([GLOG], [libglog]) -AX_CHECK_OPENSSL([], - [AC_MSG_ERROR(["Error: libssl required"])]) +AS_IF( + [test "x$OPENSSL_INCLUDES" = "x"], + [ + AX_CHECK_OPENSSL([], [AC_MSG_ERROR(["Error: libssl required"])]) + ], + [ + # AX_CHECK_OPENSSL doesn't seem to play nice with builds started + # via build/bootstrap-osx-homebrew.sh + AC_MSG_WARN(["Using existing OpenSSL flags from environment."]) + PKG_CXXFLAGS="$PKG_CXXFLAGS $OPENSSL_INCLUDES" + ] +) FB_CHECK_PKG_CONFIG([OPENSSL], [openssl]) # check for boost libs @@ -150,7 +160,7 @@ AM_PATH_PYTHON # Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS([fcntl.h features.h inttypes.h limits.h sched.h stdint.h stdlib.h string.h sys/time.h unistd.h mutex.h malloc.h byteswap.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 \ @@ -172,7 +182,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 @@ -200,7 +209,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], @@ -242,22 +251,6 @@ AC_DEFINE_UNQUOTED( [OVERRIDE], [$override_val], [Define to "override" if the compiler supports C++11 "override"]) -AC_CACHE_CHECK( - [for std::this_thread::sleep_for], - [folly_cv_func_this_thread_sleep_for], - [AC_COMPILE_IFELSE( - [AC_LANG_SOURCE[ - #include - #include - void func() { std::this_thread::sleep_for(std::chrono::seconds(1)); }]], - [folly_cv_func_this_thread_sleep_for=yes], - [folly_cv_func_this_thread_sleep_for=no])]) - -if test "$folly_cv_func_this_thread_sleep_for" = yes; then - AC_DEFINE([HAVE_STD__THIS_THREAD__SLEEP_FOR], [1], - [Define to 1 if std::this_thread::sleep_for() is defined.]) -fi - AC_CACHE_CHECK( [for constexpr strlen], [folly_cv_func_constexpr_strlen], @@ -548,14 +541,7 @@ AC_DEFINE_UNQUOTED( otherwise define to 0]) # Checks for library functions. -AC_CHECK_FUNCS([getdelim \ - gettimeofday \ - memmove \ - memset \ - pow \ - strerror \ - sched_yield \ - malloc_size \ +AC_CHECK_FUNCS([malloc_size \ malloc_usable_size \ memrchr \ pipe2 \ @@ -568,28 +554,20 @@ 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 have_libdwarf=no AS_IF([test "x${ac_cv_header_libdwarf_dwarf_h}" = xyes], [have_libdwarf=yes]) AS_IF([test "x${ac_cv_header_dwarf_h}" = xyes], [have_libdwarf=yes]) -if test "x${follytestmain}" = "xyes"; then - AS_IF([test "x${have_libdwarf}" = xno], [AC_MSG_ERROR([Please install libdwarf development library and headers])]) - AC_CHECK_HEADERS([elf.h],, AC_MSG_ERROR([Please install libelf development package])) - AC_CHECK_HEADERS([libunwind.h],, AC_MSG_ERROR([Please install libunwind development package])) -else - AS_IF([test "x${have_libdwarf}" = xno],, [use_follytestmain=no]) - AC_CHECK_HEADERS([elf.h],, [use_follytestmain=no]) - AC_CHECK_HEADERS([libunwind.h],, [use_follytestmain=no]) -fi + AC_ARG_ENABLE([mobile], AS_HELP_STRING([--enable-mobile], @@ -602,7 +580,7 @@ AS_IF([test "x${mobile}" = "xyes"], [ # Include directory that contains "folly" so #include works AM_CPPFLAGS='-I$(top_srcdir)/..' -AM_CPPFLAGS="$AM_CPPFLAGS $BOOST_CPPFLAGS" +AM_CPPFLAGS="$AM_CPPFLAGS $BOOST_CPPFLAGS $OPENSSL_INCLUDES" AM_LDFLAGS="$AM_LDFLAGS $BOOST_CONTEXT_LIB $BOOST_PROGRAM_OPTIONS_LIB" AM_LDFLAGS="$AM_LDFLAGS $BOOST_THREAD_LIB $BOOST_FILESYSTEM_LIB" AM_LDFLAGS="$AM_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_REGEX_LIB -lpthread" @@ -624,6 +602,7 @@ AM_CONDITIONAL([HAVE_BITS_FUNCTEXCEPT_H], [test "$ac_cv_header_bits_functexcept_ AM_CONDITIONAL([HAVE_EXTRANDOM_SFMT19937], [test "$folly_cv_prog_cc_have_extrandom_sfmt19937" = "yes"]) 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"]) # remove pkg-config deps from dependent libraries @@ -632,10 +611,12 @@ 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/symbolizer/Makefile init/Makefile]) AC_OUTPUT