diff options
| author | Gary Lowell <glowell@inktank.com> | 2012-11-05 22:30:29 -0800 |
|---|---|---|
| committer | Gary Lowell <glowell@inktank.com> | 2012-11-27 13:50:25 -0800 |
| commit | af5d9e435f34ed0bc99cca4fd986ad9b23b11f64 (patch) | |
| tree | ff8aadf87ac60dd427042aefb1a15e4a77cf260c /configure.ac | |
| parent | 1dc0fce9108bd83d130621a20cbcc36beff068bf (diff) | |
| download | ceph-af5d9e435f34ed0bc99cca4fd986ad9b23b11f64.tar.gz | |
Makefiles: Use AM_CXXFLAGS for crypto library compiler options
In configure.ac, add the crypto library compiler flags to AM_CXXFLAGS and in
src/Makefile remove CRYPTO_CXXFLAGS and use only AM_CXXFLAGS which now has
the flags if needed.
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 d978565496d..7cfaadf6bce 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]) |