mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added scrollwin.o in configure scripts for mingw

Browse Source
This commit is contained in:
Stanislav Shwartsman 2013-03-18 20:47:08 +00:00
parent 2bb620844f
commit 25733b4387
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
bochs/configure vendored
View File

@ -3023,7 +3023,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
|| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "failed to load site script $ac_site_file as_fn_error $? "failed to load site script $ac_site_file
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
fi fi
done done
@ -3177,7 +3177,7 @@ fi
$as_echo "$ac_cv_build" >&6; } $as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in case $ac_cv_build in
*-*-*) ;; *-*-*) ;;
*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
esac esac
build=$ac_cv_build build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-' ac_save_IFS=$IFS; IFS='-'
@ -3210,7 +3210,7 @@ fi
$as_echo "$ac_cv_host" >&6; } $as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in case $ac_cv_host in
*-*-*) ;; *-*-*) ;;
*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
esac esac
host=$ac_cv_host host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-' ac_save_IFS=$IFS; IFS='-'
@ -3243,7 +3243,7 @@ fi
$as_echo "$ac_cv_target" >&6; } $as_echo "$ac_cv_target" >&6; }
case $ac_cv_target in case $ac_cv_target in
*-*-*) ;; *-*-*) ;;
*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
esac esac
target=$ac_cv_target target=$ac_cv_target
ac_save_IFS=$IFS; IFS='-' ac_save_IFS=$IFS; IFS='-'
@ -3661,7 +3661,7 @@ fi
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "no acceptable C compiler found in \$PATH as_fn_error $? "no acceptable C compiler found in \$PATH
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
# Provide some information about the compiler. # Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@ -3776,7 +3776,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "C compiler cannot create executables as_fn_error 77 "C compiler cannot create executables
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
@ -3819,7 +3819,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of executables: cannot compile and link as_fn_error $? "cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
fi fi
rm -f conftest conftest$ac_cv_exeext rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@ -3878,7 +3878,7 @@ $as_echo "$ac_try_echo"; } >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run C compiled programs. as_fn_error $? "cannot run C compiled programs.
If you meant to cross compile, use \`--host'. If you meant to cross compile, use \`--host'.
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
fi fi
fi fi
fi fi
@ -3930,7 +3930,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of object files: cannot compile as_fn_error $? "cannot compute suffix of object files: cannot compile
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
fi fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi fi
@ -5389,7 +5389,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "C preprocessor \"$CPP\" fails sanity check as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
fi fi
ac_ext=c ac_ext=c
@ -5664,7 +5664,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
fi fi
ac_ext=cpp ac_ext=cpp
@ -19443,7 +19443,7 @@ if test "x$with_x" = xno; then
have_x=disabled have_x=disabled
else else
case $x_includes,$x_libraries in #( case $x_includes,$x_libraries in #(
*\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
*,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
@ -20334,7 +20334,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
;; #( ;; #(
*) *)
as_fn_error $? "unknown endianness as_fn_error $? "unknown endianness
presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
@ -20395,7 +20395,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute sizeof (unsigned char) as_fn_error 77 "cannot compute sizeof (unsigned char)
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
else else
ac_cv_sizeof_unsigned_char=0 ac_cv_sizeof_unsigned_char=0
fi fi
@ -20428,7 +20428,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute sizeof (unsigned short) as_fn_error 77 "cannot compute sizeof (unsigned short)
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
else else
ac_cv_sizeof_unsigned_short=0 ac_cv_sizeof_unsigned_short=0
fi fi
@ -20461,7 +20461,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute sizeof (unsigned int) as_fn_error 77 "cannot compute sizeof (unsigned int)
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
else else
ac_cv_sizeof_unsigned_int=0 ac_cv_sizeof_unsigned_int=0
fi fi
@ -20494,7 +20494,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute sizeof (unsigned long) as_fn_error 77 "cannot compute sizeof (unsigned long)
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
else else
ac_cv_sizeof_unsigned_long=0 ac_cv_sizeof_unsigned_long=0
fi fi
@ -20527,7 +20527,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute sizeof (unsigned long long) as_fn_error 77 "cannot compute sizeof (unsigned long long)
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
else else
ac_cv_sizeof_unsigned_long_long=0 ac_cv_sizeof_unsigned_long_long=0
fi fi
@ -20560,7 +20560,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute sizeof (int *) as_fn_error 77 "cannot compute sizeof (int *)
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
else else
ac_cv_sizeof_int_p=0 ac_cv_sizeof_int_p=0
fi fi
@ -23020,7 +23020,7 @@ $as_echo_n "checking if readline works without -lcurses... " >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling as_fn_error $? "cannot run test program while cross compiling
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
else else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
@ -23050,7 +23050,7 @@ $as_echo_n "checking if readline works with -lcurses... " >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling as_fn_error $? "cannot run test program while cross compiling
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5 ; }
else else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
@ -24685,7 +24685,7 @@ fi
LIBS="$LIBS -lcomctl32" LIBS="$LIBS -lcomctl32"
fi fi
fi fi
DIALOG_OBJS="win32dialog.o win32paramdlg.o" DIALOG_OBJS="win32dialog.o win32paramdlg.o scrollwin.o"
EXPORT_DYNAMIC="" EXPORT_DYNAMIC=""
;; ;;
esac esac
@ -26223,7 +26223,7 @@ do
"build/win32/nsis/bochs.nsi") CONFIG_FILES="$CONFIG_FILES build/win32/nsis/bochs.nsi" ;; "build/win32/nsis/bochs.nsi") CONFIG_FILES="$CONFIG_FILES build/win32/nsis/bochs.nsi" ;;
"host/linux/pcidev/Makefile") CONFIG_FILES="$CONFIG_FILES host/linux/pcidev/Makefile" ;; "host/linux/pcidev/Makefile") CONFIG_FILES="$CONFIG_FILES host/linux/pcidev/Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
esac esac
done done
@ -26540,7 +26540,7 @@ do
esac esac
case $ac_mode$ac_tag in case $ac_mode$ac_tag in
:[FHL]*:*);; :[FHL]*:*);;
:L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
:[FH]-) ac_tag=-:-;; :[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac esac
@ -26568,7 +26568,7 @@ do
[\\/$]*) false;; [\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac || esac ||
as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
esac esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'" as_fn_append ac_file_inputs " '$ac_f'"
@ -26595,7 +26595,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
case $ac_tag in case $ac_tag in
*:-:* | *:-) cat >"$ac_tmp/stdin" \ *:-:* | *:-) cat >"$ac_tmp/stdin" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac esac
;; ;;
esac esac

2
bochs/configure.in
View File

@ -2458,7 +2458,7 @@ case $target in
LIBS="$LIBS -lcomctl32" LIBS="$LIBS -lcomctl32"
fi fi
fi fi
DIALOG_OBJS="win32dialog.o win32paramdlg.o" DIALOG_OBJS="win32dialog.o win32paramdlg.o scrollwin.o"
EXPORT_DYNAMIC="" EXPORT_DYNAMIC=""
;; ;;
esac esac