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 BDEC43858D37 for ; Wed, 6 Apr 2022 22:37:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BDEC43858D37 Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 236LH0p4004957 for ; Wed, 6 Apr 2022 22:37:51 GMT Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com with ESMTP id 3f6d932bd3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 06 Apr 2022 22:37:50 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 236MUVwr028579 for ; Wed, 6 Apr 2022 22:37:50 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2048.outbound.protection.outlook.com [104.47.66.48]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3f9803cyx1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 06 Apr 2022 22:37:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T7XHBHunmzTHBKN0cD6oBUyYBmJQzUaGyUDmTb00Ydhclng2Evw513tG+un9WfBl3z6+THi61QriDBJksvXzpSjAKwn31uBKiFuTiJ9nkIBpkw9DA5qCSrz5JxVSXwo/852Gwv5odaLBJ7FGs3p7HUJk8H1ICN9ss6ovf2L7u36gAkv9RFJ675+B8IdYZJJhx61Gv2JnWUw0AgRM9Wo+8IQGEqgxzsWn4Sn1Il1VeBu5VVkEMaiyA/PGC2neRuDm9wKQm42mSBV273/Yeu113xeB9CCiVLlUjYrV8B0pXi/H6YCYXmih4m9THnG3h+fx4bFhJCQYgzefDRBDkYhYdA== 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=prsSOg8/MhTtnsdhfb5gm0lVOOA3l81TCpsWSSqazBE=; b=E/wfCYv2FUCQ7gfD0G9w9Zf2IN67eJKqr1nhEj3Jn5TbQ346JyZaNmgjmkJ5BF5HPtcNraLJhcKKOftqXlKzhsVVqMmVQrUloVqQozdLBAbm7rvJ5SNMrOWCrTxAiJanp8MYA8m+yrQlyPX88111YBwxDOP5NzzemDSUl1LumihtCW2v7POey7/KVgMhxM1NRAmdRt2i3VL6cYzD7CPllbMa/F/7wbuW7SK7uQ2bh2KY/U8wG6M3NFuzbJEbhMfQULIUZ87bpFIN8DSSELOBgpd7+ZYdwWGP33BKV/FbIskk1NDn2OvOuxhSYZhYAhYB5c8iARmk5Or6qmEylStmAw== 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 DM6PR10MB2922.namprd10.prod.outlook.com (2603:10b6:5:6f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.31; Wed, 6 Apr 2022 22:37:47 +0000 Received: from SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::d937:80f9:3f57:7cdb]) by SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::d937:80f9:3f57:7cdb%8]) with mapi id 15.20.5144.022; Wed, 6 Apr 2022 22:37:47 +0000 From: vladimir.mezentsev@oracle.com To: binutils@sourceware.org Subject: [PATCH] gprofng: zlib handling Date: Wed, 6 Apr 2022 15:37:39 -0700 Message-Id: <20220406223739.2248496-1-vladimir.mezentsev@oracle.com> X-Mailer: git-send-email 2.27.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: DM6PR21CA0018.namprd21.prod.outlook.com (2603:10b6:5:174::28) 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: b67f5aa5-2b61-434e-ccfc-08da181e130a X-MS-TrafficTypeDiagnostic: DM6PR10MB2922:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Gf9d1sP8JnfyZeMxY7yT61Ngi1VzU1qtomQ9SVNbXWvH1mEMoFmLpDPQKFSAp0W5uhVgXau9CBmoMK5Hbai42P7SIYHBQF00d/MCoX9qmx9FRBmGtG5CplG0sr5EPFlHUke5OWG/rRweOiY0acU3qFaFA5AGK0cSRldYjYvUVgXNMNLsX9eMlXoqvWgM96AGJ1I+JjkyWF0LXFsmpTDZH45VYP4CAMaIDHPJH1sSi9JsCvTFN1HOGhAg5ZRZ8erA6S5WSqS3B+o728+b55RVlfoRdeddfNfYpJy50hLqGiTYBCjizp5Itywf+slKPyS0LcfbG8Z/iKdbXc+yjipfqW6MmJddwOTet79JMHOmMHir2uAt3Z8vC4OfSBh0Gm7pr8OU3ysR6wl1oJH9LqoSUvci5pbtlsSOVBmyN63eQ3rQLusDoJwbVWeTyv7DF1By/wylCM6RWWEuAZfFLYNv7dK/n6eumHrPchXn+WF/9Rn9aQNzCxqAYQJB3q/oqig2tlyb4Za8mjOxdxDFjwdJZnMjRyO8WF8vRRD25IVMbnm+pJ0a6s6rMWIH/Z+kaDrVGZ3xX7optWHbcl95peZ0CLGZxOhpL34rHI4oP6ep6EmrM5ry6rLrxA7BzSYmNLd8ue0G74sq1PtF2TkIB8HvGqicdoZRhZGQNCdiHfQfgxr/2TUZ05mniq1zuw/iXZ+Oh7Nj8RTMJRIkmX+KiikGNohGgHWyusLNjCrJcDpaOw9Tnnb5Jw/XrsvHEARRm8DikHRmRM18bOQkc0HVnzxiuQ== 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:(13230001)(366004)(38100700002)(508600001)(5660300002)(38350700002)(2616005)(6506007)(1076003)(30864003)(9686003)(2906002)(6666004)(6486002)(6512007)(316002)(52116002)(6916009)(66476007)(66946007)(66556008)(26005)(83380400001)(86362001)(36756003)(186003)(8936002)(8676002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DJ+eRWegKXXkXZ1Vzzci0P2v4AcwL8G3yh4edwdeMUEqjCHQMfE5FeSDPJfy?= =?us-ascii?Q?rqHGANNbf4rZp0XjWPwFkn/dEmUi1GdQ95sdAQE8XCGKMksh+mqZc/ydjN5T?= =?us-ascii?Q?35rq6FfeDOZfMLTTZJT/6Kjn50b0o8ELHIZV++IFmW2zY0Qe3jdeY9cs9pGS?= =?us-ascii?Q?aFCga+EYu/clgtZgHhBOwpjGZNybFwHt4ryXOOUSRK5MXirhERwnu/yw6WC/?= =?us-ascii?Q?ls1mEFrKet3Uatx87qGekS/dxRQeYk7GGiP6Vh+bd+SAx0y48dQ33uL5zgsl?= =?us-ascii?Q?/UQdEbKrKzMM2L2Z6LR9hksRnKggwJibHoAqMpB7Yl7adqgYMcordpLmKN5D?= =?us-ascii?Q?gpCYgUNkzIOChZsM89AhXuR+90U1NOw/M1pdepCggbAbOurtGbpUqA3xRU5W?= =?us-ascii?Q?dyExAwQa79KXSkapKPSjMKrEnXgHyu41ApDRIFSplU+MLyFRIIbje0a2zZeo?= =?us-ascii?Q?QiG+jE9ZOB2Ps8JGn0DIG2XgnmiVroTnuq98FD/Dc5YV+3EQvpG8Dd9wwbsw?= =?us-ascii?Q?bgDYEGZ2bO7yzR7qsECHdK9jTgvFzmhi4nT6NaLNPhabnUNqPAym94FGqzdF?= =?us-ascii?Q?xfYdUNaZmc5/wfFUuXtj+l9KhbqYbbHoNeRDJWmNzZb5uq9ymFyFSx57reuO?= =?us-ascii?Q?bbclnJKSgTxPWRH442TXX+BenSvGiTLt/lluUEjiGYY5mhZuXV0bF2ZVh+3t?= =?us-ascii?Q?qIn+86IuOZOzCgg7R7I0z/oSEmXjBBDvw6h8oQHTckwrYzJ8iwjMfa1MU1pn?= =?us-ascii?Q?uqWebuMYyrnGsnGs/clmkJeciKCx/XJcAEOr/afmC8iuWlLzN+XKuLEqm35O?= =?us-ascii?Q?GQLRMCcSdVfQtk3rOg2HzhwGH3cwWrpXtbjHcxwf28bu64A/edimATRHNt5I?= =?us-ascii?Q?cQnQq2e0HQyYwY/lbLoIgKUDgG9AJPGmEfF8Ndpu4yVS2PGUE2abA0EDTHOE?= =?us-ascii?Q?mrzFhxm4pDbCHorSuXpSmc1hwUZGrMK9pQUehOGAvY/VyrlcGACr2wDmgJl5?= =?us-ascii?Q?3gBXYViDd8inrSNgYuD1KVrsGmBXtOpeWuOeYzAs6tRCpv9eH7xj4oop7zdA?= =?us-ascii?Q?akk9mDT0smw9iyGeOMTN4xAO6e2Rw4Jmp4PIMW7PAQWJ9kw3uWmThG0bTAOS?= =?us-ascii?Q?iYlNKo7pxwbkgp5tqEDmLoFdajSQCDeZrMIXp2fArMfVr43A/PpPdfkNzcrY?= =?us-ascii?Q?786g9ZPMe7+nlET1Jj6Vrz9q0R2qN69+/aui3xqROHBmYzVBt4qzUI1hY8Ws?= =?us-ascii?Q?exg6wOM47m/LXPMHsd6HgIexW2zZn3L1Lir8FwX6QExj5AHL2mFRGoAmStQi?= =?us-ascii?Q?pMx0ffqqJkzKbJ3rcdkq74e+FKWfu+h7OinwSF4xWE+nyGTHwYSOI9y+gh4w?= =?us-ascii?Q?EGZgYcTZ977Haqn7H2/+DQJa5ueCh8YnhXq0c9WLa+weBVo/lf1L/349e2lC?= =?us-ascii?Q?ip2pEZgqlFMwtIiIrjDIv/vQf1f6yiSXljsL1vpZxTe5nBSCQeGXFEf4DN58?= =?us-ascii?Q?/+56X98P1PwivFh9gxLYZew0chZEuQeeadkjmGbJcLciyoSLLVp+0U6Up87e?= =?us-ascii?Q?yf2nzqcRXLgmKZJvxZnm1Y5qKsJmdzzVYwnOB7VRNhhgHor8+y9Ic6ZUP+fW?= =?us-ascii?Q?sUUrzz16L2QLNTNeY7rB0wdhuQ1llnvWHx0cPV2SjFeW0I6WYrA5S+NXvsJh?= =?us-ascii?Q?BjtJLKvuaC5a2/Dwm8xUlgKf2LzL/KW1KLofHQaihADvfUXx9Tf1ViIqamRc?= =?us-ascii?Q?CtR42KX/197fR+oECTk+oP6rC1xvrkc=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b67f5aa5-2b61-434e-ccfc-08da181e130a X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4636.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2022 22:37:47.8032 (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: ANk0i9l0mhC0CWu9D2Zb9D5E0q4lTll+M0Re7DbiFACO6/W/rMisigK5mXgD1o64Nagf7gvmX3WMYkJ6S5yP/7BfqLGvNvRvGHzILoVy2zk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB2922 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.425, 18.0.850 definitions=2022-04-06_13:2022-04-06, 2022-04-06 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 malwarescore=0 adultscore=0 suspectscore=0 spamscore=0 mlxlogscore=999 bulkscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204060111 X-Proofpoint-ORIG-GUID: hLeDbMQKJTxwbD9KnqncxBKyx_DLGAAw X-Proofpoint-GUID: hLeDbMQKJTxwbD9KnqncxBKyx_DLGAAw X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Wed, 06 Apr 2022 22:37:58 -0000 From: Vladimir Mezentsev gprofng/ChangeLog 2022-04-06 Vladimir Mezentsev * configure.ac: Add AM_ZLIB. * src/Makefile.am: Add $(ZLIBINC) and $(ZLIB). * gprofng/src/DbeSession.h: Likewise. * configure: Regenerate. * Makefile.in: Regenerate. * doc/Makefile.in: Regenerate. * gp-display-html/Makefile.in: Regenerate. * src/Makefile.in: Regenerate. --- gprofng/Makefile.in | 4 +++- gprofng/configure | 25 +++++++++++++++++-- gprofng/configure.ac | 2 ++ gprofng/doc/Makefile.in | 4 +++- gprofng/gp-display-html/Makefile.in | 4 +++- gprofng/src/Makefile.am | 18 +++++++++----- gprofng/src/Makefile.in | 37 +++++++++++++++++++---------- 7 files changed, 71 insertions(+), 23 deletions(-) diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in index 3c41d247590..e77b06d60e4 100644 --- a/gprofng/Makefile.in +++ b/gprofng/Makefile.in @@ -114,7 +114,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/ax_pthread.m4 \ $(top_srcdir)/config/bison.m4 $(top_srcdir)/../bfd/version.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/../config/zlib.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ @@ -375,6 +375,8 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +zlibdir = @zlibdir@ +zlibinc = @zlibinc@ ACLOCAL_AMFLAGS = -I . -I .. AUTOMAKE_OPTIONS = dejagnu foreign @BUILD_COLLECTOR_TRUE@COLLECTOR_SUBDIRS = libcollector diff --git a/gprofng/configure b/gprofng/configure index e21f7886b77..08af658da8e 100755 --- a/gprofng/configure +++ b/gprofng/configure @@ -641,6 +641,8 @@ LD_NO_AS_NEEDED BUILD_MAN_FALSE BUILD_MAN_TRUE HELP2MAN +zlibinc +zlibdir TCL_TRY_FALSE TCL_TRY_TRUE EXPECT @@ -804,6 +806,7 @@ enable_werror_always enable_gprofng_tools with_jdk enable_gprofng_debug +with_system_zlib ' ac_precious_vars='build_alias host_alias @@ -1462,6 +1465,7 @@ Optional Packages: both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-jdk=PATH specify prefix directory for installed JDK. + --with-system-zlib use installed libz Some influential environment variables: CC C compiler command @@ -12142,7 +12146,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12145 "configure" +#line 12149 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12248,7 +12252,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12251 "configure" +#line 12255 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16674,6 +16678,23 @@ fi + # Use the system's zlib library. + zlibdir="-L\$(top_builddir)/../zlib" + zlibinc="-I\$(top_srcdir)/../zlib" + +# Check whether --with-system-zlib was given. +if test "${with_system_zlib+set}" = set; then : + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi + +fi + + + + + # Generate manpages, if possible. if test $cross_compiling = no; then diff --git a/gprofng/configure.ac b/gprofng/configure.ac index 95bffe0e4e2..550dd80d331 100644 --- a/gprofng/configure.ac +++ b/gprofng/configure.ac @@ -17,6 +17,7 @@ dnl along with this program; see the file COPYING3. If not see dnl . m4_include([../bfd/version.m4]) +m4_include([../config/zlib.m4]) AC_INIT([gprofng], BFD_VERSION) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([subdir-objects]) @@ -182,6 +183,7 @@ fi` ]) AM_CONDITIONAL(TCL_TRY, test "${ac_cv_libctf_tcl_try}" = yes) +AM_ZLIB # Generate manpages, if possible. if test $cross_compiling = no; then diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in index 7eb552b2a6d..03d9e242d9a 100644 --- a/gprofng/doc/Makefile.in +++ b/gprofng/doc/Makefile.in @@ -115,7 +115,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/ax_pthread.m4 \ $(top_srcdir)/config/bison.m4 $(top_srcdir)/../bfd/version.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/../config/zlib.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/version.texi \ @@ -357,6 +357,8 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +zlibdir = @zlibdir@ +zlibinc = @zlibinc@ AUTOMAKE_OPTIONS = info-in-builddir foreign no-texinfo.tex info_TEXINFOS = gprofng.texi gprofng_TEXINFOS = fdl.texi diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/Makefile.in index e0df2d73be8..e75703c9a0b 100644 --- a/gprofng/gp-display-html/Makefile.in +++ b/gprofng/gp-display-html/Makefile.in @@ -115,7 +115,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/ax_pthread.m4 \ $(top_srcdir)/config/bison.m4 $(top_srcdir)/../bfd/version.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/../config/zlib.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -321,6 +321,8 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +zlibdir = @zlibdir@ +zlibinc = @zlibinc@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I . -I .. -I ../.. dist_man_MANS = gp-display-html.1 diff --git a/gprofng/src/Makefile.am b/gprofng/src/Makefile.am index 4c5a836b3fd..47fd8c9302b 100644 --- a/gprofng/src/Makefile.am +++ b/gprofng/src/Makefile.am @@ -98,10 +98,16 @@ CSOURCES = \ LIBGPROFNG = libgprofng.la +# This is where we get zlib from. zlibdir is -L../zlib and zlibinc is +# -I../zlib, unless we were configured with --with-system-zlib, in which +# case both are empty. +ZLIB = @zlibdir@ -lz +ZLIBINC = @zlibinc@ + AM_CPPFLAGS = $(GPROFNG_CPPFLAGS) -DLOCALEDIR=\"@localedir@\" -I.. -I$(srcdir) \ -I$(srcdir)/../common \ -I$(srcdir)/../../include -I$(srcdir)/../../opcodes \ - -I../../bfd -I$(srcdir)/../../bfd + -I../../bfd -I$(srcdir)/../../bfd $(ZLIBINC) AM_CFLAGS = $(GPROFNG_CFLAGS) $(PTHREAD_CFLAGS) \ $(GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS) \ $(GPROFNG_NO_SWITCH_CFLAGS) @@ -133,19 +139,19 @@ dbe_DATA = $(srcdir)/gprofng.rc bin_PROGRAMS = gp-archive gp-collect-app gprofng gp-display-text gp-display-src gp_archive_SOURCES = gp-archive.cc ArchiveExp.cc -gp_archive_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) +gp_archive_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gp_collect_app_SOURCES = gp-collect-app.cc checks.cc envsets.cc count.cc -gp_collect_app_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) +gp_collect_app_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gprofng_SOURCES = gprofng.cc -gprofng_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) +gprofng_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gp_display_src_SOURCES = gp-display-src.cc -gp_display_src_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) +gp_display_src_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gp_display_text_SOURCES = gp-display-text.cc ipc.cc ipcio.cc -gp_display_text_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) +gp_display_text_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) if BUILD_MAN diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in index 0cdc3b9477b..7d3f9c6f7d0 100644 --- a/gprofng/src/Makefile.in +++ b/gprofng/src/Makefile.in @@ -120,7 +120,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/ax_pthread.m4 \ $(top_srcdir)/config/bison.m4 $(top_srcdir)/../bfd/version.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/../config/zlib.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -193,21 +193,26 @@ libgprofng_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ PROGRAMS = $(bin_PROGRAMS) am_gp_archive_OBJECTS = gp-archive.$(OBJEXT) ArchiveExp.$(OBJEXT) gp_archive_OBJECTS = $(am_gp_archive_OBJECTS) -gp_archive_DEPENDENCIES = $(LIBGPROFNG) $(am__DEPENDENCIES_1) +gp_archive_DEPENDENCIES = $(LIBGPROFNG) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_gp_collect_app_OBJECTS = gp-collect-app.$(OBJEXT) checks.$(OBJEXT) \ envsets.$(OBJEXT) count.$(OBJEXT) gp_collect_app_OBJECTS = $(am_gp_collect_app_OBJECTS) -gp_collect_app_DEPENDENCIES = $(LIBGPROFNG) $(am__DEPENDENCIES_1) +gp_collect_app_DEPENDENCIES = $(LIBGPROFNG) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_gp_display_src_OBJECTS = gp-display-src.$(OBJEXT) gp_display_src_OBJECTS = $(am_gp_display_src_OBJECTS) -gp_display_src_DEPENDENCIES = $(LIBGPROFNG) $(am__DEPENDENCIES_1) +gp_display_src_DEPENDENCIES = $(LIBGPROFNG) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_gp_display_text_OBJECTS = gp-display-text.$(OBJEXT) ipc.$(OBJEXT) \ ipcio.$(OBJEXT) gp_display_text_OBJECTS = $(am_gp_display_text_OBJECTS) -gp_display_text_DEPENDENCIES = $(LIBGPROFNG) $(am__DEPENDENCIES_1) +gp_display_text_DEPENDENCIES = $(LIBGPROFNG) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_gprofng_OBJECTS = gprofng.$(OBJEXT) gprofng_OBJECTS = $(am_gprofng_OBJECTS) -gprofng_DEPENDENCIES = $(LIBGPROFNG) $(am__DEPENDENCIES_1) +gprofng_DEPENDENCIES = $(LIBGPROFNG) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -440,6 +445,8 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +zlibdir = @zlibdir@ +zlibinc = @zlibinc@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I . -I .. -I ../.. CCSOURCES = \ @@ -520,10 +527,16 @@ CSOURCES = \ $(NULL) LIBGPROFNG = libgprofng.la + +# This is where we get zlib from. zlibdir is -L../zlib and zlibinc is +# -I../zlib, unless we were configured with --with-system-zlib, in which +# case both are empty. +ZLIB = @zlibdir@ -lz +ZLIBINC = @zlibinc@ AM_CPPFLAGS = $(GPROFNG_CPPFLAGS) -DLOCALEDIR=\"@localedir@\" -I.. -I$(srcdir) \ -I$(srcdir)/../common \ -I$(srcdir)/../../include -I$(srcdir)/../../opcodes \ - -I../../bfd -I$(srcdir)/../../bfd + -I../../bfd -I$(srcdir)/../../bfd $(ZLIBINC) AM_CFLAGS = $(GPROFNG_CFLAGS) $(PTHREAD_CFLAGS) \ $(GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS) \ @@ -549,15 +562,15 @@ libgprofng_la_LIBADD = $(top_builddir)/../opcodes/libopcodes.la \ dbedir = $(prefix)/etc dbe_DATA = $(srcdir)/gprofng.rc gp_archive_SOURCES = gp-archive.cc ArchiveExp.cc -gp_archive_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) +gp_archive_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gp_collect_app_SOURCES = gp-collect-app.cc checks.cc envsets.cc count.cc -gp_collect_app_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) +gp_collect_app_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gprofng_SOURCES = gprofng.cc -gprofng_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) +gprofng_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gp_display_src_SOURCES = gp-display-src.cc -gp_display_src_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) +gp_display_src_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gp_display_text_SOURCES = gp-display-text.cc ipc.cc ipcio.cc -gp_display_text_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) +gp_display_text_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) # The man pages depend on the version number and on a help2man include file. @BUILD_MAN_TRUE@common_mandeps = $(top_srcdir)/../bfd/version.m4 -- 2.27.0