From f3bee13cadc3ff9f168dc4c77f016951b2e35cc0 Mon Sep 17 00:00:00 2001 From: Volker Ruppert Date: Thu, 12 Oct 2006 17:58:09 +0000 Subject: [PATCH] - Bochs on Solaris always needs to be linked with the socket library - serial terminal support now enabled on Solaris - only complain about the missing wxWidgets library if requested --- bochs/configure | 72 +++++++++++++++++++++++--------------------- bochs/configure.in | 7 +++-- bochs/iodev/serial.h | 4 +-- 3 files changed, 44 insertions(+), 39 deletions(-) diff --git a/bochs/configure b/bochs/configure index c0f612305..45dac3a21 100755 --- a/bochs/configure +++ b/bochs/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in,v 1.327 2006/09/24 17:15:02 sshwarts Exp . +# From configure.in Id: configure.in,v 1.329 2006/10/12 17:57:34 vruppert Exp . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -1756,6 +1756,7 @@ case "$target" in ;; *-solaris*) ADD_FLAGS="-D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__" # required for correct function prototypes + LIBS="$LIBS -lsocket" DEFAULT_GUI=x11 ;; *) @@ -3680,7 +3681,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3683 "configure"' > conftest.$ac_ext + echo '#line 3684 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4788,7 +4789,7 @@ fi # Provide some information about the compiler. -echo "$as_me:4791:" \ +echo "$as_me:4792:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -5826,11 +5827,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5829: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5830: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:5833: \$? = $ac_status" >&5 + echo "$as_me:5834: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6059,11 +6060,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6062: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6063: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6066: \$? = $ac_status" >&5 + echo "$as_me:6067: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6126,11 +6127,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6129: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6130: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6133: \$? = $ac_status" >&5 + echo "$as_me:6134: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8292,7 +8293,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:10573: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10576: \$? = $ac_status" >&5 + echo "$as_me:10577: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -10636,11 +10637,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10639: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10640: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10643: \$? = $ac_status" >&5 + echo "$as_me:10644: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11979,7 +11980,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12904: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12907: \$? = $ac_status" >&5 + echo "$as_me:12908: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12967,11 +12968,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12970: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12971: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12974: \$? = $ac_status" >&5 + echo "$as_me:12975: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14983,11 +14984,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14986: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14987: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14990: \$? = $ac_status" >&5 + echo "$as_me:14991: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15216,11 +15217,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15219: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15220: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15223: \$? = $ac_status" >&5 + echo "$as_me:15224: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15283,11 +15284,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15286: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15287: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15290: \$? = $ac_status" >&5 + echo "$as_me:15291: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17449,7 +17450,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&5 + if test "$with_wx" = yes; then + { echo "$as_me:$LINENO: WARNING: Bochs for wxWidgets cannot be compiled here, disabling it" >&5 echo "$as_me: WARNING: Bochs for wxWidgets cannot be compiled here, disabling it" >&2;} + fi with_wx=no fi fi @@ -39560,10 +39563,9 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_i=`echo "$ac_i" | sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' done LIBOBJS=$ac_libobjs diff --git a/bochs/configure.in b/bochs/configure.in index c1b043795..373a79e89 100644 --- a/bochs/configure.in +++ b/bochs/configure.in @@ -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.328 2006-10-03 21:45:17 sshwarts Exp $]]) +AC_REVISION([[$Id: configure.in,v 1.329 2006-10-12 17:57:34 vruppert Exp $]]) AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(ltdlconf.h) @@ -68,6 +68,7 @@ case "$target" in ;; *-solaris*) ADD_FLAGS="-D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__" # required for correct function prototypes + LIBS="$LIBS -lsocket" DEFAULT_GUI=x11 ;; *) @@ -2070,7 +2071,9 @@ if test "$cross_configure" = 0; then with_wx=yes fi else - AC_MSG_WARN([Bochs for wxWidgets cannot be compiled here, disabling it]) + if test "$with_wx" = yes; then + AC_MSG_WARN([Bochs for wxWidgets cannot be compiled here, disabling it]) + fi with_wx=no fi fi diff --git a/bochs/iodev/serial.h b/bochs/iodev/serial.h index dabda7f74..1d3d9f944 100644 --- a/bochs/iodev/serial.h +++ b/bochs/iodev/serial.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: serial.h,v 1.29 2006-05-27 15:54:49 sshwarts Exp $ +// $Id: serial.h,v 1.30 2006-10-12 17:57:35 vruppert Exp $ ///////////////////////////////////////////////////////////////////////// // // Copyright (C) 2004 MandrakeSoft S.A. @@ -43,7 +43,7 @@ #define SERIAL_ENABLE #endif -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) || defined(__APPLE__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) || defined(__APPLE__) || defined(__sun__) #define SERIAL_ENABLE extern "C" { #include