--- acinclude.m4.orig	Fri Jul 30 03:38:58 2004
+++ acinclude.m4	Fri Jul 30 04:05:32 2004
@@ -166,10 +166,10 @@
 fi], [
     AC_MSG_RESULT(yes)
     WX_HOME=/usr/local/wx2
-    if test ! -f "${WX_HOME}/include/wx/wx.h"
+    if test ! -f "${WX_HOME}/include/wx-2.5/wx/wx.h"
     then
         WX_HOME=/usr/local
-        if test ! -f "${WX_HOME}/include/wx/wx.h"
+        if test ! -f "${WX_HOME}/include/wx-2.5/wx/wx.h"
         then
             WX_HOME=/usr
         fi
@@ -428,7 +428,7 @@
     fi
 
     WX_NEW_CPPFLAGS=`${WX_CONFIG} --cxxflags`
-    CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS -I${WX_HOME}/include"
+    CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS -I${WX_HOME}/include -I${WX_HOME}/include/wx-2.5"
     case "${host}" in
         *-apple-darwin*)
             CPPFLAGS="$CPPFLAGS -no-cpp-precomp -fno-rtti"
@@ -437,16 +437,16 @@
             ;;
     esac
     wx_wx_h="yes"
-    if test ! -f "${WX_HOME}/include/wx/version.h"
+    if test ! -f "${WX_HOME}/include/wx-2.5/wx/version.h"
     then
         wx_wx_h="no"
     fi
-    if test ! -f "${WX_HOME}/include/wx/stc/stc.h"
+    if test ! -f "${WX_HOME}/include/wx-2.5/wx/stc/stc.h"
     then
         AC_MSG_ERROR([you need to install the stc package from wxWindows/contrib/src/stc])
         wx_wx_h="no"
     fi
-    if test ! -f "${WX_HOME}/include/wx/xrc/xmlres.h"
+    if test ! -f "${WX_HOME}/include/wx-2.5/wx/xrc/xmlres.h"
     then
         AC_MSG_ERROR([you need to install the xrc package from wxWindows/contrib/src/xrc])
         wx_wx_h="no"