diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2020-04-10 23:09:59 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2020-04-10 23:09:59 +0200 |
| commit | 8a3450ef8682b9085637d7b94afc5c7e6f92e64b (patch) | |
| tree | 6b67e6d6830091ed26761480ba67d97680f4e3aa /configure.ac | |
| parent | 87356242baf10c8b2a94d9013e436ed2a0dada53 (diff) | |
New upstream version 2.4.8upstream/2.4.8
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 9d5fc3f..e45ce2f 100644 --- a/configure.ac +++ b/configure.ac @@ -327,8 +327,6 @@ case "$host" in AC_DEFINE([TARGET_DARWIN], [1], [Are we running on Mac OS X?]) AC_DEFINE_UNQUOTED([TARGET_PREFIX], ["M"], [Target prefix]) have_tap_header="yes" - dnl some Mac OS X tendering (we use vararg macros...) - CPPFLAGS="$CPPFLAGS -no-cpp-precomp" ac_cv_type_struct_in_pktinfo=no ;; *-mingw*) @@ -905,9 +903,12 @@ if test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "openssl"; then EVP_MD_CTX_new \ EVP_MD_CTX_free \ EVP_MD_CTX_reset \ + EVP_CIPHER_CTX_reset \ SSL_CTX_get_default_passwd_cb \ SSL_CTX_get_default_passwd_cb_userdata \ SSL_CTX_set_security_level \ + X509_get0_notBefore \ + X509_get0_notAfter \ X509_get0_pubkey \ X509_STORE_get0_objects \ X509_OBJECT_free \ @@ -1376,15 +1377,8 @@ AC_SUBST([sampledir]) AC_SUBST([systemdunitdir]) AC_SUBST([tmpfilesdir]) -VENDOR_SRC_ROOT="\$(abs_top_srcdir)/vendor/" -VENDOR_DIST_ROOT="\$(abs_top_builddir)/vendor/dist" -VENDOR_BUILD_ROOT="\$(abs_top_builddir)/vendor/.build" -AC_SUBST([VENDOR_SRC_ROOT]) -AC_SUBST([VENDOR_BUILD_ROOT]) -AC_SUBST([VENDOR_DIST_ROOT]) - -TEST_LDFLAGS="-lcmocka -L\$(abs_top_builddir)/vendor/dist/lib -Wl,-rpath,\$(abs_top_builddir)/vendor/dist/lib" -TEST_CFLAGS="-I\$(top_srcdir)/include -I\$(abs_top_builddir)/vendor/dist/include" +TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_HELPER_LIBS} -lcmocka -L\$(top_builddir)/vendor/dist/lib -Wl,-rpath,\$(top_builddir)/vendor/dist/lib" +TEST_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${OPTIONAL_PKCS11_HELPER_CFLAGS} -I\$(top_srcdir)/include -I\$(top_builddir)/vendor/dist/include" AC_SUBST([TEST_LDFLAGS]) AC_SUBST([TEST_CFLAGS]) @@ -1412,8 +1406,6 @@ AC_CONFIG_FILES([ build/msvc/Makefile build/msvc/msvc-generate/Makefile distro/Makefile - distro/rpm/Makefile - distro/rpm/openvpn.spec distro/systemd/Makefile include/Makefile src/Makefile |