show the taskbar icon even after Explorer restart (patch 723532) + some code cleanup

[wxWidgets.git] / utils / configure

diff --git a/utils/configure b/utils/configure
index a03a36e569469af34fee63f12ee624b304587827..a85526b8190232b672c6350bdfd45797844274d8 100755 (executable)
--- a/utils/configure
+++ b/utils/configure
@@ -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
@@ -648,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
@@ -681,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
@@ -731,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