From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id 0DB7B3858C52 for ; Tue, 26 Jul 2022 07:19:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0DB7B3858C52 Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26Q68lB2018449 for ; Tue, 26 Jul 2022 07:19:35 GMT Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hg9a9djsg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 26 Jul 2022 07:19:35 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 26Q6ZqF5023008 for ; Tue, 26 Jul 2022 07:19:34 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2170.outbound.protection.outlook.com [104.47.59.170]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3hh5yuecwf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 26 Jul 2022 07:19:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HAas7sIoqWjhesx+AYV5gEZ9LxYHh4V+DTPCRTYg6kC0C4DHI3LWY725DQRH+iF0PW3SsxsmHCGa0fv9iS8wkezoVyVOLj15kUB/pt0yuQfH9zZ0oPTjHTxPCwB60JE/iAQfqV4uEFCUfTEAxsAxFBGLzXhZaR+1yTC30/nQ1i3uWIfcHqBJj74iPbTLzyUBjGiDzAtnCly6PONG0KVsXArcozI8/UMeCCCfmCU5QcBIDWKAj6tbC5qRwhlUMwS5dYN6siLiNKL7VOFWvHimQ1DFZtbFFwhcIYM48SeCiGIxE4ooquNd7S75QCZWk+pIMsAlbOTKyMq6B0LhfSqt+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fav3/w2CkG9T/vWTbkWb/Vrsm0kaHD8TXTLaoQoBhWU=; b=k2GB59m1ZVzBQZdc6jZF1tP1EHu9oKCFq8HbAy8D+C1dCs7s9tH82dXsXMwq2UxZah5qsqqdWPf/VVl8zbMACLSsFeEmQ0eiOqrIbIS9QiSCwONeEii6XjYCgSItnZ/1RhFmlcswDHgndv/L3wn7QTYYyODM4Kv7IwuBXI+MPojXWd8paf05ZmmFQDQSmemejogJNvJMxR6j5jfd6RCiueB43Ous4OnEY7/QNcGXSXCnqKl1KGh3rEhzx9GfpXFcOhpVQLk5HQ0ZtIDM/ctAI2tomZjEmKfYsVhq19nuNnTnVQ7elDTrJvcP5RX12Pe4L450oPG8G0zJ8N1mjPAv6A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) by BY5PR10MB4257.namprd10.prod.outlook.com (2603:10b6:a03:211::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.19; Tue, 26 Jul 2022 07:19:32 +0000 Received: from SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::9948:c18:476c:c559]) by SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::9948:c18:476c:c559%6]) with mapi id 15.20.5458.024; Tue, 26 Jul 2022 07:19:32 +0000 From: vladimir.mezentsev@oracle.com To: binutils@sourceware.org Subject: [PATCH] gprofng: check for the makeinfo version Date: Tue, 26 Jul 2022 00:19:24 -0700 Message-Id: <20220726071924.2754747-1-vladimir.mezentsev@oracle.com> X-Mailer: git-send-email 2.27.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: DM5PR07CA0107.namprd07.prod.outlook.com (2603:10b6:4:ae::36) To SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2a81df27-07ad-48d5-ce69-08da6ed72faa X-MS-TrafficTypeDiagnostic: BY5PR10MB4257:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Z1YPEObzy/MuBmuIE2w6GO7hp0O8cE1CRmrsIEImp3DTl36dv25t+9Uc/oZlgeGISA6SThCRCjisMxom42MuXy6mzEnEuV3kHkctX+VsxLmJqwzMRdrSXfsH4E/h94GqIJHt2rrWABd3iOljcE6x+nA0q/dsBqt2JDpcS2M3DGUECb+o7GV5lChJKt9AVTGOT7UBaoDuUVbNmSEHhn30zESY2OLBrhqrJSVNzPA8DVb1UEEVPNckjGuduS2+XgoZ0NizEyFNw1s9pqYNlezfLHRdMDXOrp9QF4l6E+8dMaMN9wmnfGmNjEjiKR2GP7AkbOmYh765ZFwEtUDKjygtL/p7vqNzTLb2kCzV6GpwKfnl3WkY+cL2tmbWpCW6sxNfBp/M78VArpm9+hcg+lAu4rnSCz54+DA250fm91kf+99edoi1pS8+Y/lEHvdtm2cy6qqKcg1PFwvp6KKOcde84ERqqzWE8r/A0bQjy360tQ16bDtioehcqiNTgkTAH1BNyKn5NjfLlN+t2Co62VnSA+OTu92pT44MiwMkuCAEDzwkQ4EtB1IZNtFEUR/QICQQgHRH0anBUSSGQDIPuyUrBLK8ddk7Ffmzzi4hd5w4tyEADhrOSIJRnKIAoUOxdI4BMfWN/Nqg4UYyer4IAflOhEsKlBVuxgsFcIM7B+ONxQ9aHACTvKBD+q0hH5RZmiRBS8xZdCcKGGd08brwy5U5qfyCabMYib5KOo53UwwFhrmiBXwg9h5+Qi57eOgGfefk X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA2PR10MB4636.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(396003)(346002)(136003)(376002)(39860400002)(366004)(8936002)(478600001)(186003)(1076003)(6506007)(5660300002)(6486002)(41300700001)(36756003)(6666004)(316002)(66476007)(6512007)(83380400001)(52116002)(2616005)(2906002)(66556008)(66946007)(9686003)(38100700002)(6916009)(86362001)(8676002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rFgz4yl8wbX6+oxpl+riaLaPec5jFxqSs6yMl1EA5q4zl7Jkawzx/1kXx8PG?= =?us-ascii?Q?QvUk/i8RSjae9sn9K35AXezKn9dgMQXpc6m8/F/eossjKhYVgYs1Iec7gmTV?= =?us-ascii?Q?gzL2whSkB7OJnjbgvH0hBJ1vh2Wbycbz0zze8Qmt1GrrWhgPm6jP0dlKQk6m?= =?us-ascii?Q?lHIA/Dn0hoatEciMGZN4vEhfwiQbcIPxmtx/w43q3xjIeppIwSa9grKhrkSD?= =?us-ascii?Q?PyxjdiQdb7uHgxVG7iATg8YYPlQsf+ECwoVs+daZTKypEABXIzNLlhO2fsn0?= =?us-ascii?Q?PyVJMjAPzy2k8jsgLBTRsU037r2wIQKpiFgpigj2HJhG9yBzwytAeIB7IU1T?= =?us-ascii?Q?7rolEW12Jq2/PYNgPHXL3OyaPVBQhQw4u6WQm+VGwydZWG3j3QXlKF3y++c6?= =?us-ascii?Q?MEhlLZfUEjF36GKB9Hjqb/9eWeOgefkPK0t0Rp5/JjU2JOpo86FC44lp2kJ3?= =?us-ascii?Q?Y8lgBy+xYopviaXTl7UKKtJ2DA33W/vFgX4A6F28KNzomm6meQUsi0GBhZoK?= =?us-ascii?Q?lWASfjCTny0nHSi4z2+PRrJVYXfI5dZ5HVGFAcKp5MWO12W3SzyRjyCelttE?= =?us-ascii?Q?CHCPJvGTH0tZ9Q5ZC1Wf5fsibV58xkzXXWNZdZS31RcxQ77j1e54C6/JMjjJ?= =?us-ascii?Q?3lwrd9uzUCRFIWFOZsWAGonmx2KzZm7TIDyGNQMvaABDWrIFk1p0ii6kAMnF?= =?us-ascii?Q?vEfyBX+T0DbPi5nuzktNfVVI1ONiORsjxjaYaFGINfeDW1jpXQmDj5uzDoPA?= =?us-ascii?Q?Jszfm1k5klFPug1sxYmkojTcA9gectZ3hhtTCfwJLALYRLLP3M3pM4h1K8s4?= =?us-ascii?Q?Rl7giWGpvA3vUGKTUxwJg6XIuLDmqHEN/fqG4Q1MpNUW7qU8nUBWbMaa0GB8?= =?us-ascii?Q?w8iy4NqzJsmIQiX4hLs723ATG1SS+as9MK8T6gMZvT2T0pB8VsaXGAb9Dbgu?= =?us-ascii?Q?DeWRiEv4iVEVJWBjYD7eqIYG9O53vEuzJE4T0WlMzqVn2pvtv+03DOFnUdSJ?= =?us-ascii?Q?hJgVrgBSWQl/LGRT3aRQqjSpLdHOS+acemD6aUXPOyP55y4wos2W8n856FAq?= =?us-ascii?Q?+HW1kXNNFTn0NDM0ULMYeEUvbHsI0ZUzwcWcRbmWyUSHvGxhws2pQJDdRHed?= =?us-ascii?Q?ytKu/lzh0PbUba5uVyxm43rqekTU87ZS3Y3eYJaZdx4v7Xer1pwU3NqfigDY?= =?us-ascii?Q?kjiP7XvXiv/IIV//c71mWR7DVfefqcXJcpq0XjQqWGHbaNlYaBCaZAnQ0miL?= =?us-ascii?Q?2Zjul36MJxWxqnuznnldEr23+F2ReYNQKQiJwPCLqswCz9xzz1t8uszKAtab?= =?us-ascii?Q?kkDc9Kw0LnWuA6A2HYYwzuL4owM9z98VgLgukzSxhvui9F0q5NgBkVigmqXq?= =?us-ascii?Q?AMnx5GBHyxeWuPeENfTjViRVkvdfWYOuGXtlopIqpwY6FbRD6gImGSumeAoY?= =?us-ascii?Q?sIri8mSyI8cZV19OCk15jGV/Sltfo7FzxiTrMtdpDWiJ3MQt8HoopJLULKrD?= =?us-ascii?Q?Hs+kXy0UQh+mVz2hI3TjQzRXbSKWgLC37MgDQeevwliQJ+tNvQkO1T3p5jRv?= =?us-ascii?Q?QzdnCSsgszQ9lN0kx6Bi2p4ZulaPcOW3dzvQgGhiLX3iv/d+u1EG0UN/lq/r?= =?us-ascii?Q?pJUzbV5MphZpWYQUFO/vzOfo4mv72uWwX0JX4TB2WiML?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a81df27-07ad-48d5-ce69-08da6ed72faa X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4636.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 07:19:32.4499 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VRvJ/foIj1YEQjIZsAe3jtYzKNEz6npAFkde/Kz5HDvU7aIj8FeRO1kwXH2RLGR1rO58snzS3Wu2ffwtPA8/+kbKsy7IObhLnqOyytFqDYI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4257 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-26_02,2022-07-25_03,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999 mlxscore=0 suspectscore=0 adultscore=0 bulkscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207260028 X-Proofpoint-GUID: sEbe67by1Y8cJOc77cJigufWXBSupPT8 X-Proofpoint-ORIG-GUID: sEbe67by1Y8cJOc77cJigufWXBSupPT8 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jul 2022 07:19:38 -0000 From: Vladimir Mezentsev Sorry. I forgot to rerun `git format-patch $(git merge-base master HEAD)` and sent a non-updated version of the patch in my previous email. gprofng/ChangeLog 2022-07-25 Vladimir Mezentsev PR gprofng/29368 * configure.ac: Check for the makeinfo version. * configure: Rebuild. --- gprofng/configure | 64 ++++++++++++++++++++++++++++++++++++++++++-- gprofng/configure.ac | 22 ++++++++++++--- 2 files changed, 81 insertions(+), 5 deletions(-) diff --git a/gprofng/configure b/gprofng/configure index 54db918b2a5..fad5b030072 100755 --- a/gprofng/configure +++ b/gprofng/configure @@ -16709,13 +16709,73 @@ fi # Generate manpages, if possible. +build_man=false if test $cross_compiling = no; then HELP2MAN=${HELP2MAN-"${am_missing_run}help2man"} - build_man=true + for ac_prog in makeinfo +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MAKEINFO+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MAKEINFO"; then + ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. else - build_man=false +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MAKEINFO="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +MAKEINFO=$ac_cv_prog_MAKEINFO +if test -n "$MAKEINFO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEINFO" >&5 +$as_echo "$MAKEINFO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$MAKEINFO" && break +done +test -n "$MAKEINFO" || MAKEINFO=""@echo makeinfo missing; true"" + + case "$MAKEINFO" in + *true) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gprofng: makeinfo is missing. Info documentation will not be built." >&5 +$as_echo "$as_me: WARNING: gprofng: makeinfo is missing. Info documentation will not be built." >&2;} + ;; + *) + case x"`$MAKEINFO --version | grep 'GNU texinfo'`" in + x*\ [1-5].*|x*\ 6.[0-4].* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gprofng: $MAKEINFO is too old. Info documentation will not be built." >&5 +$as_echo "$as_me: WARNING: gprofng: $MAKEINFO is too old. Info documentation will not be built." >&2;} + MAKEINFO="@echo $MAKEINFO is too old, 6.5 or newer required; true" + ;; + x* ) + build_man=true + ;; + esac + ;; + esac + fi if test x$build_man = xtrue; then BUILD_MAN_TRUE= diff --git a/gprofng/configure.ac b/gprofng/configure.ac index 5a0fe1ea477..e9453109602 100644 --- a/gprofng/configure.ac +++ b/gprofng/configure.ac @@ -184,11 +184,27 @@ AM_CONDITIONAL(TCL_TRY, test "${ac_cv_libctf_tcl_try}" = yes) AM_ZLIB # Generate manpages, if possible. +build_man=false if test $cross_compiling = no; then AM_MISSING_PROG(HELP2MAN, help2man) - build_man=true -else - build_man=false + AC_CHECK_PROGS([MAKEINFO], makeinfo, ["@echo makeinfo missing; true"]) + case "$MAKEINFO" in + *true) + AC_MSG_WARN([gprofng: makeinfo is missing. Info documentation will not be built.]) + ;; + *) + case x"`$MAKEINFO --version | grep 'GNU texinfo'`" in + x*\ [[1-5]].*|x*\ 6.[[0-4]].* ) + AC_MSG_WARN([gprofng: $MAKEINFO is too old. Info documentation will not be built.]) + MAKEINFO="@echo $MAKEINFO is too old, 6.5 or newer required; true" + ;; + x* ) + build_man=true + ;; + esac + ;; + esac + AC_SUBST(MAKEINFO) fi AM_CONDITIONAL([BUILD_MAN], [test x$build_man = xtrue]) -- 2.27.0