From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 16 Jan 2003 12:58:02 +0000 (+0000)
Subject: fixed detection of whether we're invoked from the top level configure or not
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/eff41ee7f5bdc004ce36b9ca06b42961cdd01885

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 b9d8854f54..6e3d88b1a5 100755
--- 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 3409f91556..25cbcd2568 100644
--- 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 f3fa7cd3f7..a85526b819 100755
--- 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 31cc26b558..39a4a5f333 100644
--- 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