Makefile: Handle corner case of crypto++ correctly

i.e. use c++ while compiling, append to CRYPTO_LIBS instead of LIBS

Signed-off-by: Kacper Kowalik (Xarthisius) <xarthisius@gentoo.org>

diff --git a/configure.ac b/configure.ac
index 9ca434c259f2e6a5c438178d972400af2c9cb293..2c00f283dc48ad9c580fdcb5af59a32ebc6081b6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -88,10 +88,20 @@ AS_IF([test "x$with_cryptopp" != "xno"],
     [PKG_CHECK_MODULES([CRYPTOPP],
            [libcrypto++],
            [have_cryptopp=yes],
-           [AC_SEARCH_LIBS([_ZTIN8CryptoPP14CBC_EncryptionE], [crypto++ cryptopp],
-                   [have_cryptopp=yes],
-                   [true],
-                   [-lpthread])])])
+           [
+                  AC_LANG_PUSH([C++])
+                  SAVED_CXXFLAGS="${CXXFLAGS}"
+                  SAVED_LIBS="${LIBS}"
+                  LIBS="${LIBS} ${PTHREAD_LIBS}"
+                  CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}"
+                  AC_SEARCH_LIBS([_ZTIN8CryptoPP14CBC_EncryptionE], [crypto++ cryptopp],
+                         [have_cryptopp=yes],
+                         [true], [])
+                  CRYPTOPP_LIBS="${ac_cv_search__ZTIN8CryptoPP14CBC_EncryptionE}"
+                  LIBS="${SAVED_LIBS}"
+                  CXXFLAGS="${SAVED_CXXFLAGS}"
+                  AC_LANG_POP([C++])
+          ])])
 # bail out if given explicit --with-cryptopp
 if test "x$have_cryptopp" = "xno" -a "x$with_cryptopp" != "xcheck" -a "x$with_cryptopp" != "xno"; then
     AC_MSG_FAILURE([--with-cryptopp was given, but library was not found])