Removed compilo

[wxWidgets.git] / utils / configure

diff --git a/utils/configure b/utils/configure
index cdb105af5775f705c63076c5c583f1a61761153a..a85526b8190232b672c6350bdfd45797844274d8 100755 (executable)
--- a/utils/configure
+++ b/utils/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Id
+# From configure.in Id: configure.in
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
@@ -523,7 +523,15 @@ fi
 
 
 
+if test "x$wx_cv_use_gui" = "x"; then
+    { echo "configure: error: Please run configure from the top level directory." 1>&2; exit 1; }
+fi
+
 GL_TOOLKIT_DIR=$wx_cv_path_glcanvas
+USE_GUI=$wx_cv_use_gui
+USE_RESOURCES=$wx_cv_use_resources
+
+
 
 
 trap '' 1 2 15
@@ -640,13 +648,6 @@ ac_given_srcdir=$srcdir
 
 trap 'rm -fr `echo "
             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
@@ -655,6 +656,10 @@ trap 'rm -fr `echo "
             hhp2cached/Makefile
             dialoged/Makefile
             dialoged/src/Makefile
+            emulator/Makefile
+            emulator/src/Makefile
+            helpview/Makefile
+            helpview/src/Makefile
          " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -688,6 +693,8 @@ s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
 s%@GL_TOOLKIT_DIR@%$GL_TOOLKIT_DIR%g
+s%@USE_GUI@%$USE_GUI%g
+s%@USE_RESOURCES@%$USE_RESOURCES%g
 
 CEOF
 EOF
@@ -730,13 +737,6 @@ EOF
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"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
@@ -745,6 +745,10 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             hhp2cached/Makefile
             dialoged/Makefile
             dialoged/src/Makefile
+            emulator/Makefile
+            emulator/src/Makefile
+            helpview/Makefile
+            helpview/src/Makefile
          "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF