fixed detection of whether we're invoked from the top level configure or not

[wxWidgets.git] / utils / configure

diff --git a/utils/configure b/utils/configure
index 27ba4ceb7b87d733fb9bac3100dc1a53631709bb..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
@@ -650,6 +658,8 @@ trap 'rm -fr `echo "
             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
@@ -683,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
@@ -735,6 +747,8 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             dialoged/src/Makefile
             emulator/Makefile
             emulator/src/Makefile
+            helpview/Makefile
+            helpview/src/Makefile
          "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF