summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2010-02-25 03:02:24 +0000
committerJon A. Cruz <jon@joncruz.org>2010-02-25 03:02:24 +0000
commit4fd28c1f8f9e180ffae8e0bab8626f54a820afff (patch)
tree47e228f1a530ea93f4fb596bf758a7a1617513e5
parentPen tool in paraxial mode: fix automatic orientation of first line segment (diff)
downloadinkscape-4fd28c1f8f9e180ffae8e0bab8626f54a820afff.tar.gz
inkscape-4fd28c1f8f9e180ffae8e0bab8626f54a820afff.zip
Fixing autogen for OS X.
(bzr r9109)
-rwxr-xr-xautogen.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/autogen.sh b/autogen.sh
index 6a7c6317b..c1e8ad42c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -86,7 +86,10 @@ fi
echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
# Prefer earlier versions just so that the earliest supported version gets test coverage by developers.
-if (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
+if (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then
+ AUTOMAKE=automake-1.11
+ ACLOCAL=aclocal-1.11
+elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
AUTOMAKE=automake-1.10
ACLOCAL=aclocal-1.10
elif (automake --version) < /dev/null > /dev/null 2>&1; then