diff options
| -rw-r--r-- | config/Tools.mk.in | 4 | ||||
| -rwxr-xr-x | tools/configure | 196 | ||||
| -rw-r--r-- | tools/configure.ac | 8 |
3 files changed, 208 insertions, 0 deletions
diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 69d5f698ad..339a7b6f7b 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -15,6 +15,10 @@ CURL_CONFIG := @CURL@ XML2_CONFIG := @XML@ BASH := @BASH@ XGETTTEXT := @XGETTEXT@ +AS86 := @AS86@ +LD86 := @LD86@ +BCC := @BCC@ +IASL := @IASL@ # Extra folder for libs/includes PREPEND_INCLUDES := @PREPEND_INCLUDES@ diff --git a/tools/configure b/tools/configure index 5082a2b5a5..64b7eb5425 100755 --- a/tools/configure +++ b/tools/configure @@ -633,6 +633,10 @@ INSTALL_PROGRAM SET_MAKE LN_S SED +IASL +BCC +LD86 +AS86 XGETTEXT BASH XML @@ -744,6 +748,10 @@ CURL XML BASH XGETTEXT +AS86 +LD86 +BCC +IASL PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR @@ -1400,6 +1408,10 @@ Some influential environment variables: XML Path to xml2-config tool BASH Path to bash shell XGETTEXT Path to xgetttext tool + AS86 Path to as86 tool + LD86 Path to ld86 tool + BCC Path to bcc tool + IASL Path to iasl tool PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH directories to add to pkg-config's search path @@ -4155,6 +4167,10 @@ LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS" + + + + # Checks for programs. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } @@ -6293,6 +6309,186 @@ 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. +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; } +if test "${ac_cv_path_AS86+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $AS86 in + [\\/]* | ?:[\\/]*) + ac_cv_path_AS86="$AS86" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_AS86="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_AS86" && ac_cv_path_AS86="no" + ;; +esac +fi +AS86=$ac_cv_path_AS86 +if test -n "$AS86"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS86" >&5 +$as_echo "$AS86" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +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. +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; } +if test "${ac_cv_path_LD86+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $LD86 in + [\\/]* | ?:[\\/]*) + ac_cv_path_LD86="$LD86" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_LD86="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_LD86" && ac_cv_path_LD86="no" + ;; +esac +fi +LD86=$ac_cv_path_LD86 +if test -n "$LD86"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD86" >&5 +$as_echo "$LD86" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +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. +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; } +if test "${ac_cv_path_BCC+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $BCC in + [\\/]* | ?:[\\/]*) + ac_cv_path_BCC="$BCC" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_BCC="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_BCC" && ac_cv_path_BCC="no" + ;; +esac +fi +BCC=$ac_cv_path_BCC +if test -n "$BCC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BCC" >&5 +$as_echo "$BCC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +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. +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; } +if test "${ac_cv_path_IASL+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $IASL in + [\\/]* | ?:[\\/]*) + ac_cv_path_IASL="$IASL" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_IASL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_IASL" && ac_cv_path_IASL="no" + ;; +esac +fi +IASL=$ac_cv_path_IASL +if test -n "$IASL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IASL" >&5 +$as_echo "$IASL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test x"${IASL}" == x"no" +then + as_fn_error $? "Unable to find iasl, please install iasl" "$LINENO" 5 +fi 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 4d96db0bfc..0204e36449 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -64,6 +64,10 @@ AC_ARG_VAR([CURL], [Path to curl-config tool]) AC_ARG_VAR([XML], [Path to xml2-config tool]) AC_ARG_VAR([BASH], [Path to bash shell]) AC_ARG_VAR([XGETTEXT], [Path to xgetttext tool]) +AC_ARG_VAR([AS86], [Path to as86 tool]) +AC_ARG_VAR([LD86], [Path to ld86 tool]) +AC_ARG_VAR([BCC], [Path to bcc tool]) +AC_ARG_VAR([IASL], [Path to iasl tool]) # Checks for programs. AC_PROG_SED @@ -96,6 +100,10 @@ AS_IF([test "x$pythontools" = "xy"], [ 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 PKG_CHECK_MODULES(glib, glib-2.0) |