From 56e0ec4fe2db38106311b09b88820a99860664f3 Mon Sep 17 00:00:00 2001 From: Andrew Gallagher Date: Tue, 25 Feb 2014 11:53:29 -0800 Subject: [PATCH] Fix inclusions of double-conversion to use proper path Summary: Will commit in tandem with D1171409. Test Plan: built folly Reviewed By: tudorb@fb.com FB internal diff: D1189713 --- folly/Conv.h | 3 ++- folly/Format.h | 2 +- folly/configure.ac | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/folly/Conv.h b/folly/Conv.h index 8eb7e52c..9ecc43c8 100644 --- a/folly/Conv.h +++ b/folly/Conv.h @@ -39,7 +39,8 @@ #include -#include "double-conversion.h" // V8 JavaScript implementation +// V8 JavaScript implementation +#include #define FOLLY_RANGE_CHECK(condition, message) \ ((condition) ? (void)0 : throw std::range_error( \ diff --git a/folly/Format.h b/folly/Format.h index 11e2462a..bccdf86d 100644 --- a/folly/Format.h +++ b/folly/Format.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include "folly/FBVector.h" #include "folly/Conv.h" diff --git a/folly/configure.ac b/folly/configure.ac index 8c7a41e5..3fd30fad 100644 --- a/folly/configure.ac +++ b/folly/configure.ac @@ -54,10 +54,10 @@ AX_BOOST_SYSTEM 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 emmintrin.h byteswap.h bits/functexcept.h]) -AC_CHECK_HEADER(double-conversion.h, [], [AC_MSG_ERROR( +AC_CHECK_HEADER(double-conversion/double-conversion.h, [], [AC_MSG_ERROR( [Couldn't find double-conversion.h, please download from \ http://code.google.com/p/double-conversion/])], []) -AC_CHECK_LIB([double_conversion_pic],[ceil],[],[AC_MSG_ERROR( +AC_CHECK_LIB([double-conversion],[ceil],[],[AC_MSG_ERROR( [Please install double-conversion library])]) # Checks for typedefs, structures, and compiler characteristics. -- 2.34.1