|
Removed
Link Here
|
| 1 |
--- configure.ac.orig 2021-04-12 12:06:48 UTC |
| 2 |
+++ configure.ac |
| 3 |
@@ -75,24 +75,24 @@ PKG_PROG_PKG_CONFIG |
| 4 |
dnl for libcrypto, we are first detecting libcrypo11, |
| 5 |
dnl as older distros may still run on top of openssl 1.0, |
| 6 |
dnl but have v1.1.x accessible through libcrypto11.pc file |
| 7 |
-PKG_CHECK_MODULES([LIBCRYPTO], |
| 8 |
- [libcrypto11 >= 1.1.1e], |
| 9 |
- [ ac_save_CPPFLAGS=$CPPFLAGS |
| 10 |
- CPPFLAGS="${CPPFLAGS} ${LIBCRYPTO_CFLAGS}" |
| 11 |
- AC_CHECK_DECLS([OPENSSL_NO_RSA, OPENSSL_NO_DSA, OPENSSL_NO_DH, OPENSSL_NO_EC], |
| 12 |
- [AC_MSG_FAILURE([The OpenSSL crypto library is missing features/algorithm to allow compilation])], |
| 13 |
- [], |
| 14 |
- [[ #include <openssl/opensslconf.h> ]]) |
| 15 |
- CPPFLAGS=${ac_save_CPPFLAGS} ], |
| 16 |
- [ PKG_CHECK_MODULES([LIBCRYPTO], |
| 17 |
- [libcrypto >= 1.1.1e], |
| 18 |
- [ ac_save_CPPFLAGS=$CPPFLAGS |
| 19 |
- CPPFLAGS="${CPPFLAGS} ${LIBCRYPTO_CFLAGS}" |
| 20 |
- AC_CHECK_DECLS([OPENSSL_NO_RSA, OPENSSL_NO_DSA, OPENSSL_NO_DH, OPENSSL_NO_EC], |
| 21 |
- [AC_MSG_FAILURE([The OpenSSL crypto library is missing features/algorithm to allow compilation])], |
| 22 |
- [], |
| 23 |
- [[ #include <openssl/opensslconf.h> ]]) |
| 24 |
- CPPFLAGS=${ac_save_CPPFLAGS} ])]) |
| 25 |
+#PKG_CHECK_MODULES([LIBCRYPTO], |
| 26 |
+# [libcrypto11 >= 1.1.1e], |
| 27 |
+# [ ac_save_CPPFLAGS=$CPPFLAGS |
| 28 |
+# CPPFLAGS="${CPPFLAGS} ${LIBCRYPTO_CFLAGS}" |
| 29 |
+# AC_CHECK_DECLS([OPENSSL_NO_RSA, OPENSSL_NO_DSA, OPENSSL_NO_DH, OPENSSL_NO_EC], |
| 30 |
+# [AC_MSG_FAILURE([The OpenSSL crypto library is missing features/algorithm to allow compilation])], |
| 31 |
+# [], |
| 32 |
+# [[ #include <openssl/opensslconf.h> ]]) |
| 33 |
+# CPPFLAGS=${ac_save_CPPFLAGS} ], |
| 34 |
+# [ PKG_CHECK_MODULES([LIBCRYPTO], |
| 35 |
+# [libcrypto >= 1.1.1e], |
| 36 |
+# [ ac_save_CPPFLAGS=$CPPFLAGS |
| 37 |
+# CPPFLAGS="${CPPFLAGS} ${LIBCRYPTO_CFLAGS}" |
| 38 |
+# AC_CHECK_DECLS([OPENSSL_NO_RSA, OPENSSL_NO_DSA, OPENSSL_NO_DH, OPENSSL_NO_EC], |
| 39 |
+# [AC_MSG_FAILURE([The OpenSSL crypto library is missing features/algorithm to allow compilation])], |
| 40 |
+# [], |
| 41 |
+# [[ #include <openssl/opensslconf.h> ]]) |
| 42 |
+# CPPFLAGS=${ac_save_CPPFLAGS} ])]) |
| 43 |
|
| 44 |
dnl on UNIX platforms, check for dynamic loader lib |
| 45 |
AM_COND_IF( [TARGET_OS_MINGW32], |
| 46 |
@@ -152,8 +152,8 @@ AS_IF([test "x$with_luna" != xno], |
| 47 |
|
| 48 |
dnl check if a specific rpath is provided when linking. |
| 49 |
dnl this option is needed when openssl is not deployed to a system-wide location |
| 50 |
-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)]) |
| 51 |
-AM_CONDITIONAL([HAS_LIBCRYPTO_RPATH], [test "x$LIBCRYPTO_RPATH" != "x"]) |
| 52 |
+#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)]) |
| 53 |
+AM_CONDITIONAL([HAS_LIBCRYPTO_RPATH], [test "xx" != "x"]) |
| 54 |
|
| 55 |
|
| 56 |
#### TODO HERE |