From 4bfe9433f7fb582b9ae65449857bbc49b9362d89 Mon Sep 17 00:00:00 2001 From: Tudor Bosman Date: Mon, 30 Jun 2014 16:12:47 -0700 Subject: [PATCH] Simplify include path, make sure .. is in it Summary: so #include works Test Plan: built OSS folly, make check, built tiny program out of tree Reviewed By: davejwatson@fb.com FB internal diff: D1412123 --- folly/configure.ac | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/folly/configure.ac b/folly/configure.ac index b2bbe3c0..b0db6b4d 100644 --- a/folly/configure.ac +++ b/folly/configure.ac @@ -198,8 +198,14 @@ 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_SUBST(AM_CPPFLAGS, '-I../$(top_srcdir)'" "'-I$(top_srcdir)/io'" "'-I$(top_srcdir)/test'" $BOOST_CPPFLAGS") -AC_SUBST(AM_LDFLAGS, "$BOOST_LDFLAGS $BOOST_THREAD_LIB $BOOST_FILESYSTEM_LIB $BOOST_SYSTEM_LIB $BOOST_REGEX_LIB -lpthread") +# Include directory that contains "folly" so #include works +AM_CPPFLAGS='-I$(top_srcdir)/..' +AM_CPPFLAGS="$AM_CPPFLAGS $BOOST_CPPFLAGS" +AM_LDFLAGS="$AM_LDFLAGS $BOOST_THREAD_LIB $BOOST_FILESYSTEM_LIB" +AM_LDFLAGS="$AM_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_REGEX_LIB -lpthread" + +AC_SUBST([AM_CPPFLAGS]) +AC_SUBST([AM_LDFLAGS]) AM_CONDITIONAL([HAVE_STD_THREAD], [test "$ac_cv_header_features" = "yes"]) AM_CONDITIONAL([HAVE_X86_64], [test "$build_cpu" = "x86_64"]) -- 2.34.1