diff options
| author | Adam Vandenberg | 2012-06-27 09:44:06 -0700 |
|---|---|---|
| committer | Adam Vandenberg | 2012-06-27 09:44:06 -0700 |
| commit | 8bde80c6abcf51fc65660737759499c1a359515a (patch) | |
| tree | ca538bedea799cf87d58a7689d78d03f71c09616 /Library/Formula | |
| parent | 66a773b180b014bdfbeb9eede584d3f323989068 (diff) | |
| download | homebrew-8bde80c6abcf51fc65660737759499c1a359515a.tar.bz2 | |
mdbtools: use alternate glibtool patch
This patch has been sent upstream.
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/mdbtools.rb | 45 |
1 files changed, 30 insertions, 15 deletions
diff --git a/Library/Formula/mdbtools.rb b/Library/Formula/mdbtools.rb index 2b2c77d20..12cd7522e 100644 --- a/Library/Formula/mdbtools.rb +++ b/Library/Formula/mdbtools.rb @@ -15,6 +15,8 @@ class Mdbtools < Formula end # Use glibtoolize, remove unknown linker flags + # glibtoolize patch sent upstream: + # https://github.com/brianb/mdbtools/pull/10 def patches DATA end @@ -30,31 +32,44 @@ end __END__ diff --git a/autogen.sh b/autogen.sh -index 0d07ee5..1b85a3b 100755 +index 0d07ee5..1ae1923 100755 --- a/autogen.sh +++ b/autogen.sh -@@ -19,10 +19,10 @@ DIE=0 +@@ -18,14 +18,20 @@ DIE=0 + DIE=1 } - (grep "^A[CM]_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && { +-(grep "^A[CM]_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && { - (libtool --version) < /dev/null > /dev/null 2>&1 || { -+ (glibtool --version) < /dev/null > /dev/null 2>&1 || { - echo +- echo - echo "**Error**: You must have \`libtool' installed." - echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz" -+ echo "**Error**: You must have \`glibtool' installed." -+ echo "Get ftp://ftp.gnu.org/pub/gnu/glibtool-1.2d.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 - } -@@ -128,8 +128,8 @@ do - echo "Running aclocal $aclocalinclude ..." +- echo "(or a newer version if it is available)" +- DIE=1 +- } ++grep "^A[CM]_PROG_LIBTOOL" configure.in >/dev/null && { ++ if which libtoolize && (libtooloze --version) < /dev/null > /dev/null 2>&1; then ++ LIBTOOLIZE=libtoolize ++ else ++ if which glibtoolize && (glibtoolize --version) < /dev/null > /dev/null 2>&1; then ++ LIBTOOLIZE=glibtoolize ++ else ++ echo ++ echo "**Error**: You must have \`libtool' installed." ++ echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz" ++ echo "(or a newer version if it is available)" ++ DIE=1 ++ fi ++ fi + } + + grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && { +@@ -129,7 +135,7 @@ do aclocal $aclocalinclude if grep "^A[CM]_PROG_LIBTOOL" configure.in >/dev/null; then -- echo "Running libtoolize..." + echo "Running libtoolize..." - libtoolize --force --copy -+ echo "Running glibtoolize..." -+ glibtoolize --force --copy ++ ${LIBTOOLIZE} --force --copy fi if grep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null; then echo "Running autoheader..." |