From patchwork Tue Nov 15 15:09:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 9429949 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C40FC60469 for ; Tue, 15 Nov 2016 15:12:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B28CC28A37 for ; Tue, 15 Nov 2016 15:12:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A5A4928BB6; Tue, 15 Nov 2016 15:12:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7971D28A37 for ; Tue, 15 Nov 2016 15:12:40 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c6fMy-0006SO-UT; Tue, 15 Nov 2016 15:09:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c6fMy-0006SI-EQ for xen-devel@lists.xenproject.org; Tue, 15 Nov 2016 15:09:56 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 9F/32-08512-3452B285; Tue, 15 Nov 2016 15:09:55 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrELMWRWlGSWpSXmKPExsVyhffoU11nVe0 Ig/4GDovvWyYzOTB6HP5whSWAMYo1My8pvyKBNePD/lbGgvXiFa2PNzE2MP4X7mLk4hASeMEo sefNX+YuRk4ONgEtiZ9TprKA2CICShL3Vk1mArGZBTQkLh67yApiCwvYSZx99xksziKgKvG9c QmYzStgLTH18BJ2EFtCQF5i4fkjTBMYORYwMqxi1ChOLSpLLdI1MtVLKspMzyjJTczM0TU0MN XLTS0uTkxPzUlMKtZLzs/dxAj0Sz0DA+MOxl3tfocYJTmYlER5s5W1I4T4kvJTKjMSizPii0p zUosPMcpwcChJ8J4GyQkWpaanVqRl5gADBCYtwcGjJML7FyTNW1yQmFucmQ6ROsWoKCXOW6wC lBAASWSU5sG1wYLyEqOslDAvIwMDgxBPQWpRbmYJqvwrRnEORiVh3liQ8TyZeSVw018BLWYCW rzLXANkcUkiQkqqgXFB9bI3hWUq/z/4ztnwzKPm9IMHDud6r66Lvizv+jNk48Qj5+ok7qjJng xWEC1byq+82o0hX2GC5nNL6+9HVicUxpQ9UQ78UzFzLte76zN9HcLvLOb6y2E388MMq61Ss/m df88/oiJ97OrnBwctbSwrj8+96/+l8YSk0ZQyzQwzB4e5VxWvqvcrsRRnJBpqMRcVJwIA/G4X YkUCAAA= X-Env-Sender: ijackson@chiark.greenend.org.uk X-Msg-Ref: server-14.tower-206.messagelabs.com!1479222593!31562362!1 X-Originating-IP: [212.13.197.229] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 34171 invoked from network); 15 Nov 2016 15:09:54 -0000 Received: from chiark.greenend.org.uk (HELO chiark.greenend.org.uk) (212.13.197.229) by server-14.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 15 Nov 2016 15:09:54 -0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1c6fMw-0005oH-Ky; Tue, 15 Nov 2016 15:09:54 +0000 From: Ian Jackson To: xen-devel@lists.xenproject.org Date: Tue, 15 Nov 2016 15:09:50 +0000 Message-Id: <20161115150950.22253-1-ian.jackson@citrix.com> X-Mailer: git-send-email 2.10.2 Cc: Ian Jackson Subject: [Xen-devel] [PATCH for-4.8] tools/configure: Drop -lcrypto search X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This seems to be looking for a function MD5. But nothing uses it. The build works fine if this is disabled and libcrypto is not installed. This check was first introduced in 68a3e1e87325 "[TOOLS] Add more checks for devel packages." in 2006. At that time -lcrypto was used by tools/blktap/ and tools/vtpm_manager/, which are both gone now. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- tools/config.h.in | 3 --- tools/configure | 47 ----------------------------------------------- tools/configure.ac | 1 - 3 files changed, 51 deletions(-) diff --git a/tools/config.h.in b/tools/config.h.in index 58856bc..c66a78c 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -30,9 +30,6 @@ /* Define to 1 if you have the `aio' library (-laio). */ #undef HAVE_LIBAIO -/* Define to 1 if you have the `crypto' library (-lcrypto). */ -#undef HAVE_LIBCRYPTO - /* Define to 1 if you have the `fdt' library (-lfdt). */ #undef HAVE_LIBFDT diff --git a/tools/configure b/tools/configure index 3ffbf6f..4c756ab 100755 --- a/tools/configure +++ b/tools/configure @@ -8419,53 +8419,6 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 in -lcrypto" >&5 -$as_echo_n "checking for MD5 in -lcrypto... " >&6; } -if ${ac_cv_lib_crypto_MD5+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcrypto $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char MD5 (); -int -main () -{ -return MD5 (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_crypto_MD5=yes -else - ac_cv_lib_crypto_MD5=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_MD5" >&5 -$as_echo "$ac_cv_lib_crypto_MD5" >&6; } -if test "x$ac_cv_lib_crypto_MD5" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBCRYPTO 1 -_ACEOF - - LIBS="-lcrypto $LIBS" - -else - as_fn_error $? "Could not find libcrypto" "$LINENO" 5 -fi - ac_fn_c_check_header_mongrel "$LINENO" "ext2fs/ext2fs.h" "ac_cv_header_ext2fs_ext2fs_h" "$ac_includes_default" if test "x$ac_cv_header_ext2fs_ext2fs_h" = xyes; then : diff --git a/tools/configure.ac b/tools/configure.ac index 1a8e493..873e18d 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -375,7 +375,6 @@ AS_IF([test "x$enable_blktap2" = "xyes"], [ AC_CHECK_LIB([aio], [io_setup], [], [AC_MSG_ERROR([Could not find libaio])]) ]) AC_SUBST(system_aio) -AC_CHECK_LIB([crypto], [MD5], [], [AC_MSG_ERROR([Could not find libcrypto])]) AX_CHECK_EXTFS AC_CHECK_LIB([gcrypt], [gcry_md_hash_buffer], [libgcrypt="y"], [libgcrypt="n"]) AC_SUBST(libgcrypt)