diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-23 07:56:44 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-23 07:56:44 +0200 |
| commit | cc66561cc2e3428ef0261ad4aa951b23c7a0c1a0 (patch) | |
| tree | f4dcb502665429e55c1112c510040e8471ccdd26 | |
| parent | 666d301e148df2c150404c4fc73f63c6da933815 (diff) | |
| parent | 194c3c45d0b8ed0f8356e7867dc04d768e9aa7c9 (diff) | |
| download | rsyslog-cc66561cc2e3428ef0261ad4aa951b23c7a0c1a0.tar.gz rsyslog-cc66561cc2e3428ef0261ad4aa951b23c7a0c1a0.tar.bz2 rsyslog-cc66561cc2e3428ef0261ad4aa951b23c7a0c1a0.zip | |
Merge branch 'v7-stable-mmrfc5424addhmac'
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | plugins/mmrfc5424addhmac/Makefile.am | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 779d2987..324a680d 100644 --- a/configure.ac +++ b/configure.ac @@ -1012,6 +1012,12 @@ AC_ARG_ENABLE(mmrfc5424addhmac, esac], [enable_mmrfc5424addhmac=no] ) +if test "x$enable_mmrfc5424addhmac" = "xyes"; then + PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7) +#AC_CHECK_LIB([crypto],[CRYPTO_new_ex_data], [], [AC_MSG_ERROR([OpenSSL libraries required])]) +#AC_CHECK_LIB([ssl],[SSL_library_init], [], [AC_MSG_ERROR([OpenSSL libraries required])]) +#AC_CHECK_HEADERS([openssl/crypto.h openssl/x509.h openssl/pem.h openssl/ssl.h openssl/err.h],[],[AC_MSG_ERROR([OpenSSL headers required])]) +fi AM_CONDITIONAL(ENABLE_MMRFC5424ADDHMAC, test x$enable_mmrfc5424addhmac = xyes) diff --git a/plugins/mmrfc5424addhmac/Makefile.am b/plugins/mmrfc5424addhmac/Makefile.am index 4c4f1fda..6567def0 100644 --- a/plugins/mmrfc5424addhmac/Makefile.am +++ b/plugins/mmrfc5424addhmac/Makefile.am @@ -1,8 +1,8 @@ pkglib_LTLIBRARIES = mmrfc5424addhmac.la mmrfc5424addhmac_la_SOURCES = mmrfc5424addhmac.c -mmrfc5424addhmac_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) +mmrfc5424addhmac_la_CPPFLAGS = $(OPENSSL_CFLAGS) $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) mmrfc5424addhmac_la_LDFLAGS = -module -avoid-version -mmrfc5424addhmac_la_LIBADD = +mmrfc5424addhmac_la_LIBADD = $(OPENSSL_LIBS) EXTRA_DIST = |