diff options
| -rwxr-xr-x | tools/configure | 98 | ||||
| -rw-r--r-- | tools/configure.ac | 28 |
2 files changed, 112 insertions, 14 deletions
diff --git a/tools/configure b/tools/configure index a96d772473..0da1a1b18c 100755 --- a/tools/configure +++ b/tools/configure @@ -670,6 +670,14 @@ xenapi vtpm monitors githttp +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build target_alias host_alias build_alias @@ -1352,6 +1360,10 @@ Fine tuning of the installation directories: _ACEOF cat <<\_ACEOF + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] _ACEOF fi @@ -2181,6 +2193,78 @@ APPEND_INCLUDES and APPEND_LIB instead when possible." >&2;} fi +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if test "${ac_cv_build+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if test "${ac_cv_host+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + + # M4 Macro includes @@ -5417,7 +5501,7 @@ LDLFAGS=$ac_previous_ldflags fi -# Extract the first word of "xgettext", so it can be a program name with args. + # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -5462,7 +5546,9 @@ if test x"${XGETTEXT}" == x"no" then as_fn_error $? "Unable to find xgettext, please install xgettext" "$LINENO" 5 fi -# Extract the first word of "as86", so it can be a program name with args. +case "$host_cpu" in +i[3456]86|x86_64) + # Extract the first word of "as86", so it can be a program name with args. set dummy as86; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -5507,7 +5593,7 @@ if test x"${AS86}" == x"no" then as_fn_error $? "Unable to find as86, please install as86" "$LINENO" 5 fi -# Extract the first word of "ld86", so it can be a program name with args. + # Extract the first word of "ld86", so it can be a program name with args. set dummy ld86; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -5552,7 +5638,7 @@ if test x"${LD86}" == x"no" then as_fn_error $? "Unable to find ld86, please install ld86" "$LINENO" 5 fi -# Extract the first word of "bcc", so it can be a program name with args. + # Extract the first word of "bcc", so it can be a program name with args. set dummy bcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -5597,7 +5683,7 @@ if test x"${BCC}" == x"no" then as_fn_error $? "Unable to find bcc, please install bcc" "$LINENO" 5 fi -# Extract the first word of "iasl", so it can be a program name with args. + # Extract the first word of "iasl", so it can be a program name with args. set dummy iasl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -5642,6 +5728,8 @@ if test x"${IASL}" == x"no" then as_fn_error $? "Unable to find iasl, please install iasl" "$LINENO" 5 fi + ;; +esac ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default" if test "x$ac_cv_header_uuid_uuid_h" = x""yes; then : diff --git a/tools/configure.ac b/tools/configure.ac index e37d93ad3f..59b9aaffb9 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -19,6 +19,8 @@ recommended, use PREPEND_INCLUDES, PREPEND_LIB, \ APPEND_INCLUDES and APPEND_LIB instead when possible.]) ]) +AC_CANONICAL_HOST + # M4 Macro includes m4_include([m4/savevar.m4]) m4_include([m4/features.m4]) @@ -100,15 +102,23 @@ AS_IF([test "x$pythontools" = "xy"], [ [AC_MSG_ERROR([PYTHON specified, but is not an absolute path])]) AX_PATH_PROG_OR_FAIL([PYTHONPATH], [$PYTHON]) AX_CHECK_PYTHON_VERSION([2], [3]) - AX_CHECK_PYTHON_DEVEL() -]) -AX_PATH_PROG_OR_FAIL([XGETTEXT], [xgettext]) -AX_PATH_PROG_OR_FAIL([AS86], [as86]) -AX_PATH_PROG_OR_FAIL([LD86], [ld86]) -AX_PATH_PROG_OR_FAIL([BCC], [bcc]) -AX_PATH_PROG_OR_FAIL([IASL], [iasl]) -AX_CHECK_UUID -AX_CHECK_CURSES + AX_CHECK_PYTHON_DEVEL() + ]) + AX_PATH_PROG_OR_FAIL([XGETTEXT], [xgettext]) +dnl as86, ld86, bcc and iasl are only required when the host system is x86*. +dnl "host" here means the platform on which the hypervisor and tools is +dnl going to run, not the platform on which we are building (known as +dnl "build" in gnu speak). +case "$host_cpu" in +i[[3456]]86|x86_64) + AX_PATH_PROG_OR_FAIL([AS86], [as86]) + AX_PATH_PROG_OR_FAIL([LD86], [ld86]) + AX_PATH_PROG_OR_FAIL([BCC], [bcc]) + AX_PATH_PROG_OR_FAIL([IASL], [iasl]) + ;; +esac + AX_CHECK_UUID + AX_CHECK_CURSES PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.12]) # Check library path |