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

- remove pthread check for wxwindows. This used to be needed to add the

Browse Source 
"-pthread" flag to the link line, but as of wxWindows 2.3.3 their
  wx-config script adds it for us.  Given the keyboard mapping improvements
  in wx 2.3.3, I don't expect to support any previous version.
This commit is contained in:
Bryce Denney 2002-09-30 14:35:34 +00:00
parent d92ccf70ae
commit e658f463ab
2 changed files with 7 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bochs/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in,v 1.135 2002/09/27 20:06:57 bdenney Exp .
# From configure.in Id: configure.in,v 1.137 2002/09/30 14:11:21 bdenney Exp .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.53.
#
@ -1434,8 +1434,11 @@ case "$target" in
DEFAULT_GUI=x11
;;
esac
CFLAGS="$CFLAGS $ADD_FLAGS"
CXXFLAGS="$CXXFLAGS $ADD_FLAGS"
if "${ADD_FLAGS:+set}" = set
then
CFLAGS="$CFLAGS $ADD_FLAGS"
CXXFLAGS="$CXXFLAGS $ADD_FLAGS"
fi
echo "$as_me:$LINENO: checking for standard CFLAGS on this platform" >&5
echo $ECHO_N "checking for standard CFLAGS on this platform... $ECHO_C" >&6
@ -11724,25 +11727,6 @@ if test "$with_rfb" = yes -a "$cross_configure" = 0; then
fi
fi
# since wxWindows (usually) needs pthread library, check that it was found.
# But on win32 platforms, the pthread library is not needed.
if test "$with_wx" = yes -a "$cross_configure" = 0; then
if test "$pthread_ok" = yes; then
GUI_LINK_OPTS="$PTHREAD_LIBS $GUI_LINK_OPTS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC"
else
case "$target" in
*-pc-windows* | *-pc-winnt* | *-cygwin* | *-mingw*)
# pthread not needed for win32 platform
;;
*)
echo ERROR: --with-wx requires the pthread library, which could not be found.; exit 1
esac
fi
fi
# Create some subdirectories for when you run configure from some other
# directory.
if test ! -d instrument; then mkdir instrument; fi

21
bochs/configure.in
View File

@ -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.137 2002-09-30 14:11:21 bdenney Exp $]])
AC_REVISION([[$Id: configure.in,v 1.138 2002-09-30 14:35:34 bdenney Exp $]])
AC_CONFIG_HEADER(config.h)
dnl // Put Bochs version information right here so that it gets substituted
@ -1787,25 +1787,6 @@ if test "$with_rfb" = yes -a "$cross_configure" = 0; then
fi
fi
# since wxWindows (usually) needs pthread library, check that it was found.
# But on win32 platforms, the pthread library is not needed.
if test "$with_wx" = yes -a "$cross_configure" = 0; then
if test "$pthread_ok" = yes; then
GUI_LINK_OPTS="$PTHREAD_LIBS $GUI_LINK_OPTS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC"
else
case "$target" in
*-pc-windows* | *-pc-winnt* | *-cygwin* | *-mingw*)
# pthread not needed for win32 platform
;;
*)
echo ERROR: --with-wx requires the pthread library, which could not be found.; exit 1
esac
fi
fi
# Create some subdirectories for when you run configure from some other
# directory.
if test ! -d instrument; then mkdir instrument; fi