X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48fe83743aafc0c3427824b7c3051119b22ebe79..a663cce7f9ca84a82f1f7359ce1dcd898040a4c1:/utils/configure.in

diff --git a/utils/configure.in b/utils/configure.in
index b2a6b149c3..39a4a5f333 100644
--- a/utils/configure.in
+++ b/utils/configure.in
@@ -3,18 +3,21 @@ 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
-            wxMMedia2/Makefile
-            wxMMedia2/lib/Makefile
-            wxMMedia2/sample/Makefile
-            glcanvas/Makefile
-            glcanvas/${GL_TOOLKIT_DIR}/Makefile
-            ogl/Makefile
-            ogl/src/Makefile
             makegen/Makefile
             HelpGen/Makefile
             HelpGen/src/Makefile
@@ -23,4 +26,8 @@ AC_OUTPUT([
             hhp2cached/Makefile
             dialoged/Makefile
             dialoged/src/Makefile
+            emulator/Makefile
+            emulator/src/Makefile
+            helpview/Makefile
+            helpview/src/Makefile
          ])