ports/security/pkcs11-tools/files/patch-configure.ac
Yuri Victorovich a6d0c2f4e2 New port: security/pkcs11-tools: Tools for managing PKCS11 cryptographic tokens
PR:		255058
Submitted by:	Eric Devolder <eric.devolder@gmail.com>
2021-04-18 17:23:37 -07:00

56 lines
2.9 KiB
Text

--- configure.ac.orig 2021-04-12 12:06:48 UTC
+++ configure.ac
@@ -75,24 +75,24 @@ PKG_PROG_PKG_CONFIG
dnl for libcrypto, we are first detecting libcrypo11,
dnl as older distros may still run on top of openssl 1.0,
dnl but have v1.1.x accessible through libcrypto11.pc file
-PKG_CHECK_MODULES([LIBCRYPTO],
- [libcrypto11 >= 1.1.1e],
- [ ac_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="${CPPFLAGS} ${LIBCRYPTO_CFLAGS}"
- AC_CHECK_DECLS([OPENSSL_NO_RSA, OPENSSL_NO_DSA, OPENSSL_NO_DH, OPENSSL_NO_EC],
- [AC_MSG_FAILURE([The OpenSSL crypto library is missing features/algorithm to allow compilation])],
- [],
- [[ #include <openssl/opensslconf.h> ]])
- CPPFLAGS=${ac_save_CPPFLAGS} ],
- [ PKG_CHECK_MODULES([LIBCRYPTO],
- [libcrypto >= 1.1.1e],
- [ ac_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="${CPPFLAGS} ${LIBCRYPTO_CFLAGS}"
- AC_CHECK_DECLS([OPENSSL_NO_RSA, OPENSSL_NO_DSA, OPENSSL_NO_DH, OPENSSL_NO_EC],
- [AC_MSG_FAILURE([The OpenSSL crypto library is missing features/algorithm to allow compilation])],
- [],
- [[ #include <openssl/opensslconf.h> ]])
- CPPFLAGS=${ac_save_CPPFLAGS} ])])
+#PKG_CHECK_MODULES([LIBCRYPTO],
+# [libcrypto11 >= 1.1.1e],
+# [ ac_save_CPPFLAGS=$CPPFLAGS
+# CPPFLAGS="${CPPFLAGS} ${LIBCRYPTO_CFLAGS}"
+# AC_CHECK_DECLS([OPENSSL_NO_RSA, OPENSSL_NO_DSA, OPENSSL_NO_DH, OPENSSL_NO_EC],
+# [AC_MSG_FAILURE([The OpenSSL crypto library is missing features/algorithm to allow compilation])],
+# [],
+# [[ #include <openssl/opensslconf.h> ]])
+# CPPFLAGS=${ac_save_CPPFLAGS} ],
+# [ PKG_CHECK_MODULES([LIBCRYPTO],
+# [libcrypto >= 1.1.1e],
+# [ ac_save_CPPFLAGS=$CPPFLAGS
+# CPPFLAGS="${CPPFLAGS} ${LIBCRYPTO_CFLAGS}"
+# AC_CHECK_DECLS([OPENSSL_NO_RSA, OPENSSL_NO_DSA, OPENSSL_NO_DH, OPENSSL_NO_EC],
+# [AC_MSG_FAILURE([The OpenSSL crypto library is missing features/algorithm to allow compilation])],
+# [],
+# [[ #include <openssl/opensslconf.h> ]])
+# CPPFLAGS=${ac_save_CPPFLAGS} ])])
dnl on UNIX platforms, check for dynamic loader lib
AM_COND_IF( [TARGET_OS_MINGW32],
@@ -152,8 +152,8 @@ AS_IF([test "x$with_luna" != xno],
dnl check if a specific rpath is provided when linking.
dnl this option is needed when openssl is not deployed to a system-wide location
-AC_ARG_VAR([LIBCRYPTO_RPATH], [provide RPATH to LIBCRYPTO, e.g. LIBCRYPTO_RPATH=/usr/local/ssl/lib (useful when openssl is not deployed to a system-wide location)])
-AM_CONDITIONAL([HAS_LIBCRYPTO_RPATH], [test "x$LIBCRYPTO_RPATH" != "x"])
+#AC_ARG_VAR([LIBCRYPTO_RPATH], [provide RPATH to LIBCRYPTO, e.g. LIBCRYPTO_RPATH=/usr/local/ssl/lib (useful when openssl is not deployed to a system-wide location)])
+AM_CONDITIONAL([HAS_LIBCRYPTO_RPATH], [test "xx" != "x"])
#### TODO HERE