From 6c72dac2e0fb2f286c5af56abcbc4bdc1c9931ff Mon Sep 17 00:00:00 2001 From: "C.W. Betts" Date: Thu, 11 Jul 2013 10:07:09 -0600 Subject: [PATCH 1/2] Make autogen.sh work on Darwin/OS X by checking for glibtool/glibtoolize first. The libtool binary that OS X uses is actually not the same version that other unices use. The version that other unices use is named glibtool on OS X. It seems that syn68k uses arguments that aren't available on OS X's/Darwin's libtool. --- autogen.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 8b18250..7c10eb4 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,7 +4,14 @@ set -o errexit -o nounset -o noclobber -libtoolize +test -z "$LIBTOOL" && for LIBTOOL in glibtool libtool; do + ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 && break +done +test -z "$LIBTOOLIZE" && for LIBTOOLIZE in glibtoolize libtoolize; do + ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 && break +done + +$LIBTOOLIZE aclocal autoheader automake --add-missing From ec57c0a0996c593ac43355ef9ab2a182faeee02e Mon Sep 17 00:00:00 2001 From: "C.W. Betts" Date: Mon, 15 Jul 2013 19:12:06 -0600 Subject: [PATCH 2/2] Get the glibtool/libtool checker in autogen.sh to work on an actual system. --- autogen.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index 7c10eb4..060c6c4 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,8 +1,8 @@ -#! /bin/bash +#!/bin/bash # $Id: autogen.sh 65 2004-12-24 19:51:17Z ctm $ -set -o errexit -o nounset -o noclobber +#set -o errexit -o nounset -o noclobber test -z "$LIBTOOL" && for LIBTOOL in glibtool libtool; do ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 && break