Update github.com/floitsch/double-conversion to new location

[folly.git] / folly / bootstrap-osx-homebrew.sh

diff --git a/folly/bootstrap-osx-homebrew.sh b/folly/bootstrap-osx-homebrew.sh
index da1f73ed24be33542696bfa1a2cce41a809a41b1..56e76bf534a321d18025ef64d45ff0afbd5bb3a3 100755 (executable)
--- a/folly/bootstrap-osx-homebrew.sh
+++ b/folly/bootstrap-osx-homebrew.sh
@@ -17,15 +17,11 @@ brewget glog gflags boost libevent
 
 # Install the double-conversion library.
 # NB their install target installs the libs but not the headers, hence the
-# CPPFLAGS and link shenanigans.
-test -d double-conversion || {
-    git clone https://github.com/floitsch/double-conversion.git
-    pushd double-conversion/src
-    ln -s . double-conversion
-    popd
-}
+# CPPFLAGS
+test -d double-conversion ||
+    git clone https://github.com/google/double-conversion.git
 pushd double-conversion
-scons
+make
 # fool libtool into using static linkage
 # (this won't work if you've already installed libdouble-conversion into a
 # default search path)
@@ -34,10 +30,10 @@ DOUBLE_CONVERSION_HOME=$(pwd)
 popd
 
 autoreconf -i
-./configure CPPFLAGS=-I"$DOUBLE_CONVERSION_HOME/src" LDFLAGS=-L"$DOUBLE_CONVERSION_HOME"
+./configure CPPFLAGS=-I"$DOUBLE_CONVERSION_HOME" LDFLAGS=-L"$DOUBLE_CONVERSION_HOME"
 
 pushd test
-test -d gtest-1.7.0 || {
+test -e gtest-1.7.0.zip || {
     curl -O https://googletest.googlecode.com/files/gtest-1.7.0.zip
     unzip gtest-1.7.0.zip
 }