From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Thien-Thi Nguyen Newsgroups: gmane.lisp.guile.bugs Subject: [PATCH] Fix bug: Don't clobber `PKG_CONFIG' when overriding pkg-config search for bdw-gw. Date: Sat, 09 Jan 2010 22:53:27 +0100 Message-ID: <87ocl3lzc8.fsf@ambire.localdomain> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1263074185 24763 80.91.229.12 (9 Jan 2010 21:56:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 9 Jan 2010 21:56:25 +0000 (UTC) To: bug-guile@gnu.org Original-X-From: bug-guile-bounces+guile-bugs=m.gmane.org@gnu.org Sat Jan 09 22:56:17 2010 Return-path: Envelope-to: guile-bugs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NTjHy-0001L8-IV for guile-bugs@m.gmane.org; Sat, 09 Jan 2010 22:56:06 +0100 Original-Received: from localhost ([127.0.0.1]:45623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTjHz-0002Z9-9f for guile-bugs@m.gmane.org; Sat, 09 Jan 2010 16:56:07 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTjHt-0002Xh-Hs for bug-guile@gnu.org; Sat, 09 Jan 2010 16:56:01 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTjHp-0002Vh-DI for bug-guile@gnu.org; Sat, 09 Jan 2010 16:56:01 -0500 Original-Received: from [199.232.76.173] (port=50983 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTjHp-0002VT-5K for bug-guile@gnu.org; Sat, 09 Jan 2010 16:55:57 -0500 Original-Received: from smtp-out113.alice.it ([85.37.17.113]:3442) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NTjHo-0001Bu-Lx for bug-guile@gnu.org; Sat, 09 Jan 2010 16:55:56 -0500 Original-Received: from FBCMMO01.fbc.local ([192.168.68.195]) by smtp-out113.alice.it with Microsoft SMTPSVC(6.0.3790.3959); Sat, 9 Jan 2010 22:55:54 +0100 Original-Received: from FBCMCL01B01.fbc.local ([192.168.69.82]) by FBCMMO01.fbc.local with Microsoft SMTPSVC(6.0.3790.3959); Sat, 9 Jan 2010 22:55:54 +0100 Original-Received: from ambire.localdomain ([79.41.71.208]) by FBCMCL01B01.fbc.local with Microsoft SMTPSVC(6.0.3790.3959); Sat, 9 Jan 2010 22:55:54 +0100 Original-Received: from ttn by ambire.localdomain with local (Exim 4.63) (envelope-from ) id 1NTjFP-0005TW-Rm for bug-guile@gnu.org; Sat, 09 Jan 2010 22:53:27 +0100 X-OriginalArrivalTime: 09 Jan 2010 21:55:54.0934 (UTC) FILETIME=[848AD560:01CA9176] X-detected-operating-system: by monty-python.gnu.org: Windows 2000 SP4, XP SP1+ X-BeenThere: bug-guile@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GUILE, GNU's Ubiquitous Extension Language" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-guile-bounces+guile-bugs=m.gmane.org@gnu.org Errors-To: bug-guile-bounces+guile-bugs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.bugs:4434 Archived-At: `PKG_CONFIG' is AC_SUBSTed into one of the "make installcheck" tests, so clobbering it results in "make installcheck" failure. With this change (and building upon previously submitted patches), i can: $ .../configure -C \ --with-threads \ --prefix /tmp/a/b/z \ BDW_GC_LIBS='-lgc' \ LDFLAGS='-L/home/ttn/local/lib' $ make all check install installcheck to an empty /tmp/a/b/z directory on a Debian Etch Sempron (~35 minutes). Moving right along! thi _____________________________________________________________________________ >From d6d765a2fcb0354146be6492a1212d5ad45fa385 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sat, 9 Jan 2010 22:40:10 +0100 Subject: [PATCH] Fix bug: Don't clobber `PKG_CONFIG' when overriding pkg-config search for bdw-gw. * configure.ac (PKG_PROG_PKG_CONFIG): New top-level call. (PKG_CHECK_MODULES): Call only if both vars `BDW_GC_FLAGS' and `BDW_GC_LIBS' have no, or empty, value. * README: Remove bogus advice to specify "PKG_CONFIG=true". Signed-off-by: Thien-Thi Nguyen --- README | 3 --- configure.ac | 9 ++++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README b/README index e799495..55bfad2 100644 --- a/README +++ b/README @@ -99,10 +99,7 @@ Guile requires the following external packages: .pc file, you can work around this by setting some environment as part of the configure command-line: - - PKG_CONFIG=true - - BDW_GC_CFLAGS= - - BDW_GC_LIBS= diff --git a/configure.ac b/configure.ac index 78c6418..20e2d62 100644 --- a/configure.ac +++ b/configure.ac @@ -1222,7 +1222,14 @@ main () # Boehm's GC library # #-------------------------------------------------------------------- -PKG_CHECK_MODULES([BDW_GC], [bdw-gc]) +dnl See note for PKG_CHECK_MODULES in aclocal.m4. +PKG_PROG_PKG_CONFIG +if test "$BDW_GC_CFLAGS" || test "$BDW_GC_LIBS" ; then : + dnl We don't need to declare those env vars precious; + dnl PKG_CHECK_MODULES does that. +else + PKG_CHECK_MODULES([BDW_GC], [bdw-gc]) +fi CFLAGS="$BDW_GC_CFLAGS $CFLAGS" LIBS="$BDW_GC_LIBS $LIBS" -- 1.6.3.2