← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to config/autorun.sh

Updated versions of autotools used by default.

Show diffs side-by-side

added added

removed removed

Lines of Context:
config/autorun.sh
9
9
# ACLOCAL=${ACLOCAL:-aclocal}
10
10
# AUTOHEADER=${AUTOHEADER:-autoheader}
11
11
# AUTOMAKE=${AUTOMAKE:-automake}
12
 
AUTOMAKE_FLAGS="--add-missing --copy --force"
 
12
AUTOMAKE_FLAGS="--add-missing --copy --force -W all"
13
13
# AUTOCONF=${AUTOCONF:-autoconf}
14
14
 
15
15
ARGV0=$0
37
37
  fi
38
38
fi
39
39
 
40
 
## suse has aclocal and aclocal-1.9
41
40
if test x$ACLOCAL = x; then
42
 
  if test \! "x`which aclocal-1.9 2> /dev/null | grep -v '^no'`" = x; then
43
 
    ACLOCAL=aclocal-1.9
44
 
  elif test \! "x`which aclocal19 2> /dev/null | grep -v '^no'`" = x; then
45
 
    ACLOCAL=aclocal19
 
41
  if test \! "x`which aclocal-1.10 2> /dev/null | grep -v '^no'`" = x; then
 
42
    ACLOCAL=aclocal-1.10
 
43
  elif test \! "x`which aclocal110 2> /dev/null | grep -v '^no'`" = x; then
 
44
    ACLOCAL=aclocal110
46
45
  elif test \! "x`which aclocal 2> /dev/null | grep -v '^no'`" = x; then
47
46
    ACLOCAL=aclocal
48
47
  else 
49
 
    echo "automake 1.9.x (aclocal) wasn't found, exiting"; exit 0
 
48
    echo "automake 1.10.x (aclocal) wasn't found, exiting"; exit 0
50
49
  fi
51
50
fi
52
51
 
53
52
if test x$AUTOMAKE = x; then
54
 
  if test \! "x`which automake-1.9 2> /dev/null | grep -v '^no'`" = x; then
55
 
    AUTOMAKE=automake-1.9
56
 
  elif test \! "x`which automake19 2> /dev/null | grep -v '^no'`" = x; then
57
 
    AUTOMAKE=automake19
 
53
  if test \! "x`which automake-1.10 2> /dev/null | grep -v '^no'`" = x; then
 
54
    AUTOMAKE=automake-1.10
 
55
  elif test \! "x`which automake110 2> /dev/null | grep -v '^no'`" = x; then
 
56
    AUTOMAKE=automake110
58
57
  elif test \! "x`which automake 2> /dev/null | grep -v '^no'`" = x; then
59
58
    AUTOMAKE=automake
60
59
  else 
61
 
    echo "automake 1.9.x wasn't found, exiting"; exit 0
 
60
    echo "automake 1.10.x wasn't found, exiting"; exit 0
62
61
  fi
63
62
fi
64
63