diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2019-07-14 15:07:42 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2019-07-14 15:07:42 +0200 |
| commit | 6e0f64cb72a3e2948fdb8b6a59aac9bb57223dc2 (patch) | |
| tree | 9a9e468e6101ee8eb5e4f454b8c13caf504b48a9 /configure.ac | |
| parent | libq/hash: ensure hash_compute_file operates on hashes requested (diff) | |
| download | portage-utils-6e0f64cb72a3e2948fdb8b6a59aac9bb57223dc2.tar.gz portage-utils-6e0f64cb72a3e2948fdb8b6a59aac9bb57223dc2.tar.bz2 portage-utils-6e0f64cb72a3e2948fdb8b6a59aac9bb57223dc2.zip | |
qtegrity: use libq/hash iso shelling out to shaXsum
Use libq/hash functionality (as used by qmanifest) in qtegrity to obtain
hashes for files. This adds a dep on openssl currently, so allow
disabling this applet.
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index bda5a843..0577d076 100644 --- a/configure.ac +++ b/configure.ac @@ -35,11 +35,15 @@ AC_SUBST([CONFIG_EPREFIX], ["$with_eprefix"]) AC_ARG_ENABLE([qmanifest], [AS_HELP_STRING([--enable-qmanifest], [support qmanifest applet])], [], [enable_qmanifest=auto]) +AC_ARG_ENABLE([qtegrity], [AS_HELP_STRING([--enable-qtegrity], + [support qtegrity applet])], + [], [enable_qtegrity=auto]) LIBSSL= LIBBL2= LIBZ= HASGPGME= -AS_IF([test "x$enable_qmanifest" != xno], + +AS_IF([test "x${enable_qmanifest}x${enable_qtegrity}" != xnoxno], [AC_CHECK_HEADERS([openssl/err.h \ openssl/ssl.h], [], [LIBSSL=_missing_header]) AC_CHECK_LIB([ssl${LIBSSL}], [SSL_connect], @@ -55,9 +59,33 @@ AS_IF([test "x$enable_qmanifest" != xno], AC_MSG_FAILURE( [--enable-qmanifest was given, but test for ssl failed]) fi + if test "x$enable_qtegrity" != xauto; then + AC_MSG_FAILURE( + [--enable-qtegrity was given, but test for ssl failed]) + fi LIBSSL= ]) - AC_CHECK_HEADERS([blake2.h], [], [LIBBL2=_missing_header]) + AC_MSG_CHECKING([whether to enable qtegrity]) + case "x${LIBSSL}" in + "x-lssl"*) + AC_MSG_RESULT([yes]) + ;; + *) + enable_qtegrity=no + AC_MSG_RESULT([no: missing dependencies]) + ;; + esac + if test "x$enable_qtegrity" != xno ; then + AC_DEFINE([ENABLE_QTEGRITY], [1], + [Define if qtegrity should be compiled]) + fi + ], + [ + AC_MSG_CHECKING([whether to enable qtegrity]) + AC_MSG_RESULT([no: disabled by configure argument]) + ]) +AS_IF([test "x$enable_qmanifest" != xno], + [AC_CHECK_HEADERS([blake2.h], [], [LIBBL2=_missing_header]) AC_CHECK_LIB([b2${LIBBL2}], [blake2b_update], [LIBBL2="-lb2" AC_DEFINE([HAVE_BLAKE2B], [1], @@ -104,6 +132,7 @@ AS_IF([test "x$enable_qmanifest" != xno], AC_MSG_RESULT([no: disabled by configure argument]) ]) AM_CONDITIONAL([QMANIFEST_ENABLED], [test "x$enable_qmanifest" != xno]) +AM_CONDITIONAL([QTEGRITY_ENABLED], [test "x$enable_qtegrity" != xno]) AX_CFLAGS_WARN_ALL AC_DEFUN([PT_CHECK_CFLAG],[AX_CHECK_COMPILER_FLAGS([$1],[CFLAGS="$CFLAGS $1"])]) |