[Bochs-cvs] CVS: bochs configure,1.279,1.280

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/bochs/bochs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15493

Modified Files:
	configure 
Log Message:
- some fixes for wxWidgets 2.6 compatiblity
  * added hack to detect GTK 2 and set include path
  * don't use obsolete wxNotebookSizer
  * TODO: wxGTK version is still buggy (wrong dialogs when pressing toolbar buttons)
- updated version number and strings


Index: configure
===================================================================
RCS file: /cvsroot/bochs/bochs/configure,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -d -r1.279 -r1.280

--- configure	15 May 2005 07:20:13 -0000	1.279
+++ configure	17 May 2005 18:07:04 -0000	1.280
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in,v 1.285 2005/05/15 07:19:07 vruppert Exp .
+# From configure.in Id: configure.in,v 1.286 2005/05/17 18:05:48 vruppert Exp .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -1570,9 +1570,9 @@
           ac_config_headers="$ac_config_headers ltdlconf.h"
 
 
-VERSION="2.2.pre4"
-VER_STRING="2.2.pre4"
-REL_STRING="Build from CVS snapshot on May 15th, 2005"
+VERSION="2.2.pre4.cvs"
+VER_STRING="2.2.pre4.cvs"
+REL_STRING="Build from CVS, after 2.2.pre4"
 
 
 
@@ -36903,6 +36903,7 @@
 echo "${ECHO_T}$WX_CONFIG" >&6
 
 ok_wx_version=0
+wx_needs_gtk2=0
 echo "$as_me:$LINENO: checking for wxWidgets library version" >&5
 echo $ECHO_N "checking for wxWidgets library version... $ECHO_C" >&6
 if test x$WX_CONFIG != xnot_found; then
@@ -36912,9 +36913,9 @@
   case x$WX_VERSION in
     x2.[012]*) ;; # less than version 2.3.x
     x2.3.[01]) ;; # less than version 2.3.2
-    x2.3.[2-9]*) ok_wx_version=1 ;;  # 2.3.2 or greater
-    x2.3.[1-9][0-9]*) ok_wx_version=1 ;;  # 2.3.10 or greater
-    x2.[4-9]*) ok_wx_version=1 ;;  # version 2.4 or greater
+    x2.3.[2-4]*) ok_wx_version=1 ;;  # 2.3.2 or greater
+    x2.[4-5]*) ok_wx_version=1 ;;  # version 2.4 / 2.5
+    x2.[6-9]*) ok_wx_version=1 wx_needs_gtk2=1 ;;  # version 2.6 or greater
     x[3-9]*) ok_wx_version=1 ;;  # version 3 or greater
     *) ;; # who knows?
   esac
@@ -37292,12 +37293,161 @@
   WX_CFLAGS="\`$WX_CONFIG --cflags\`"
   WX_CXXFLAGS="\`$WX_CONFIG --cxxflags\`"
   GUI_LINK_OPTS_WX="\`$WX_CONFIG --libs\`"
-  # if gtk-config exists, then add it to the cflags.
-  gtkconf=`gtk-config --cflags`
-  if test $? = 0; then
-    # gtk-config was found and returned 0, so it must return valid output
-    WX_CFLAGS="$WX_CFLAGS \`gtk-config --cflags\`"
-    WX_CXXFLAGS="$WX_CXXFLAGS \`gtk-config --cflags\`"
+  if test "$wx_needs_gtk2" = 1; then
+    # this hack might not work with all GTK 2 installations
+    if test "${ac_cv_header__opt_gnome_include_gtk_2_0_gdk_gdkkeysyms_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h" >&5
+echo $ECHO_N "checking for /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h... $ECHO_C" >&6
+if test "${ac_cv_header__opt_gnome_include_gtk_2_0_gdk_gdkkeysyms_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header__opt_gnome_include_gtk_2_0_gdk_gdkkeysyms_h" >&5
+echo "${ECHO_T}$ac_cv_header__opt_gnome_include_gtk_2_0_gdk_gdkkeysyms_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h usability" >&5
+echo $ECHO_N "checking /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include </opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h presence" >&5
+echo $ECHO_N "checking /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include </opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h" >&5
+echo $ECHO_N "checking for /opt/gnome/include/gtk-2.0/gdk/gdkkeysyms.h... $ECHO_C" >&6
+if test "${ac_cv_header__opt_gnome_include_gtk_2_0_gdk_gdkkeysyms_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header__opt_gnome_include_gtk_2_0_gdk_gdkkeysyms_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header__opt_gnome_include_gtk_2_0_gdk_gdkkeysyms_h" >&5
+echo "${ECHO_T}$ac_cv_header__opt_gnome_include_gtk_2_0_gdk_gdkkeysyms_h" >&6
+
+fi
+if test $ac_cv_header__opt_gnome_include_gtk_2_0_gdk_gdkkeysyms_h = yes; then
+
+      WX_CFLAGS="$WX_CFLAGS -I/opt/gnome/include/gtk-2.0"
+      WX_CXXFLAGS="$WX_CXXFLAGS -I/opt/gnome/include/gtk-2.0"
+
+fi
+
+
+  else
+    # if gtk-config exists, then add it to the cflags.
+    gtkconf=`gtk-config --cflags`
+    if test $? = 0; then
+      # gtk-config was found and returned 0, so it must return valid output
+      WX_CFLAGS="$WX_CFLAGS \`gtk-config --cflags\`"
+      WX_CXXFLAGS="$WX_CXXFLAGS \`gtk-config --cflags\`"
+    fi
   fi
   # GUI_C*FLAGS are added to the compilation of every bochs file, not just
   # the files in gui/*.cc.  They are not used when building other things



