Create a submodule for folly

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "third-party/folly"]
+	path = third-party/folly
+	url = https://github.com/facebook/folly

Makefile.am

@@ -2,6 +2,8 @@ AUTOMAKE_OPTIONS = foreign
 
 CXXFLAGS = --std=gnu++11 -O3 -Wall -g
 
+SUBDIRS = third-party/folly/folly
+
 bin_PROGRAMS = redex-all
 
 bin_SCRIPTS = redex
@@ -44,10 +46,11 @@ includes = \
 	opt/synth \
 	opt/unterface \
 	tools/redex-all \
+	third-party/folly \
 	util
 
 redex_all_CPPFLAGS = $(foreach i, $(includes), -I$(top_srcdir)/$i)
-redex_all_LDADD = -lboost_filesystem -lboost_system -lpthread
+redex_all_LDADD = -lboost_filesystem -lboost_system -lpthread third-party/folly/folly/.libs/libfolly.a
 
 redex_all_SOURCES = \
 	configparser/keeprules.cc \

README.md

@@ -19,8 +19,6 @@ Mac OS X:
 ```
 brew install boost autoconf automake glog double-conversion
 ```
-You will also need to build and install
-[folly](https://github.com/facebook/folly) from source.
 
 Ubuntu 14.04 LTS:
 ```
@@ -32,13 +30,12 @@ apt-get install \
   libdouble-conversion-dev \
   libgoogle-glog-dev
 ```
-You will also need to build and install
-[folly](https://github.com/facebook/folly) from source.
 
 ### Build and Install
 
-Build ReDex using autoconf and make:
+Build ReDex using autoconf and make.
 ```
+git submodule update --init --recursive
 autoreconf -ivf && ./configure && make && make install
 ```
 

configure.ac

@@ -6,6 +6,7 @@ AC_INIT([redex], [1.0], [not-valid-yet@fb.com])
 AM_INIT_AUTOMAKE(redex, 1.0)
 AC_CONFIG_SRCDIR([configparser/config.l])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SUBDIRS([third-party/folly/folly])
 
 # Checks for programs.
 AC_PROG_CXX
@@ -24,7 +25,6 @@ AX_BOOST_BASE([1.54.0], [], [AC_MSG_ERROR(
               [Please install boost >= 1.54 (including filesystem)])])
 AX_BOOST_FILESYSTEM
 AX_BOOST_SYSTEM
-AC_CHECK_LIB([folly], [main], [], [AC_MSG_ERROR([Please install folly])])
 AC_CHECK_LIB([z], [adler32], [], [AC_MSG_ERROR([Please install zlib])])
 AC_CHECK_LIB([double-conversion], [main], [], [AC_MSG_ERROR([Please install double-conversion])])
 AC_CHECK_LIB([glog], [main], [], [AC_MSG_ERROR([Please install glog])])