Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Use AM_PATH_PYTHON to locate python

  • Loading branch information...
commit 1b5a049a00822b9da51361274ec4a880f62ce387 1 parent 7887082
Garrett Holmstrom gholms authored
1  .bzrignore
@@ -6,6 +6,7 @@ clc/lib
6 6 *.ajsv
7 7 *.class
8 8 */generated/
  9 +autom4te.cache
9 10 Makedefs
10 11 config.log
11 12 config.status
2  Makedefs.in
@@ -47,7 +47,7 @@ ANT = @ANT@ -e
47 47 WSDL2C = @WSDL2C@
48 48 JAVA_HOME = @JAVA_HOME@
49 49 RM = @RM@
50   -PYTHON_BIN = @PYTHON_BIN@
  50 +PYTHON = @PYTHON@
51 51
52 52 # compile time configurations
53 53 euca_theme = @INTERFACE_THEME@
235 aclocal.m4
... ... @@ -0,0 +1,235 @@
  1 +# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
  2 +
  3 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
  4 +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  5 +# This file is free software; the Free Software Foundation
  6 +# gives unlimited permission to copy and/or distribute it,
  7 +# with or without modifications, as long as this notice is preserved.
  8 +
  9 +# This program is distributed in the hope that it will be useful,
  10 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
  11 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  12 +# PARTICULAR PURPOSE.
  13 +
  14 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
  15 +# Free Software Foundation, Inc.
  16 +#
  17 +# This file is free software; the Free Software Foundation
  18 +# gives unlimited permission to copy and/or distribute it,
  19 +# with or without modifications, as long as this notice is preserved.
  20 +
  21 +# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
  22 +# ---------------------------------------------------------------------------
  23 +# Adds support for distributing Python modules and packages. To
  24 +# install modules, copy them to $(pythondir), using the python_PYTHON
  25 +# automake variable. To install a package with the same name as the
  26 +# automake package, install to $(pkgpythondir), or use the
  27 +# pkgpython_PYTHON automake variable.
  28 +#
  29 +# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
  30 +# locations to install python extension modules (shared libraries).
  31 +# Another macro is required to find the appropriate flags to compile
  32 +# extension modules.
  33 +#
  34 +# If your package is configured with a different prefix to python,
  35 +# users will have to add the install directory to the PYTHONPATH
  36 +# environment variable, or create a .pth file (see the python
  37 +# documentation for details).
  38 +#
  39 +# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
  40 +# cause an error if the version of python installed on the system
  41 +# doesn't meet the requirement. MINIMUM-VERSION should consist of
  42 +# numbers and dots only.
  43 +AC_DEFUN([AM_PATH_PYTHON],
  44 + [
  45 + dnl Find a Python interpreter. Python versions prior to 2.0 are not
  46 + dnl supported. (2.0 was released on October 16, 2000).
  47 + m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
  48 + [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl
  49 +python2.1 python2.0])
  50 +
  51 + m4_if([$1],[],[
  52 + dnl No version check is needed.
  53 + # Find any Python interpreter.
  54 + if test -z "$PYTHON"; then
  55 + AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :)
  56 + fi
  57 + am_display_PYTHON=python
  58 + ], [
  59 + dnl A version check is needed.
  60 + if test -n "$PYTHON"; then
  61 + # If the user set $PYTHON, use it and don't search something else.
  62 + AC_MSG_CHECKING([whether $PYTHON version >= $1])
  63 + AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
  64 + [AC_MSG_RESULT(yes)],
  65 + [AC_MSG_ERROR(too old)])
  66 + am_display_PYTHON=$PYTHON
  67 + else
  68 + # Otherwise, try each interpreter until we find one that satisfies
  69 + # VERSION.
  70 + AC_CACHE_CHECK([for a Python interpreter with version >= $1],
  71 + [am_cv_pathless_PYTHON],[
  72 + for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do
  73 + test "$am_cv_pathless_PYTHON" = none && break
  74 + AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break])
  75 + done])
  76 + # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
  77 + if test "$am_cv_pathless_PYTHON" = none; then
  78 + PYTHON=:
  79 + else
  80 + AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
  81 + fi
  82 + am_display_PYTHON=$am_cv_pathless_PYTHON
  83 + fi
  84 + ])
  85 +
  86 + if test "$PYTHON" = :; then
  87 + dnl Run any user-specified action, or abort.
  88 + m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
  89 + else
  90 +
  91 + dnl Query Python for its version number. Getting [:3] seems to be
  92 + dnl the best way to do this; it's what "site.py" does in the standard
  93 + dnl library.
  94 +
  95 + AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
  96 + [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
  97 + AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
  98 +
  99 + dnl Use the values of $prefix and $exec_prefix for the corresponding
  100 + dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
  101 + dnl distinct variables so they can be overridden if need be. However,
  102 + dnl general consensus is that you shouldn't need this ability.
  103 +
  104 + AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
  105 + AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
  106 +
  107 + dnl At times (like when building shared libraries) you may want
  108 + dnl to know which OS platform Python thinks this is.
  109 +
  110 + AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
  111 + [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
  112 + AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
  113 +
  114 +
  115 + dnl Set up 4 directories:
  116 +
  117 + dnl pythondir -- where to install python scripts. This is the
  118 + dnl site-packages directory, not the python standard library
  119 + dnl directory like in previous automake betas. This behavior
  120 + dnl is more consistent with lispdir.m4 for example.
  121 + dnl Query distutils for this directory. distutils does not exist in
  122 + dnl Python 1.5, so we fall back to the hardcoded directory if it
  123 + dnl doesn't work.
  124 + AC_CACHE_CHECK([for $am_display_PYTHON script directory],
  125 + [am_cv_python_pythondir],
  126 + [if test "x$prefix" = xNONE
  127 + then
  128 + am_py_prefix=$ac_default_prefix
  129 + else
  130 + am_py_prefix=$prefix
  131 + fi
  132 + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
  133 + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
  134 + case $am_cv_python_pythondir in
  135 + $am_py_prefix*)
  136 + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
  137 + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
  138 + ;;
  139 + *)
  140 + case $am_py_prefix in
  141 + /usr|/System*) ;;
  142 + *)
  143 + am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
  144 + ;;
  145 + esac
  146 + ;;
  147 + esac
  148 + ])
  149 + AC_SUBST([pythondir], [$am_cv_python_pythondir])
  150 +
  151 + dnl pkgpythondir -- $PACKAGE directory under pythondir. Was
  152 + dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is
  153 + dnl more consistent with the rest of automake.
  154 +
  155 + AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
  156 +
  157 + dnl pyexecdir -- directory for installing python extension modules
  158 + dnl (shared libraries)
  159 + dnl Query distutils for this directory. distutils does not exist in
  160 + dnl Python 1.5, so we fall back to the hardcoded directory if it
  161 + dnl doesn't work.
  162 + AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
  163 + [am_cv_python_pyexecdir],
  164 + [if test "x$exec_prefix" = xNONE
  165 + then
  166 + am_py_exec_prefix=$am_py_prefix
  167 + else
  168 + am_py_exec_prefix=$exec_prefix
  169 + fi
  170 + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
  171 + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
  172 + case $am_cv_python_pyexecdir in
  173 + $am_py_exec_prefix*)
  174 + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
  175 + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
  176 + ;;
  177 + *)
  178 + case $am_py_exec_prefix in
  179 + /usr|/System*) ;;
  180 + *)
  181 + am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
  182 + ;;
  183 + esac
  184 + ;;
  185 + esac
  186 + ])
  187 + AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
  188 +
  189 + dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
  190 +
  191 + AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
  192 +
  193 + dnl Run any user-specified action.
  194 + $2
  195 + fi
  196 +
  197 +])
  198 +
  199 +
  200 +# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
  201 +# ---------------------------------------------------------------------------
  202 +# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
  203 +# Run ACTION-IF-FALSE otherwise.
  204 +# This test uses sys.hexversion instead of the string equivalent (first
  205 +# word of sys.version), in order to cope with versions such as 2.2c1.
  206 +# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).
  207 +AC_DEFUN([AM_PYTHON_CHECK_VERSION],
  208 + [prog="import sys
  209 +# split strings by '.' and convert to numeric. Append some zeros
  210 +# because we need at least 4 digits for the hex conversion.
  211 +# map returns an iterator in Python 3.0 and a list in 2.x
  212 +minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]
  213 +minverhex = 0
  214 +# xrange is not present in Python 3.0 and range returns an iterator
  215 +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
  216 +sys.exit(sys.hexversion < minverhex)"
  217 + AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
  218 +
  219 +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
  220 +#
  221 +# This file is free software; the Free Software Foundation
  222 +# gives unlimited permission to copy and/or distribute it,
  223 +# with or without modifications, as long as this notice is preserved.
  224 +
  225 +# AM_RUN_LOG(COMMAND)
  226 +# -------------------
  227 +# Run COMMAND, save the exit status in ac_status, and log it.
  228 +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
  229 +AC_DEFUN([AM_RUN_LOG],
  230 +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
  231 + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
  232 + ac_status=$?
  233 + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
  234 + (exit $ac_status); }])
  235 +
4 clc/eucadmin/Makefile
@@ -27,10 +27,10 @@ all: euca_admin
27 27 build: euca_admin
28 28
29 29 euca_admin:
30   - $(PYTHON_BIN) setup.py build
  30 + $(PYTHON) setup.py build
31 31
32 32 install: euca_admin
33   - $(PYTHON_BIN) setup.py install
  33 + $(PYTHON) setup.py install
34 34
35 35 clean:
36 36 @$(RM) -fr ./dist
603 configure
... ... @@ -1,13 +1,13 @@
1 1 #! /bin/sh
2 2 # Guess values for system-dependent variables and create Makefiles.
3   -# Generated by GNU Autoconf 2.65 for Eucalyptus eee-3.0.0.
  3 +# Generated by GNU Autoconf 2.66 for Eucalyptus eee-3.0.0.
4 4 #
5 5 # Report bugs to <support@open.eucalyptus.com>.
6 6 #
7 7 #
8 8 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
9   -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
10   -# Inc.
  9 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
  10 +# Foundation, Inc.
11 11 #
12 12 #
13 13 # This configure script is free software; the Free Software Foundation
@@ -319,7 +319,7 @@ $as_echo X"$as_dir" |
319 319 test -d "$as_dir" && break
320 320 done
321 321 test -z "$as_dirs" || eval "mkdir $as_dirs"
322   - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
  322 + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
323 323
324 324
325 325 } # as_fn_mkdir_p
@@ -359,19 +359,19 @@ else
359 359 fi # as_fn_arith
360 360
361 361
362   -# as_fn_error ERROR [LINENO LOG_FD]
363   -# ---------------------------------
  362 +# as_fn_error STATUS ERROR [LINENO LOG_FD]
  363 +# ----------------------------------------
364 364 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
365 365 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
366   -# script with status $?, using 1 if that was 0.
  366 +# script with STATUS, using 1 if that was 0.
367 367 as_fn_error ()
368 368 {
369   - as_status=$?; test $as_status -eq 0 && as_status=1
370   - if test "$3"; then
371   - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
372   - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
  369 + as_status=$1; test $as_status -eq 0 && as_status=1
  370 + if test "$4"; then
  371 + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  372 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
373 373 fi
374   - $as_echo "$as_me: error: $1" >&2
  374 + $as_echo "$as_me: error: $2" >&2
375 375 as_fn_exit $as_status
376 376 } # as_fn_error
377 377
@@ -533,7 +533,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
533 533 exec 6>&1
534 534
535 535 # Name of the host.
536   -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
  536 +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
537 537 # so uname gets run too.
538 538 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
539 539
@@ -620,7 +620,15 @@ INSTALL_DATA
620 620 INSTALL_SCRIPT
621 621 INSTALL_PROGRAM
622 622 AWK
623   -PYTHON_BIN
  623 +pkgpyexecdir
  624 +pyexecdir
  625 +pkgpythondir
  626 +pythondir
  627 +PYTHON_PLATFORM
  628 +PYTHON_EXEC_PREFIX
  629 +PYTHON_PREFIX
  630 +PYTHON_VERSION
  631 +PYTHON
624 632 build_os
625 633 build_vendor
626 634 build_cpu
@@ -804,7 +812,7 @@ do
804 812 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
805 813 # Reject names that are not valid shell variable names.
806 814 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
807   - as_fn_error "invalid feature name: $ac_useropt"
  815 + as_fn_error $? "invalid feature name: $ac_useropt"
808 816 ac_useropt_orig=$ac_useropt
809 817 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
810 818 case $ac_user_opts in
@@ -830,7 +838,7 @@ do
830 838 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
831 839 # Reject names that are not valid shell variable names.
832 840 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
833   - as_fn_error "invalid feature name: $ac_useropt"
  841 + as_fn_error $? "invalid feature name: $ac_useropt"
834 842 ac_useropt_orig=$ac_useropt
835 843 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
836 844 case $ac_user_opts in
@@ -1034,7 +1042,7 @@ do
1034 1042 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
1035 1043 # Reject names that are not valid shell variable names.
1036 1044 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1037   - as_fn_error "invalid package name: $ac_useropt"
  1045 + as_fn_error $? "invalid package name: $ac_useropt"
1038 1046 ac_useropt_orig=$ac_useropt
1039 1047 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1040 1048 case $ac_user_opts in
@@ -1050,7 +1058,7 @@ do
1050 1058 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
1051 1059 # Reject names that are not valid shell variable names.
1052 1060 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1053   - as_fn_error "invalid package name: $ac_useropt"
  1061 + as_fn_error $? "invalid package name: $ac_useropt"
1054 1062 ac_useropt_orig=$ac_useropt
1055 1063 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1056 1064 case $ac_user_opts in
@@ -1080,8 +1088,8 @@ do
1080 1088 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
1081 1089 x_libraries=$ac_optarg ;;
1082 1090
1083   - -*) as_fn_error "unrecognized option: \`$ac_option'
1084   -Try \`$0 --help' for more information."
  1091 + -*) as_fn_error $? "unrecognized option: \`$ac_option'
  1092 +Try \`$0 --help' for more information"
1085 1093 ;;
1086 1094
1087 1095 *=*)
@@ -1089,7 +1097,7 @@ Try \`$0 --help' for more information."
1089 1097 # Reject names that are not valid shell variable names.
1090 1098 case $ac_envvar in #(
1091 1099 '' | [0-9]* | *[!_$as_cr_alnum]* )
1092   - as_fn_error "invalid variable name: \`$ac_envvar'" ;;
  1100 + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
1093 1101 esac
1094 1102 eval $ac_envvar=\$ac_optarg
1095 1103 export $ac_envvar ;;
@@ -1107,13 +1115,13 @@ done
1107 1115
1108 1116 if test -n "$ac_prev"; then
1109 1117 ac_option=--`echo $ac_prev | sed 's/_/-/g'`
1110   - as_fn_error "missing argument to $ac_option"
  1118 + as_fn_error $? "missing argument to $ac_option"
1111 1119 fi
1112 1120
1113 1121 if test -n "$ac_unrecognized_opts"; then
1114 1122 case $enable_option_checking in
1115 1123 no) ;;
1116   - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
  1124 + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
1117 1125 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
1118 1126 esac
1119 1127 fi
@@ -1136,7 +1144,7 @@ do
1136 1144 [\\/$]* | ?:[\\/]* ) continue;;
1137 1145 NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
1138 1146 esac
1139   - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
  1147 + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
1140 1148 done
1141 1149
1142 1150 # There might be people who depend on the old broken behavior: `$host'
@@ -1150,8 +1158,8 @@ target=$target_alias
1150 1158 if test "x$host_alias" != x; then
1151 1159 if test "x$build_alias" = x; then
1152 1160 cross_compiling=maybe
1153   - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
1154   - If a cross compiler is detected then cross compile mode will be used." >&2
  1161 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
  1162 + If a cross compiler is detected then cross compile mode will be used" >&2
1155 1163 elif test "x$build_alias" != "x$host_alias"; then
1156 1164 cross_compiling=yes
1157 1165 fi
@@ -1166,9 +1174,9 @@ test "$silent" = yes && exec 6>/dev/null
1166 1174 ac_pwd=`pwd` && test -n "$ac_pwd" &&
1167 1175 ac_ls_di=`ls -di .` &&
1168 1176 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
1169   - as_fn_error "working directory cannot be determined"
  1177 + as_fn_error $? "working directory cannot be determined"
1170 1178 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
1171   - as_fn_error "pwd does not report name of working directory"
  1179 + as_fn_error $? "pwd does not report name of working directory"
1172 1180
1173 1181
1174 1182 # Find the source files, if location was not specified.
@@ -1207,11 +1215,11 @@ else
1207 1215 fi
1208 1216 if test ! -r "$srcdir/$ac_unique_file"; then
1209 1217 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
1210   - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
  1218 + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
1211 1219 fi
1212 1220 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
1213 1221 ac_abs_confdir=`(
1214   - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
  1222 + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
1215 1223 pwd)`
1216 1224 # When building in place, set srcdir=.
1217 1225 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1251,7 +1259,7 @@ Configuration:
1251 1259 --help=short display options specific to this package
1252 1260 --help=recursive display the short help of all the included packages
1253 1261 -V, --version display version information and exit
1254   - -q, --quiet, --silent do not print \`checking...' messages
  1262 + -q, --quiet, --silent do not print \`checking ...' messages
1255 1263 --cache-file=FILE cache test results in FILE [disabled]
1256 1264 -C, --config-cache alias for \`--cache-file=config.cache'
1257 1265 -n, --no-create do not create output files
@@ -1401,9 +1409,9 @@ test -n "$ac_init_help" && exit $ac_status
1401 1409 if $ac_init_version; then
1402 1410 cat <<\_ACEOF
1403 1411 Eucalyptus configure eee-3.0.0
1404   -generated by GNU Autoconf 2.65
  1412 +generated by GNU Autoconf 2.66
1405 1413
1406   -Copyright (C) 2009 Free Software Foundation, Inc.
  1414 +Copyright (C) 2010 Free Software Foundation, Inc.
1407 1415 This configure script is free software; the Free Software Foundation
1408 1416 gives unlimited permission to copy, distribute and modify it.
1409 1417 _ACEOF
@@ -1497,10 +1505,10 @@ fi
1497 1505 ac_fn_c_check_header_mongrel ()
1498 1506 {
1499 1507 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1500   - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  1508 + if eval "test \"\${$3+set}\"" = set; then :
1501 1509 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1502 1510 $as_echo_n "checking for $2... " >&6; }
1503   -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  1511 +if eval "test \"\${$3+set}\"" = set; then :
1504 1512 $as_echo_n "(cached) " >&6
1505 1513 fi
1506 1514 eval ac_res=\$$3
@@ -1559,17 +1567,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
1559 1567 $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
1560 1568 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
1561 1569 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1562   -( cat <<\_ASBOX
1563   -## ------------------------------------------ ##
  1570 +( $as_echo "## ------------------------------------------ ##
1564 1571 ## Report this to support@open.eucalyptus.com ##
1565   -## ------------------------------------------ ##
1566   -_ASBOX
  1572 +## ------------------------------------------ ##"
1567 1573 ) | sed "s/^/$as_me: WARNING: /" >&2
1568 1574 ;;
1569 1575 esac
1570 1576 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1571 1577 $as_echo_n "checking for $2... " >&6; }
1572   -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  1578 +if eval "test \"\${$3+set}\"" = set; then :
1573 1579 $as_echo_n "(cached) " >&6
1574 1580 else
1575 1581 eval "$3=\$ac_header_compiler"
@@ -1633,7 +1639,7 @@ ac_fn_c_check_header_compile ()
1633 1639 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1634 1640 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1635 1641 $as_echo_n "checking for $2... " >&6; }
1636   -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  1642 +if eval "test \"\${$3+set}\"" = set; then :
1637 1643 $as_echo_n "(cached) " >&6
1638 1644 else
1639 1645 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1710,7 +1716,7 @@ ac_fn_c_check_type ()
1710 1716 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1711 1717 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1712 1718 $as_echo_n "checking for $2... " >&6; }
1713   -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  1719 +if eval "test \"\${$3+set}\"" = set; then :
1714 1720 $as_echo_n "(cached) " >&6
1715 1721 else
1716 1722 eval "$3=no"
@@ -1764,7 +1770,7 @@ ac_fn_c_find_uintX_t ()
1764 1770 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1765 1771 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
1766 1772 $as_echo_n "checking for uint$2_t... " >&6; }
1767   -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  1773 +if eval "test \"\${$3+set}\"" = set; then :
1768 1774 $as_echo_n "(cached) " >&6
1769 1775 else
1770 1776 eval "$3=no"
@@ -1794,8 +1800,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
1794 1800 esac
1795 1801 fi
1796 1802 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1797   - eval as_val=\$$3
1798   - if test "x$as_val" = x""no; then :
  1803 + if eval test \"x\$"$3"\" = x"no"; then :
1799 1804
1800 1805 else
1801 1806 break
@@ -1817,7 +1822,7 @@ ac_fn_c_check_func ()
1817 1822 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1818 1823 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1819 1824 $as_echo_n "checking for $2... " >&6; }
1820   -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  1825 +if eval "test \"\${$3+set}\"" = set; then :
1821 1826 $as_echo_n "(cached) " >&6
1822 1827 else
1823 1828 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1880,7 +1885,7 @@ This file contains any messages produced by compilers while
1880 1885 running configure, to aid debugging if configure makes a mistake.
1881 1886
1882 1887 It was created by Eucalyptus $as_me eee-3.0.0, which was
1883   -generated by GNU Autoconf 2.65. Invocation command line was
  1888 +generated by GNU Autoconf 2.66. Invocation command line was
1884 1889
1885 1890 $ $0 $@
1886 1891
@@ -1990,11 +1995,9 @@ trap 'exit_status=$?
1990 1995 {
1991 1996 echo
1992 1997
1993   - cat <<\_ASBOX
1994   -## ---------------- ##
  1998 + $as_echo "## ---------------- ##
1995 1999 ## Cache variables. ##
1996   -## ---------------- ##
1997   -_ASBOX
  2000 +## ---------------- ##"
1998 2001 echo
1999 2002 # The following way of writing the cache mishandles newlines in values,
2000 2003 (
@@ -2028,11 +2031,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
2028 2031 )
2029 2032 echo
2030 2033
2031   - cat <<\_ASBOX
2032   -## ----------------- ##
  2034 + $as_echo "## ----------------- ##
2033 2035 ## Output variables. ##
2034   -## ----------------- ##
2035   -_ASBOX
  2036 +## ----------------- ##"
2036 2037 echo
2037 2038 for ac_var in $ac_subst_vars
2038 2039 do
@@ -2045,11 +2046,9 @@ _ASBOX
2045 2046 echo
2046 2047
2047 2048 if test -n "$ac_subst_files"; then
2048   - cat <<\_ASBOX
2049   -## ------------------- ##
  2049 + $as_echo "## ------------------- ##
2050 2050 ## File substitutions. ##
2051   -## ------------------- ##
2052   -_ASBOX
  2051 +## ------------------- ##"
2053 2052 echo
2054 2053 for ac_var in $ac_subst_files
2055 2054 do
@@ -2063,11 +2062,9 @@ _ASBOX
2063 2062 fi
2064 2063
2065 2064 if test -s confdefs.h; then
2066   - cat <<\_ASBOX
2067   -## ----------- ##
  2065 + $as_echo "## ----------- ##
2068 2066 ## confdefs.h. ##
2069   -## ----------- ##
2070   -_ASBOX
  2067 +## ----------- ##"
2071 2068 echo
2072 2069 cat confdefs.h
2073 2070 echo
@@ -2122,7 +2119,12 @@ _ACEOF
2122 2119 ac_site_file1=NONE
2123 2120 ac_site_file2=NONE
2124 2121 if test -n "$CONFIG_SITE"; then
2125   - ac_site_file1=$CONFIG_SITE
  2122 + # We do not want a PATH search for config.site.
  2123 + case $CONFIG_SITE in #((
  2124 + -*) ac_site_file1=./$CONFIG_SITE;;
  2125 + */*) ac_site_file1=$CONFIG_SITE;;
  2126 + *) ac_site_file1=./$CONFIG_SITE;;
  2127 + esac
2126 2128 elif test "x$prefix" != xNONE; then
2127 2129 ac_site_file1=$prefix/share/config.site
2128 2130 ac_site_file2=$prefix/etc/config.site
@@ -2137,7 +2139,11 @@ do
2137 2139 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
2138 2140 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
2139 2141 sed 's/^/| /' "$ac_site_file" >&5
2140   - . "$ac_site_file"
  2142 + . "$ac_site_file" \
  2143 + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  2144 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  2145 +as_fn_error $? "failed to load site script $ac_site_file
  2146 +See \`config.log' for more details" "$LINENO" 5; }
2141 2147 fi
2142 2148 done
2143 2149
@@ -2218,7 +2224,7 @@ if $ac_cache_corrupted; then
2218 2224 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2219 2225 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
2220 2226 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
2221   - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
  2227 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
2222 2228 fi
2223 2229 ## -------------------- ##
2224 2230 ## Main body of script. ##
@@ -2535,8 +2541,8 @@ fi
2535 2541
2536 2542 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2537 2543 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2538   -as_fn_error "no acceptable C compiler found in \$PATH
2539   -See \`config.log' for more details." "$LINENO" 5; }
  2544 +as_fn_error $? "no acceptable C compiler found in \$PATH
  2545 +See \`config.log' for more details" "$LINENO" 5; }
2540 2546
2541 2547 # Provide some information about the compiler.
2542 2548 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -2650,9 +2656,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
2650 2656
2651 2657 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2652 2658 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2653   -{ as_fn_set_status 77
2654   -as_fn_error "C compiler cannot create executables
2655   -See \`config.log' for more details." "$LINENO" 5; }; }
  2659 +as_fn_error 77 "C compiler cannot create executables
  2660 +See \`config.log' for more details" "$LINENO" 5; }
2656 2661 else
2657 2662 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2658 2663 $as_echo "yes" >&6; }
@@ -2694,8 +2699,8 @@ done
2694 2699 else
2695 2700 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2696 2701 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2697   -as_fn_error "cannot compute suffix of executables: cannot compile and link
2698   -See \`config.log' for more details." "$LINENO" 5; }
  2702 +as_fn_error $? "cannot compute suffix of executables: cannot compile and link
  2703 +See \`config.log' for more details" "$LINENO" 5; }
2699 2704 fi
2700 2705 rm -f conftest conftest$ac_cv_exeext
2701 2706 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -2752,9 +2757,9 @@ $as_echo "$ac_try_echo"; } >&5
2752 2757 else
2753 2758 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2754 2759 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2755   -as_fn_error "cannot run C compiled programs.
  2760 +as_fn_error $? "cannot run C compiled programs.
2756 2761 If you meant to cross compile, use \`--host'.
2757   -See \`config.log' for more details." "$LINENO" 5; }
  2762 +See \`config.log' for more details" "$LINENO" 5; }
2758 2763 fi
2759 2764 fi
2760 2765 fi
@@ -2805,8 +2810,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
2805 2810
2806 2811 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2807 2812 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2808   -as_fn_error "cannot compute suffix of object files: cannot compile
2809   -See \`config.log' for more details." "$LINENO" 5; }
  2813 +as_fn_error $? "cannot compute suffix of object files: cannot compile
  2814 +See \`config.log' for more details" "$LINENO" 5; }
2810 2815 fi
2811 2816 rm -f conftest.$ac_cv_objext conftest.$ac_ext
2812 2817 fi
@@ -3154,8 +3159,8 @@ if $ac_preproc_ok; then :
3154 3159 else
3155 3160 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3156 3161 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3157   -as_fn_error "C preprocessor \"$CPP\" fails sanity check
3158   -See \`config.log' for more details." "$LINENO" 5; }
  3162 +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
  3163 +See \`config.log' for more details" "$LINENO" 5; }
3159 3164 fi
3160 3165
3161 3166 ac_ext=c
@@ -3216,7 +3221,7 @@ esac
3216 3221 done
3217 3222 IFS=$as_save_IFS
3218 3223 if test -z "$ac_cv_path_GREP"; then
3219   - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  3224 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
3220 3225 fi
3221 3226 else
3222 3227 ac_cv_path_GREP=$GREP
@@ -3282,7 +3287,7 @@ esac
3282 3287 done
3283 3288 IFS=$as_save_IFS
3284 3289 if test -z "$ac_cv_path_EGREP"; then
3285   - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  3290 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
3286 3291 fi
3287 3292 else
3288 3293 ac_cv_path_EGREP=$EGREP
@@ -3414,8 +3419,7 @@ do :
3414 3419 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
3415 3420 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
3416 3421 "
3417   -eval as_val=\$$as_ac_Header
3418   - if test "x$as_val" = x""yes; then :
  3422 +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
3419 3423 cat >>confdefs.h <<_ACEOF
3420 3424 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
3421 3425 _ACEOF
@@ -3488,16 +3492,22 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
3488 3492
3489 3493 ac_aux_dir=
3490 3494 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
3491   - for ac_t in install-sh install.sh shtool; do
3492   - if test -f "$ac_dir/$ac_t"; then
3493   - ac_aux_dir=$ac_dir
3494   - ac_install_sh="$ac_aux_dir/$ac_t -c"
3495   - break 2
3496   - fi
3497   - done
  3495 + if test -f "$ac_dir/install-sh"; then
  3496 + ac_aux_dir=$ac_dir
  3497 + ac_install_sh="$ac_aux_dir/install-sh -c"
  3498 + break
  3499 + elif test -f "$ac_dir/install.sh"; then
  3500 + ac_aux_dir=$ac_dir
  3501 + ac_install_sh="$ac_aux_dir/install.sh -c"
  3502 + break
  3503 + elif test -f "$ac_dir/shtool"; then
  3504 + ac_aux_dir=$ac_dir
  3505 + ac_install_sh="$ac_aux_dir/shtool install -c"
  3506 + break
  3507 + fi
3498 3508 done
3499 3509 if test -z "$ac_aux_dir"; then
3500   - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
  3510 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
3501 3511 fi
3502 3512
3503 3513 # These three variables are undocumented and unsupported,
@@ -3511,7 +3521,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
3511 3521
3512 3522 # Make sure we can run config.sub.
3513 3523 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
3514   - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
  3524 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
3515 3525
3516 3526 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
3517 3527 $as_echo_n "checking build system type... " >&6; }
@@ -3522,16 +3532,16 @@ else
3522 3532 test "x$ac_build_alias" = x &&
3523 3533 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
3524 3534 test "x$ac_build_alias" = x &&
3525   - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
  3535 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
3526 3536 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
3527   - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
  3537 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
3528 3538
3529 3539 fi
3530 3540 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
3531 3541 $as_echo "$ac_cv_build" >&6; }
3532 3542 case $ac_cv_build in
3533 3543 *-*-*) ;;
3534   -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
  3544 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
3535 3545 esac
3536 3546 build=$ac_cv_build
3537 3547 ac_save_IFS=$IFS; IFS='-'
@@ -3657,19 +3667,79 @@ if test -z "$APACHE2_MODULE_DIR"; then
3657 3667 APACHE2_MODULE_DIR="${AXIS2C_HOME}/lib"
3658 3668 fi
3659 3669
3660   -if test -z "$PYTHON_BIN"; then
3661   - for i in python2.9 python2.8 python2.7 python2.6 python2.5
3662   - do
3663   - # Extract the first word of "$i", so it can be a program name with args.
3664   -set dummy $i; ac_word=$2
  3670 +
  3671 +
  3672 +
  3673 +
  3674 + if test -n "$PYTHON"; then
  3675 + # If the user set $PYTHON, use it and don't search something else.
  3676 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.5" >&5
  3677 +$as_echo_n "checking whether $PYTHON version >= 2.5... " >&6; }
  3678 + prog="import sys
  3679 +# split strings by '.' and convert to numeric. Append some zeros
  3680 +# because we need at least 4 digits for the hex conversion.
  3681 +# map returns an iterator in Python 3.0 and a list in 2.x
  3682 +minver = list(map(int, '2.5'.split('.'))) + [0, 0, 0]
  3683 +minverhex = 0
  3684 +# xrange is not present in Python 3.0 and range returns an iterator
  3685 +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
  3686 +sys.exit(sys.hexversion < minverhex)"
  3687 + if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
  3688 + ($PYTHON -c "$prog") >&5 2>&5
  3689 + ac_status=$?
  3690 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
  3691 + (exit $ac_status); }; then :
  3692 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  3693 +$as_echo "yes" >&6; }
  3694 +else
  3695 + as_fn_error $? "too old" "$LINENO" 5
  3696 +fi
  3697 + am_display_PYTHON=$PYTHON
  3698 + else
  3699 + # Otherwise, try each interpreter until we find one that satisfies
  3700 + # VERSION.
  3701 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.5" >&5
  3702 +$as_echo_n "checking for a Python interpreter with version >= 2.5... " >&6; }
  3703 +if test "${am_cv_pathless_PYTHON+set}" = set; then :
  3704 + $as_echo_n "(cached) " >&6
  3705 +else
  3706 +
  3707 + for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
  3708 + test "$am_cv_pathless_PYTHON" = none && break
  3709 + prog="import sys
  3710 +# split strings by '.' and convert to numeric. Append some zeros
  3711 +# because we need at least 4 digits for the hex conversion.
  3712 +# map returns an iterator in Python 3.0 and a list in 2.x
  3713 +minver = list(map(int, '2.5'.split('.'))) + [0, 0, 0]
  3714 +minverhex = 0
  3715 +# xrange is not present in Python 3.0 and range returns an iterator
  3716 +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
  3717 +sys.exit(sys.hexversion < minverhex)"
  3718 + if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5
  3719 + ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
  3720 + ac_status=$?
  3721 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
  3722 + (exit $ac_status); }; then :
  3723 + break
  3724 +fi
  3725 + done
  3726 +fi
  3727 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
  3728 +$as_echo "$am_cv_pathless_PYTHON" >&6; }
  3729 + # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
  3730 + if test "$am_cv_pathless_PYTHON" = none; then
  3731 + PYTHON=:
  3732 + else
  3733 + # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
  3734 +set dummy $am_cv_pathless_PYTHON; ac_word=$2
3665 3735 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3666 3736 $as_echo_n "checking for $ac_word... " >&6; }
3667   -if test "${ac_cv_path_PYTHON_BIN+set}" = set; then :
  3737 +if test "${ac_cv_path_PYTHON+set}" = set; then :
3668 3738 $as_echo_n "(cached) " >&6
3669 3739 else
3670   - case $PYTHON_BIN in
  3740 + case $PYTHON in
3671 3741 [\\/]* | ?:[\\/]*)
3672   - ac_cv_path_PYTHON_BIN="$PYTHON_BIN" # Let the user override the test with a path.
  3742 + ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
3673 3743 ;;
3674 3744 *)
3675 3745 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3679,7 +3749,7 @@ do
3679 3749 test -z "$as_dir" && as_dir=.
3680 3750 for ac_exec_ext in '' $ac_executable_extensions; do
3681 3751 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3682   - ac_cv_path_PYTHON_BIN="$as_dir/$ac_word$ac_exec_ext"
  3752 + ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
3683 3753 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3684 3754 break 2
3685 3755 fi
@@ -3690,20 +3760,144 @@ IFS=$as_save_IFS
3690 3760 ;;
3691 3761 esac
3692 3762 fi
3693   -PYTHON_BIN=$ac_cv_path_PYTHON_BIN
3694   -if test -n "$PYTHON_BIN"; then
3695   - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_BIN" >&5
3696   -$as_echo "$PYTHON_BIN" >&6; }
  3763 +PYTHON=$ac_cv_path_PYTHON
  3764 +if test -n "$PYTHON"; then
  3765 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
  3766 +$as_echo "$PYTHON" >&6; }
3697 3767 else
3698 3768 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3699 3769 $as_echo "no" >&6; }
3700 3770 fi
3701 3771
3702 3772
3703   - done
  3773 + fi
  3774 + am_display_PYTHON=$am_cv_pathless_PYTHON
  3775 + fi
  3776 +
  3777 +
  3778 + if test "$PYTHON" = :; then
  3779 + as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5
  3780 + else
  3781 +
  3782 +
  3783 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
  3784 +$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
  3785 +if test "${am_cv_python_version+set}" = set; then :
  3786 + $as_echo_n "(cached) " >&6
  3787 +else
  3788 + am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
3704 3789 fi
3705   -if test -z "$PYTHON_BIN" ; then
3706   - as_fn_error "cannot find python binary" "$LINENO" 5
  3790 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
  3791 +$as_echo "$am_cv_python_version" >&6; }
  3792 + PYTHON_VERSION=$am_cv_python_version
  3793 +
  3794 +
  3795 +
  3796 + PYTHON_PREFIX='${prefix}'
  3797 +
  3798 + PYTHON_EXEC_PREFIX='${exec_prefix}'
  3799 +
  3800 +
  3801 +
  3802 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
  3803 +$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
  3804 +if test "${am_cv_python_platform+set}" = set; then :
  3805 + $as_echo_n "(cached) " >&6
  3806 +else
  3807 + am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
  3808 +fi
  3809 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
  3810 +$as_echo "$am_cv_python_platform" >&6; }
  3811 + PYTHON_PLATFORM=$am_cv_python_platform
  3812 +
  3813 +
  3814 +
  3815 +
  3816 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
  3817 +$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
  3818 +if test "${am_cv_python_pythondir+set}" = set; then :
  3819 + $as_echo_n "(cached) " >&6
  3820 +else
  3821 + if test "x$prefix" = xNONE
  3822 + then
  3823 + am_py_prefix=$ac_default_prefix
  3824 + else
  3825 + am_py_prefix=$prefix
  3826 + fi
  3827 + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
  3828 + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
  3829 + case $am_cv_python_pythondir in
  3830 + $am_py_prefix*)
  3831 + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
  3832 + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
  3833 + ;;
  3834 + *)
  3835 + case $am_py_prefix in
  3836 + /usr|/System*) ;;
  3837 + *)
  3838 + am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
  3839 + ;;
  3840 + esac
  3841 + ;;
  3842 + esac
  3843 +
  3844 +fi
  3845 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
  3846 +$as_echo "$am_cv_python_pythondir" >&6; }
  3847 + pythondir=$am_cv_python_pythondir
  3848 +
  3849 +
  3850 +
  3851 + pkgpythondir=\${pythondir}/$PACKAGE
  3852 +
  3853 +
  3854 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
  3855 +$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
  3856 +if test "${am_cv_python_pyexecdir+set}" = set; then :
  3857 + $as_echo_n "(cached) " >&6
  3858 +else
  3859 + if test "x$exec_prefix" = xNONE
  3860 + then
  3861 + am_py_exec_prefix=$am_py_prefix
  3862 + else
  3863 + am_py_exec_prefix=$exec_prefix
  3864 + fi
  3865 + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
  3866 + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
  3867 + case $am_cv_python_pyexecdir in
  3868 + $am_py_exec_prefix*)
  3869 + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
  3870 + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
  3871 + ;;
  3872 + *)
  3873 + case $am_py_exec_prefix in
  3874 + /usr|/System*) ;;
  3875 + *)
  3876 + am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
  3877 + ;;
  3878 + esac
  3879 + ;;
  3880 + esac
  3881 +
  3882 +fi
  3883 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
  3884 +$as_echo "$am_cv_python_pyexecdir" >&6; }
  3885 + pyexecdir=$am_cv_python_pyexecdir
  3886 +
  3887 +
  3888 +
  3889 + pkgpyexecdir=\${pyexecdir}/$PACKAGE
  3890 +
  3891 +
  3892 +
  3893 + fi
  3894 +
  3895 +
  3896 +if ! echo "$PYTHON_VERSION" | grep -q '^2\.'; then
  3897 + # We picked up python 3
  3898 + echo "Found Python version $PYTHON_VERSION; expected version 2.x"
  3899 + echo "Specify a path to Python 2 with the PYTHON environment variable."
  3900 + exit 1
3707 3901 fi
3708 3902
3709 3903 # Fix the paths for includes and libraries
@@ -4086,8 +4280,8 @@ fi
4086 4280
4087 4281 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4088 4282 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4089   -as_fn_error "no acceptable C compiler found in \$PATH
4090   -See \`config.log' for more details." "$LINENO" 5; }
  4283 +as_fn_error $? "no acceptable C compiler found in \$PATH
  4284 +See \`config.log' for more details" "$LINENO" 5; }
4091 4285
4092 4286 # Provide some information about the compiler.
4093 4287 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4423,7 +4617,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
4423 4617 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
4424 4618 set x ${MAKE-make}
4425 4619 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
4426   -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
  4620 +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
4427 4621 $as_echo_n "(cached) " >&6
4428 4622 else
4429 4623 cat >conftest.make <<\_ACEOF
@@ -4431,7 +4625,7 @@ SHELL = /bin/sh
4431 4625 all:
4432 4626 @echo '@@@%%%=$(MAKE)=@@@%%%'
4433 4627 _ACEOF
4434   -# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  4628 +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
4435 4629 case `${MAKE-make} -f conftest.make 2>/dev/null` in
4436 4630 *@@@%%%=?*=@@@%%%*)
4437 4631 eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -4542,12 +4736,12 @@ if test -z "$WSDL2C" && test -f ${AXIS2C_HOME}/bin/tools/wsdl2c/WSDL2C.sh; then
4542 4736 fi
4543 4737 # check if we found WSDL2C.sh
4544 4738 if test -z "$WSDL2C" ; then
4545   - as_fn_error "Cannot find WSDL2C.sh!" "$LINENO" 5
  4739 + as_fn_error $? "Cannot find WSDL2C.sh!" "$LINENO" 5
4546 4740 fi
4547 4741
4548 4742 # we need JAVA_HOME
4549 4743 if test -z "$JAVA_HOME" ; then
4550   - as_fn_error "JAVA_HOME is not defined!" "$LINENO" 5
  4744 + as_fn_error $? "JAVA_HOME is not defined!" "$LINENO" 5
4551 4745 fi
4552 4746
4553 4747 # Extract the first word of "ant", so it can be a program name with args.
@@ -4634,35 +4828,35 @@ fi
4634 4828
4635 4829 # Check the version of java and ant
4636 4830 if test -z "$ANT" ; then
4637   - as_fn_error "Cannot find ant!" "$LINENO" 5
  4831 + as_fn_error $? "Cannot find ant!" "$LINENO" 5
4638 4832 fi
4639 4833 if test -z "$JAVA" ; then
4640   - as_fn_error "Cannot find java!" "$LINENO" 5
  4834 + as_fn_error $? "Cannot find java!" "$LINENO" 5
4641 4835 fi
4642 4836 java_version=`$JAVA -version 2>&1 | grep "java version" | \
4643 4837 sed -e 's/.*java version "\(.*\)".*/\1/'`
4644 4838 goodversion=`expr $java_version ">=" $java_min_version`
4645 4839 if test $goodversion -eq 0; then
4646   - as_fn_error "Eucalyptus needs at least JDK version $java_min_version" "$LINENO" 5
  4840 + as_fn_error $? "Eucalyptus needs at least JDK version $java_min_version" "$LINENO" 5
4647 4841 fi
4648 4842
4649 4843 # now let's test we have jni.h
4650 4844 if test ! -e $JAVA_HOME/include/jni.h ; then
4651   - as_fn_error "Cannot find jni.h in $JAVA_HOME: do you have a JDK installed?" "$LINENO" 5
  4845 + as_fn_error $? "Cannot find jni.h in $JAVA_HOME: do you have a JDK installed?" "$LINENO" 5
4652 4846 fi
4653 4847
4654 4848 ant_version=`$ANT -version 2>&1 | grep "Ant version" | \
4655 4849 sed -e 's/.*Ant version \([0-9.]*\).*/\1/'`
4656 4850 goodversion=`expr $ant_version ">=" $ant_min_version`
4657 4851 if test $goodversion -eq 0; then
4658   - as_fn_error "Eucalyptus needs at least ANT version $ant_min_version" "$LINENO" 5
  4852 + as_fn_error $? "Eucalyptus needs at least ANT version $ant_min_version" "$LINENO" 5
4659 4853 fi
4660 4854 # some version of ant picks up the wrong java
4661 4855 java_version=`$ANT -diagnostics 2>&1 | grep ^java.version | \
4662 4856 sed -e 's/java.* \([0-9.]*\).*/\1/'`
4663 4857 goodversion=`expr $java_version ">=" $java_min_version`
4664 4858 if test $goodversion -eq 0; then
4665   - as_fn_error "ANT is using the wrong java (version less than $java_min_version)" "$LINENO" 5
  4859 + as_fn_error $? "ANT is using the wrong java (version less than $java_min_version)" "$LINENO" 5
4666 4860 fi
4667 4861
4668 4862
@@ -4706,7 +4900,7 @@ _ACEOF
4706 4900 LIBS="-laxis2_axiom $LIBS"
4707 4901
4708 4902 else
4709   - as_fn_error "Cannot find axis2 libs!" "$LINENO" 5
  4903 + as_fn_error $? "Cannot find axis2 libs!" "$LINENO" 5
4710 4904 fi
4711 4905
4712 4906 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -laxis2_engine" >&5
@@ -4747,7 +4941,7 @@ _ACEOF
4747 4941 LIBS="-laxis2_engine $LIBS"
4748 4942
4749 4943 else
4750   - as_fn_error "Cannot find axis2 libs!" "$LINENO" 5
  4944 + as_fn_error $? "Cannot find axis2 libs!" "$LINENO" 5
4751 4945 fi
4752 4946
4753 4947 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -laxis2_http_common" >&5
@@ -4788,7 +4982,7 @@ _ACEOF
4788 4982 LIBS="-laxis2_http_common $LIBS"
4789 4983
4790 4984 else
4791   - as_fn_error "Cannot find axis2 libs!" "$LINENO" 5
  4985 + as_fn_error $? "Cannot find axis2 libs!" "$LINENO" 5
4792 4986 fi
4793 4987
4794 4988 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -laxis2_http_receiver" >&5
@@ -4829,7 +5023,7 @@ _ACEOF
4829 5023 LIBS="-laxis2_http_receiver $LIBS"
4830 5024
4831 5025 else
4832   - as_fn_error "Cannot find axis2 libs!" "$LINENO" 5
  5026 + as_fn_error $? "Cannot find axis2 libs!" "$LINENO" 5
4833 5027 fi
4834 5028
4835 5029 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -laxis2_http_sender" >&5
@@ -4870,7 +5064,7 @@ _ACEOF
4870 5064 LIBS="-laxis2_http_sender $LIBS"
4871 5065
4872 5066 else
4873   - as_fn_error "Cannot find axis2 libs!" "$LINENO" 5
  5067 + as_fn_error $? "Cannot find axis2 libs!" "$LINENO" 5
4874 5068 fi
4875 5069
4876 5070 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lguththila" >&5
@@ -4911,7 +5105,7 @@ _ACEOF
4911 5105 LIBS="-lguththila $LIBS"
4912 5106
4913 5107 else
4914   - as_fn_error "Cannot find libguththila!" "$LINENO" 5
  5108 + as_fn_error $? "Cannot find libguththila!" "$LINENO" 5
4915 5109 fi
4916 5110
4917 5111 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for axiom_xml_reader_init in -laxis2_parser" >&5
@@ -4958,7 +5152,7 @@ _ACEOF
4958 5152 LIBS="-laxis2_parser $LIBS"
4959 5153
4960 5154 else
4961   - as_fn_error "Cannot find axis2 libs!" "$LINENO" 5
  5155 + as_fn_error