[Bochs-cvs] CVS: bochs configure.in,1.137,1.138 configure,1.136,1.137

[Bryce D. <bd...@us...>]

Update of /cvsroot/bochs/bochs
In directory usw-pr-cvs1:/tmp/cvs-serv26370

Modified Files:
	configure.in configure 
Log Message:
- remove pthread check for wxwindows.  This used to be needed to add the
  "-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.


Index: configure.in
===================================================================
RCS file: /cvsroot/bochs/bochs/configure.in,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- configure.in	30 Sep 2002 14:11:21 -0000	1.137
+++ configure.in	30 Sep 2002 14:35:34 -0000	1.138
@@ -1787,25 +1787,6 @@
   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

Index: configure
===================================================================
RCS file: /cvsroot/bochs/bochs/configure,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- configure	30 Sep 2002 02:02:03 -0000	1.136
+++ configure	30 Sep 2002 14:35:34 -0000	1.137
@@ -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 @@
     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
@@ -11720,25 +11723,6 @@
 		;;
 	  *)
     echo ERROR: --with-rfb requires the pthread library, which could not be found.; exit 1
-    esac
-  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