- the variable $cross_configure is now set to yes if $cross_compiling returns
"yes" or the target OS is "windows" (special case for MSVC) - fixed typo in docbook2html check
This commit is contained in:
parent
e5c3e3c262
commit
c50c9b602e
14
bochs/configure
vendored
14
bochs/configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in,v 1.276 2005/03/28 10:26:14 vruppert Exp .
|
||||
# From configure.in Id: configure.in,v 1.277 2005/03/30 16:40:36 vruppert Exp .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59.
|
||||
#
|
||||
@ -1687,14 +1687,14 @@ test -n "$target_alias" &&
|
||||
|
||||
echo "$as_me:$LINENO: checking if you are configuring for another platform" >&5
|
||||
echo $ECHO_N "checking if you are configuring for another platform... $ECHO_C" >&6
|
||||
if test "$target" = "$build"; then
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
cross_configure=0
|
||||
else
|
||||
if test "$cross_compiling" = yes -o "$target_os" = "windows"; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
cross_configure=1
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
cross_configure=0
|
||||
fi
|
||||
|
||||
# this case statement defines the compile flags which are needed to
|
||||
@ -36707,7 +36707,7 @@ if test $build_docbook = 1; then
|
||||
echo "${ECHO_T}yes" >&6
|
||||
BUILD_DOCBOOK_VAR=build_docbook
|
||||
INSTALL_DOCBOOK_VAR=install_docbook
|
||||
if test "$DOCBOOK2HTML" == not_found; then
|
||||
if test "$DOCBOOK2HTML" = not_found; then
|
||||
echo "ERROR: docbook2html must be installed to build the documentation"
|
||||
exit 1
|
||||
fi
|
||||
|
@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ(2.50)
|
||||
AC_INIT(bochs.h)
|
||||
AC_REVISION([[$Id: configure.in,v 1.276 2005-03-28 10:26:14 vruppert Exp $]])
|
||||
AC_REVISION([[$Id: configure.in,v 1.277 2005-03-30 16:40:36 vruppert Exp $]])
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
AC_CONFIG_HEADER(ltdlconf.h)
|
||||
|
||||
@ -20,12 +20,12 @@ AC_CANONICAL_HOST
|
||||
AC_CANONICAL_TARGET
|
||||
|
||||
AC_MSG_CHECKING(if you are configuring for another platform)
|
||||
if test "$target" = "$build"; then
|
||||
AC_MSG_RESULT(no)
|
||||
cross_configure=0
|
||||
else
|
||||
if test "$cross_compiling" = yes -o "$target_os" = "windows"; then
|
||||
AC_MSG_RESULT(yes)
|
||||
cross_configure=1
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
cross_configure=0
|
||||
fi
|
||||
|
||||
# this case statement defines the compile flags which are needed to
|
||||
@ -1947,7 +1947,7 @@ if test $build_docbook = 1; then
|
||||
AC_MSG_RESULT(yes)
|
||||
BUILD_DOCBOOK_VAR=build_docbook
|
||||
INSTALL_DOCBOOK_VAR=install_docbook
|
||||
if test "$DOCBOOK2HTML" == not_found; then
|
||||
if test "$DOCBOOK2HTML" = not_found; then
|
||||
echo "ERROR: docbook2html must be installed to build the documentation"
|
||||
exit 1
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user