diff options
| author | Sage Weil <sage@inktank.com> | 2012-12-08 09:18:21 -0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-12-08 09:18:21 -0800 |
| commit | 81e567c90df91b0b320be6f090728d5082021031 (patch) | |
| tree | a109a597a8a030ec6cb9983ceca302f217417b25 /configure.ac | |
| parent | e227c70945f236811433fb2403056f0468530255 (diff) | |
| parent | 8850b3c7a5c8289a3c2aa2a5a9d5da89e74cb69f (diff) | |
| download | ceph-81e567c90df91b0b320be6f090728d5082021031.tar.gz | |
Merge remote-tracking branch 'gh/wip-ceph-test' into next
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 0620f6cf3be..ebaec0f57ba 100644 --- a/configure.ac +++ b/configure.ac @@ -55,6 +55,11 @@ AC_PROG_CXX AC_PROG_MAKE_SET AC_PROG_LIBTOOL +# Compiler flags + +AC_SUBST(AM_CXXFLAGS) +AM_CXXFLAGS="${AM_CXXFLAGS}" + # Checks for compiler warning types # AC_CHECK_CC_FLAG(FLAG_TO_TEST, VARIABLE_TO_SET_IF_SUPPORTED) @@ -133,14 +138,16 @@ if test "x$have_cryptopp" = "xyes"; then AC_MSG_NOTICE([using cryptopp for cryptography]) AC_DEFINE([USE_CRYPTOPP], [1], [Define if using CryptoPP.]) AC_SUBST([CRYPTO_CFLAGS], [$CRYPTOPP_CFLAGS]) - AC_SUBST([CRYPTO_CXXFLAGS], [$CRYPTOPP_CXXFLAGS]) + #AC_SUBST([CRYPTO_CXXFLAGS], [$CRYPTOPP_CXXFLAGS]) + AM_CXXFLAGS="${AM_CXXFLAGS} ${CRYPTOPP_CXXFLAGS}" AC_SUBST([CRYPTO_LIBS], [$CRYPTOPP_LIBS]) elif test "x$have_nss" = "xyes"; then AC_MSG_NOTICE([using nss for cryptography]) AC_DEFINE([USE_NSS], [1], [Define if using NSS.]) AC_SUBST([CRYPTO_CFLAGS], [$NSS_CFLAGS]) # this needs CFLAGS too in practise to get the includes right. ugly. - AC_SUBST([CRYPTO_CXXFLAGS], [$NSS_CFLAGS $NSS_CXXFLAGS]) + #AC_SUBST([CRYPTO_CXXFLAGS], [$NSS_CFLAGS $NSS_CXXFLAGS]) + AM_CXXFLAGS="${AM_CXXFLAGS} ${NSS_CFLAGS} ${NSS_CXXFLAGS}" AC_SUBST([CRYPTO_LIBS], [$NSS_LIBS]) else AC_MSG_FAILURE([no suitable crypto library found]) |