cache the results of checks for make VPATH support and its GNUishness
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
613d09959e
commit
04e7a2161c
20
configure.in
20
configure.in
@ -1216,7 +1216,7 @@ dnl defines STRIP as strip or nothing if not found
|
||||
AC_CHECK_PROG(STRIP, strip, strip, true)
|
||||
|
||||
dnl check if VPATH works
|
||||
AC_MSG_CHECKING(make for VPATH support)
|
||||
AC_CACHE_CHECK([if make supports VPATH], wx_cv_prog_makevpath, [
|
||||
dnl create Makefile
|
||||
cat - << EOF > confMake
|
||||
check : file
|
||||
@ -1233,10 +1233,14 @@ RESULT=$?
|
||||
rm -f sub/file check final_file confMake
|
||||
rmdir sub
|
||||
if test "$RESULT" = 0; then
|
||||
AC_MSG_RESULT(yes)
|
||||
wx_cv_prog_makevpath="yes"
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_ERROR([
|
||||
wx_cv_prog_makevpath="no"
|
||||
fi
|
||||
])
|
||||
|
||||
if test "x$wx_cv_prog_makevpath" != "xyes"; then
|
||||
AC_MSG_ERROR([
|
||||
You need a make-utility that is able to use the variable
|
||||
VPATH correctly.
|
||||
If your version of make does not support VPATH correctly,
|
||||
@ -1250,17 +1254,17 @@ you are trying to compile.
|
||||
fi
|
||||
|
||||
dnl does make support "-include" (only GNU make does AFAIK)?
|
||||
AC_CACHE_CHECK([if make is GNU make], wx_make_make_isgnu,
|
||||
AC_CACHE_CHECK([if make is GNU make], wx_cv_prog_makeisgnu,
|
||||
[
|
||||
if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
|
||||
grep GNU 2>&1 > /dev/null); then
|
||||
wx_make_make_isgnu="yes"
|
||||
wx_cv_prog_makeisgnu="yes"
|
||||
else
|
||||
wx_make_make_isgnu="no"
|
||||
wx_cv_prog_makeisgnu="no"
|
||||
fi
|
||||
])
|
||||
|
||||
if test "x$wx_make_make_isgnu" = "xyes"; then
|
||||
if test "x$wx_cv_prog_makeisgnu" = "xyes"; then
|
||||
IF_GNU_MAKE=""
|
||||
else
|
||||
IF_GNU_MAKE="#"
|
||||
|
Loading…
Reference in New Issue
Block a user