groff-commit
[Top][All Lists]
Advanced

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

[groff] 03/03: Fix build on MacOS X


From: Bertrand Garrigues
Subject: [groff] 03/03: Fix build on MacOS X
Date: Wed, 4 Oct 2017 17:24:51 -0400 (EDT)

bgarrigues pushed a commit to branch master
in repository groff.

commit 33bb99f90546ad15d8212a413b1e5651fdacf0d0
Author: Bertrand Garrigues <address@hidden>
Date:   Wed Oct 4 23:23:39 2017 +0200

    Fix build on MacOS X
    
    See https://savannah.gnu.org/bugs/?49651
---
 ChangeLog |  6 ++++++
 bootstrap | 15 ++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9ab4273..c668811 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-04  Bertrand Garrigues <address@hidden>
+
+       Fix build on MacOS X
+
+       See https://savannah.gnu.org/bugs/?49651
+
 2017-09-11  Bertrand Garrigues <address@hidden>
 
        Build from git: Make `configure' fail if `yacc' is not found.
diff --git a/bootstrap b/bootstrap
index 932ff85..d188412 100755
--- a/bootstrap
+++ b/bootstrap
@@ -450,7 +450,20 @@ check_versions() {
   while read app req_ver; do
     # We only need libtoolize from the libtool package.
     if test "$app" = libtool; then
-      app=libtoolize
+      case `uname` in
+      Darwin*)
+        # on MacOS X systems. GNU libtool conflicts with the Xcode
+        # libtool, and 'libtoolize' is often installed as
+        # 'glibtoolize'.
+        if check_exists libtoolize; then
+          app=libtoolize
+        elif check_exists glibtoolize; then
+          app=glibtoolize
+        else
+          die 'cannot find libtoolize or glibtoolize'
+        fi;;
+      *) app=libtoolize;;
+      esac
     fi
     # Exempt git if --no-git is in effect.
     if test "$app" = git; then



reply via email to

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