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
This commit is contained in:
2
demos/configure
vendored
2
demos/configure
vendored
@@ -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; }
|
{ echo "configure: error: Please run configure from the top level directory." 1>&2; exit 1; }
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@@ -5,7 +5,11 @@ AC_INIT(Makefile.in)
|
|||||||
|
|
||||||
dnl we need the values the main configure determined for us, so refuse
|
dnl we need the values the main configure determined for us, so refuse
|
||||||
dnl to run if we don't have them
|
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.])
|
AC_MSG_ERROR([Please run configure from the top level directory.])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
2
utils/configure
vendored
2
utils/configure
vendored
@@ -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; }
|
{ echo "configure: error: Please run configure from the top level directory." 1>&2; exit 1; }
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@@ -5,7 +5,7 @@ AC_INIT(Makefile.in)
|
|||||||
|
|
||||||
dnl we need the values the main configure determined for us, so refuse
|
dnl we need the values the main configure determined for us, so refuse
|
||||||
dnl to run if we don't have them
|
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.])
|
AC_MSG_ERROR([Please run configure from the top level directory.])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user