diff options
| author | Reshetnikov Alexandr <hemn.still@gmail.com> | 2022-04-28 23:35:05 +0400 |
|---|---|---|
| committer | Reshetnikov Alexandr <hemn.still@gmail.com> | 2022-04-28 23:35:05 +0400 |
| commit | f59c9b909b1a6e18d79e066e96358a14f316d115 (patch) | |
| tree | 89daf2cfaf03f304c0f1206b7d5822c48d5d4df2 | |
| parent | 966d164f40d69a7ba02c61ad2ed6d6368722b2ae (diff) | |
| parent | b1aa465b21fce2e4a0108360ba9b19e1e1aff02b (diff) | |
| download | libarchive-f59c9b909b1a6e18d79e066e96358a14f316d115.tar.gz | |
Merge remote-tracking branch 'remotes/origin/master' into zstd_windows
| -rw-r--r-- | build/pkgconfig/libarchive.pc.in | 1 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/build/pkgconfig/libarchive.pc.in b/build/pkgconfig/libarchive.pc.in index 4b631e63..1f51e77f 100644 --- a/build/pkgconfig/libarchive.pc.in +++ b/build/pkgconfig/libarchive.pc.in @@ -10,3 +10,4 @@ Cflags: -I${includedir} Cflags.private: -DLIBARCHIVE_STATIC Libs: -L${libdir} -larchive Libs.private: @LIBS@ +Requires.private: @LIBSREQUIRED@ diff --git a/configure.ac b/configure.ac index 2f53fae3..b30430d2 100644 --- a/configure.ac +++ b/configure.ac @@ -378,6 +378,7 @@ if test "x$with_iconv" != "xno"; then AC_CHECK_HEADERS([localcharset.h]) am_save_LIBS="$LIBS" LIBS="${LIBS} ${LIBICONV}" + LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" AC_CHECK_FUNCS([locale_charset]) LIBS="${am_save_LIBS}" if test "x$ac_cv_func_locale_charset" != "xyes"; then @@ -1209,6 +1210,7 @@ fi if test "x$with_openssl" != "xno"; then AC_CHECK_HEADERS([openssl/evp.h]) saved_LIBS=$LIBS + LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }libssl libcrypto" AC_CHECK_LIB(crypto,OPENSSL_config) CRYPTO_CHECK(MD5, OPENSSL, md5) CRYPTO_CHECK(RMD160, OPENSSL, rmd160) @@ -1219,6 +1221,8 @@ if test "x$with_openssl" != "xno"; then AC_CHECK_FUNCS([PKCS5_PBKDF2_HMAC_SHA1]) fi +AC_SUBST(LIBSREQUIRED) + # Probe libmd AFTER OpenSSL/libcrypto. # The two are incompatible and OpenSSL is more complete. AC_CHECK_HEADERS([md5.h ripemd.h sha.h sha256.h sha512.h]) |