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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/demos/configure b/demos/configure
index b9d8854f54515a44ef5ae8540e3d092e897bf039..6e3d88b1a538afce9415a6c6e5a35ba3210bbd5e 100755 (executable)
--- a/demos/configure
+++ b/demos/configure
@@ -523,7 +523,7 @@ fi
 
 
 
-if test "x$wx_cv_if_gnu_make" = "x"; then
+if test "x$wx_cv_path_ifs" = "x"; then
     { echo "configure: error: Please run configure from the top level directory." 1>&2; exit 1; }
 fi
 

diff --git a/demos/configure.in b/demos/configure.in
index 3409f915560b6bc844e2aee553204d6fbd0890c4..25cbcd2568fac3e1fd4dfa49928b4ff658d57f9f 100644 (file)
--- a/demos/configure.in
+++ b/demos/configure.in
@@ -5,7 +5,11 @@ 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_if_gnu_make" = "x"; then
+dnl
+dnl note that the only one we use here if wx_cv_if_gnu_make but we can't test
+dnl for this because it may perfectly well be empty (if we're using GNU make),
+dnl so use something else
+if test "x$wx_cv_path_ifs" = "x"; then
     AC_MSG_ERROR([Please run configure from the top level directory.])
 fi
 

diff --git a/utils/configure b/utils/configure
index f3fa7cd3f72b672370b3785f829e70a6df3d9c38..a85526b8190232b672c6350bdfd45797844274d8 100755 (executable)
--- a/utils/configure
+++ b/utils/configure
@@ -523,7 +523,7 @@ fi
 
 
 
-if test "x$wx_cv_path_glcanvas" = "x"; then
+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
 

diff --git a/utils/configure.in b/utils/configure.in
index 31cc26b5582185afda96679955c985b0250bf9e7..39a4a5f333b5b1e5724e6fa2cca5e1a2e6f3db9d 100644 (file)
--- a/utils/configure.in
+++ b/utils/configure.in
@@ -5,7 +5,7 @@ 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_path_glcanvas" = "x"; then
+if test "x$wx_cv_use_gui" = "x"; then
     AC_MSG_ERROR([Please run configure from the top level directory.])
 fi