config for libsodium in alternate path, using CPP flags for both C and C++ sources.

This commit is contained in:
Matt Connolly 2013-09-29 21:19:50 +10:00
parent 6c25d2f880
commit 7660b78e12

View File

@ -73,7 +73,7 @@ AC_ARG_WITH([libsodium],
if test "x$zmq_search_libsodium" = "xyes"; then if test "x$zmq_search_libsodium" = "xyes"; then
if test -r "${with_libsodium}/include/sodium.h"; then if test -r "${with_libsodium}/include/sodium.h"; then
CXXFLAGS="-I${with_libsodium}/include ${CXXFLAGS}" CPPFLAGS="-I${with_libsodium}/include ${CPPFLAGS}"
LDFLAGS="-L${with_libsodium}/lib ${LDFLAGS}" LDFLAGS="-L${with_libsodium}/lib ${LDFLAGS}"
fi fi
fi fi
@ -86,7 +86,7 @@ AC_ARG_WITH([libsodium-include-dir],
if test "x$zmq_search_libsodium_include" = "xyes"; then if test "x$zmq_search_libsodium_include" = "xyes"; then
if test -r "${with_libsodium_include_dir}/sodium.h"; then if test -r "${with_libsodium_include_dir}/sodium.h"; then
CXXFLAGS="-I${with_libsodium_include_dir}/include ${CXXFLAGS}" CPPFLAGS="-I${with_libsodium_include_dir}/include ${CPPFLAGS}"
fi fi
fi fi