OS merges

Summary:
All pretty trivial:

https://github.com/facebook/folly/issues/99
https://github.com/facebook/folly/issues/98
https://github.com/facebook/folly/issues/45

Test Plan: Will watch jenkins fbthrift build

Reviewed By: dcsommer@fb.com

Subscribers: doug, njormrod, folly-diffs@

FB internal diff: D1669952

Signature: t1:1669952:1415643677:906234f0a89f38645b0072d3c88762d8fa2729dc

diff --git a/folly/SConstruct.double-conversion b/folly/SConstruct.double-conversion
deleted file mode 100644 (file)
index 44ab44a..0000000
--- a/folly/SConstruct.double-conversion
+++ /dev/null
@@ -1,21 +0,0 @@
-double_conversion_sources = ['src/' + x for x in SConscript('src/SConscript')]
-double_conversion_test_sources = ['test/cctest/' + x for x in SConscript('test/cctest/SConscript')]
-test = double_conversion_sources + double_conversion_test_sources
-print(test)
-env = Environment(CPPPATH='#/src')
-debug = ARGUMENTS.get('debug', 0)
-optimize = ARGUMENTS.get('optimize', 0)
-if int(debug):
-  env.Append(CCFLAGS = '-g -Wall -Werror')
-if int(optimize):
-  env.Append(CCFLAGS = '-O3')
-print double_conversion_sources
-print double_conversion_test_sources
-double_conversion_shared_objects = [
-    env.SharedObject(src) for src in double_conversion_sources]
-double_conversion_static_objects = [
-    env.StaticObject(src) for src in double_conversion_sources]
-library_name = 'double_conversion'
-static_lib = env.StaticLibrary(library_name, double_conversion_static_objects)
-env.StaticLibrary(library_name + '_pic', double_conversion_shared_objects)
-env.Program('run_tests', double_conversion_test_sources, LIBS=[static_lib])

diff --git a/folly/configure.ac b/folly/configure.ac
index cbdb5f2e4ef80d4cb564f6c7c7fe18ef6a903167..3f66657c2b81c957bb64b17c701789ce99178d01 100644 (file)
--- a/folly/configure.ac
+++ b/folly/configure.ac
@@ -303,7 +303,7 @@ AM_CONDITIONAL([HAVE_X86_64], [test "$build_cpu" = "x86_64"])
 AM_CONDITIONAL([HAVE_LINUX], [test "$build_os" == "linux-gnu"])
 AM_CONDITIONAL([HAVE_WEAK_SYMBOLS],
                [test "$folly_cv_prog_cc_weak_symbols" = "yes"])
-AM_CONDITIONAL([HAVE_BITS_FUNCTEXCEPT], [test "$ac_cv_header_bits_functexcept" = "yes"])
+AM_CONDITIONAL([HAVE_BITS_FUNCTEXCEPT], [test "$ac_cv_header_bits_functexcept_h" = "yes"])
 
 # Output
 AC_CONFIG_FILES([Makefile