Index: configure.in
===================================================================
--- configure.in	(revision 29954)
+++ configure.in	(working copy)
@@ -193,7 +193,8 @@
 LOC_ARG_WITH(readline, Readline, no)
 LOC_ARG_WITH(opendwg, openDWG, no)
 LOC_ARG_WITH(curses, Curses, yes)
-LOC_ARG_WITH(python, PYTHON, no)
+LOC_ARG_WITH(python, Python, no)
+LOC_ARG_WITH(wxwidgets, wxWidgets, no)
 
 # With includes and libs options
 
@@ -1623,7 +1624,7 @@
 
 # Python check
 
-LOC_CHECK_USE(python, PYTHON, USE_PYTHON)
+LOC_CHECK_USE(python, Python, USE_PYTHON)
 
 if test -n "$USE_PYTHON"; then
 
@@ -1669,10 +1670,81 @@
 by using (for example) --with-python=/usr/bin/python2.3])
 fi
 
-fi
+# With Python includes directory 
 
+PYTHONINC="`$PYTHON -c ['
+import sys
+includepy = \"%s/include/python%s\" % (sys.prefix, sys.version[:3])
+if sys.version[0] > \"1\" or sys.version[2] > \"4\":
+    libpl = \"%s/include/python%s\" % (sys.exec_prefix, sys.version[:3])
+else:
+    libpl = \"%s/'$PYLIB'/python%s/config\" % (sys.exec_prefix, sys.version[:3])
+print \"-I%s -I%s\" % (includepy, libpl)'`]"
+
+LOC_CHECK_INCLUDES(Python.h,Python,$PYTHONINC) 
+
+fi # Done checking Python
+
+AC_SUBST(PYTHONINC)
 AC_SUBST(USE_PYTHON)
 
+# Enable wxWidgets support (for wxGUI)
+LOC_CHECK_USE(wxwidgets,wxWidgets,USE_WXWIDGETS) 
+
+WXWIDGETSINC= 
+WXWIDGETSLIB= 
+
+if test -n "$USE_WXWIDGETS"; then 
+
+# wxWidgets version 2.8.1 or later required
+REQWX=2.8.7
+
+AC_PATH_PROG(WX_CONFIG, wx-config, no)
+
+if test "$WX_CONFIG" = "no" ; then
+    AC_MSG_ERROR([*** couldn't find wx-config
+
+  	  	  wxWidgets must be installed on your system.
+  
+                  Please check that wx-config is in path, the directory
+                  where wxWidgets libraries are installed (returned by
+                  'wx-config --libs' or 'wx-config --static --libs' command)
+                  is in LD_LIBRARY_PATH or equivalent variable and
+                  wxWidgets version is 2.8.1 or above.])
+fi
+
+# Check wxWidgets version
+
+AC_MSG_CHECKING([wxWidgets version])
+if WXVERSION=`"$WX_CONFIG" --version`; then
+    AC_MSG_RESULT([$WXVERSION])
+else
+    AC_MSG_RESULT([not found])
+    AC_MSG_ERROR([wxWidgets is required.])
+fi
+if test `expr "$WXVERSION" \< "$REQWX"` = 1 ; then
+   AC_MSG_ERROR([*** wxWidgets "$REQWX" or later is required.])
+fi
+
+# With wxWidgets includes directory 
+
+WXWIDGETSINC=`"$WX_CONFIG" --cxxflags`
+
+LOC_CHECK_INCLUDES(wx/wxprec.h,wxWidgets,$WXWIDGETSINC) 
+LOC_CHECK_INCLUDES(wx/wxPython/pseudodc.h,wxWidgets,$WXWIDGETSINC) 
+
+# With wxWidgets library directory 
+
+WXWIDGETSLIB=`"$WX_CONFIG" --libs` 
+
+fi # $USE_WXWIDGETS
+
+AC_SUBST(WXWIDGETSINC) 
+AC_SUBST(WXWIDGETSLIB) 
+AC_SUBST(USE_WXWIDGETS) 
+
+# Done checking wxWidgets
+
 USE_TERMIO=
 AC_SUBST(USE_TERMIO)
 
@@ -1733,6 +1805,7 @@
 LOC_MSG_USE(Readline support,USE_READLINE)
 LOC_MSG_USE(SQLite support,USE_SQLITE)
 LOC_MSG_USE(Tcl/Tk support,USE_TCLTK)
+LOC_MSG_USE(wxWidgets support,USE_WXWIDGETS)
 LOC_MSG_USE(TIFF support,USE_TIFF)
 LOC_MSG_USE(X11 support,USE_X11)
 LOC_MSG_USE(Cairo support,USE_CAIRO)
Index: include/Make/Platform.make.in
===================================================================
--- include/Make/Platform.make.in	(revision 29957)
+++ include/Make/Platform.make.in	(working copy)
@@ -210,8 +210,14 @@
 
 #Python
 PYVERSION           = @PYVERSION@
+PYTHONINC           = @PYTHONINC@
 USE_PYTHON          = @USE_PYTHON@
 
+#wxWidgets
+WXWIDGETSINC        = @WXWIDGETSINC@
+WXWIDGETSLIB        = @WXWIDGETSLIB@
+USE_WXWIDGETS       = @USE_WXWIDGETS@
+
 #i18N
 HAVE_NLS            = @HAVE_NLS@