refuse to run if not executed by the main configure script

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

diff --git a/samples/configure b/samples/configure
index 20c677220fd6baf06b5a65620eab3e10310fcdea..275784d471e5ae8d7ef0fa8f57e38f1960d9590f 100755 (executable)
--- a/samples/configure
+++ b/samples/configure
@@ -523,6 +523,10 @@ fi
 
 
 
 
 
 

+if test "x$wx_cv_path_samplesubdirs" = "x"; then
+    { echo "configure: error: Please run configure from the top level directory." 1>&2; exit 1; }
+fi
+

 SAMPLES_SUBDIRS=$wx_cv_path_samplesubdirs
 
 
 SAMPLES_SUBDIRS=$wx_cv_path_samplesubdirs
 
 

diff --git a/samples/configure.in b/samples/configure.in
index 773f64610708d9ad86a8fba49b53d1fd2a19d209..c95587e95aee21e6dcb37c29ad18f6d958d04afe 100644 (file)
--- a/samples/configure.in
+++ b/samples/configure.in
@@ -3,6 +3,12 @@ AC_REVISION($Id$)dnl
 
 AC_INIT(Makefile.in)
 
 
 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_samplesubdirs" = "x"; then
+    AC_MSG_ERROR([Please run configure from the top level directory.])
+fi
+

 SAMPLES_SUBDIRS=$wx_cv_path_samplesubdirs
 AC_SUBST(SAMPLES_SUBDIRS)
 
 SAMPLES_SUBDIRS=$wx_cv_path_samplesubdirs
 AC_SUBST(SAMPLES_SUBDIRS)