OPT_GFLAGS=$(brew --prefix gflags)
OPT_OPENSSL=$(brew --prefix openssl)
- # export LDFLAGS
+ # export flags
export LDFLAGS=-L${OPT_OPENSSL}/lib
- export CPPFLAGS=-I${OPT_OPENSSL}/include
+ export OPENSSL_INCLUDES=-I${OPT_OPENSSL}/include
export GFLAGS_LIBS=-L${OPT_GFLAGS}/lib
export GFLAGS_CFLAGS=-I${OPT_GFLAGS}/include
}
fi
FB_CHECK_PKG_CONFIG([GLOG], [libglog])
-AX_CHECK_OPENSSL([],
- [AC_MSG_ERROR(["Error: libssl required"])])
+AS_IF(
+ [test "x$OPENSSL_INCLUDES" = "x"],
+ [
+ AX_CHECK_OPENSSL([], [AC_MSG_ERROR(["Error: libssl required"])])
+ ],
+ [
+ # AX_CHECK_OPENSSL doesn't seem to play nice with builds started
+ # via build/bootstrap-osx-homebrew.sh
+ AC_MSG_WARN(["Using existing OpenSSL flags from environment."])
+ PKG_CXXFLAGS="$PKG_CXXFLAGS $OPENSSL_INCLUDES"
+ ]
+)
FB_CHECK_PKG_CONFIG([OPENSSL], [openssl])
# check for boost libs
# Include directory that contains "folly" so #include <folly/Foo.h> works
AM_CPPFLAGS='-I$(top_srcdir)/..'
-AM_CPPFLAGS="$AM_CPPFLAGS $BOOST_CPPFLAGS"
+AM_CPPFLAGS="$AM_CPPFLAGS $BOOST_CPPFLAGS $OPENSSL_INCLUDES"
AM_LDFLAGS="$AM_LDFLAGS $BOOST_CONTEXT_LIB $BOOST_PROGRAM_OPTIONS_LIB"
AM_LDFLAGS="$AM_LDFLAGS $BOOST_THREAD_LIB $BOOST_FILESYSTEM_LIB"
AM_LDFLAGS="$AM_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_REGEX_LIB -lpthread"
Name: libfolly
Description: Facebook (Folly) C++ library
Version: @PKG_VERSION@
-Requires.private: @PKG_DEPS@
+Requires: @PKG_DEPS@
Libs.private: @PKG_LIBS@
Libs: -L${libdir} -lfolly
Cflags: -I${includedir} @PKG_CXXFLAGS@