removed deprecated ConvertToBitmap() and wxImage(wxBitmap) ctor

[wxWidgets.git] / utils / configure.in

diff --git a/utils/configure.in b/utils/configure.in
index 46288258bb90effd3d20beda6c7e52cdd7c1f2b6..165039beda2b74e1b0c675a5338daf3fd9b99099 100644 (file)
--- a/utils/configure.in
+++ b/utils/configure.in
@@ -3,8 +3,18 @@ AC_REVISION($Id$)dnl
 
 AC_INIT(Makefile.in)
 
+dnl we need the values the main configure determined for us, so refuse
+dnl to run if we don't have them
+if test "x$wx_cv_use_gui" = "x"; then
+    AC_MSG_ERROR([Please run configure from the top level directory.])
+fi
+
 GL_TOOLKIT_DIR=$wx_cv_path_glcanvas
+USE_GUI=$wx_cv_use_gui
+USE_RESOURCES=$wx_cv_use_resources
 AC_SUBST(GL_TOOLKIT_DIR)
+AC_SUBST(USE_GUI)
+AC_SUBST(USE_RESOURCES)
 
 AC_OUTPUT([
             Makefile
@@ -18,4 +28,8 @@ AC_OUTPUT([
             dialoged/src/Makefile
             emulator/Makefile
             emulator/src/Makefile
+            helpview/Makefile
+            helpview/src/Makefile
+            wxconfigtool/Makefile
+            wxconfigtool/src/Makefile
          ])