From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ken Raeburn Newsgroups: gmane.lisp.guile.devel Subject: two Mac guile patches Date: Thu, 29 Oct 2009 13:51:27 -0400 Message-ID: <737F0FA3-95CA-4C7D-AF70-4B40D653C98C@mit.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (Apple Message framework v936) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1256878841 7403 80.91.229.12 (30 Oct 2009 05:00:41 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 30 Oct 2009 05:00:41 +0000 (UTC) To: guile-devel Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Fri Oct 30 06:00:34 2009 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1N3jbC-0003PX-3u for guile-devel@m.gmane.org; Fri, 30 Oct 2009 06:00:30 +0100 Original-Received: from localhost ([127.0.0.1]:39256 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N3jbB-0001IM-ID for guile-devel@m.gmane.org; Fri, 30 Oct 2009 01:00:29 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N3Z9q-0001aR-Jr for guile-devel@gnu.org; Thu, 29 Oct 2009 13:51:34 -0400 Original-Received: from [199.232.76.173] (port=46149 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N3Z9q-0001aB-9a for guile-devel@gnu.org; Thu, 29 Oct 2009 13:51:34 -0400 Original-Received: from biscayne-one-station.mit.edu ([18.7.7.80]:48861) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1N3Z9n-0007wQ-NE for guile-devel@gnu.org; Thu, 29 Oct 2009 13:51:32 -0400 Original-Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by biscayne-one-station.mit.edu (8.13.6/8.9.2) with ESMTP id n9THpGTq007247; Thu, 29 Oct 2009 13:51:17 -0400 (EDT) Original-Received: from [10.0.0.158] ([76.119.237.235]) (authenticated bits=0) (User authenticated as raeburn@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id n9THpTuq029150 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Thu, 29 Oct 2009 13:51:30 -0400 (EDT) X-Mailer: Apple Mail (2.936) X-Scanned-By: MIMEDefang 2.42 X-Spam-Score: 0.00 X-detected-operating-system: by monty-python.gnu.org: Solaris 9 X-Mailman-Approved-At: Fri, 30 Oct 2009 01:00:25 -0400 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:9610 Archived-At: Two patches here, both relating to the fact that the GNU "libtool" package is installed as "glibtool" (both in the main OS and in macports; haven't checked fink), and "/usr/bin/libtool" is a different tool, from Apple. The autogen script wants to display a version number from libtool before it'll run autoreconf, and will error out if it can't do so. The gdb-uninstalled-guile script assumes it can find a working "libtool" via $PATH, and there's a "libtool" at the top of the build tree which is presumably the one we actually want, but uninstalled-env doesn't add ${top_builddir} to $PATH. Since the libtool script is the only thing there we'd want to find that way, I changed gdb-uninstalled- guile rather than uninstalled-env. Fix autogen.sh for Mac OS X. * autogen.sh: If uname indicates that the OS is Darwin, run "glibtool" instead of "libtool" for the version number check. diff --git a/autogen.sh b/autogen.sh index 8062d7e..78b6802 100755 --- a/autogen.sh +++ b/autogen.sh @@ -15,7 +15,11 @@ autoconf --version echo "" automake --version echo "" -libtool --version +if test "`uname -s`" = Darwin; then + glibtool --version +else + libtool --version +fi echo "" ${M4:-/usr/bin/m4} --version echo "" * meta/gdb-uninstalled-guile.in: Specify a path to libtool. diff --git a/meta/gdb-uninstalled-guile.in b/meta/gdb-uninstalled- guile.in index 21a9e86..389bcc9 100644 --- a/meta/gdb-uninstalled-guile.in +++ b/meta/gdb-uninstalled-guile.in @@ -36,7 +36,7 @@ set -e top_builddir="@top_builddir_absolute@" XDG_CACHE_HOME=${top_builddir}/cache export XDG_CACHE_HOME -exec ${top_builddir}/meta/uninstalled-env libtool --mode=execute \ +exec ${top_builddir}/meta/uninstalled-env ${top_builddir}/libtool -- mode=execute \ gdb --args ${top_builddir}/libguile/guile "$@" # And for GDB in Emacs, evaluate this form: