← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to config/autorun.sh

  • Committer: Jay Pipes
  • Date: 2009-08-25 12:56:22 UTC
  • mfrom: (1093.9.25 pandora-build)
  • mto: This revision was merged to the branch mainline in revision 1125.
  • Revision ID: jpipes@serialcoder-20090825125622-sxxkax9mw5bn98y5
Merging pandora build fixes with support for automake 1.11

Show diffs side-by-side

added added

removed removed

Lines of Context:
config/autorun.sh
57
57
fi
58
58
 
59
59
if test x$ACLOCAL = x; then
60
 
  ACLOCAL=`locate_binary aclocal-1.10 aclocal-1.9 aclocal19 aclocal`
 
60
  ACLOCAL=`locate_binary aclocal-1.11 aclocal-1.10 aclocal-1.9 aclocal19 aclocal`
61
61
  if test x$ACLOCAL = x; then
62
62
    die "Did not find a supported aclocal"
63
63
  fi
64
64
fi
65
65
 
66
66
if test x$AUTOMAKE = x; then
67
 
  AUTOMAKE=`locate_binary automake-1.10 automake-1.9 automake19 automake`
 
67
  AUTOMAKE=`locate_binary automake-1.11 automake-1.10 automake-1.9 automake19 automake`
68
68
  if test x$AUTOMAKE = x; then
69
69
    die "Did not find a supported automake"
70
70
  fi