guile-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

two Mac guile patches


From: Ken Raeburn
Subject: two Mac guile patches
Date: Thu, 29 Oct 2009 13:51:27 -0400

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:





reply via email to

[Prev in Thread] Current Thread [Next in Thread]