Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't test for VPATH support for GNU make - this is waste of time

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-01-23 17:47:58 +00:00
parent 04e7a2161c
commit 414eab6de6
2 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
configure vendored
View File

@@ -9295,8 +9295,34 @@ else
fi
echo $ac_n "checking if make is GNU make""... $ac_c" 1>&6
echo "configure:9300: checking if make is GNU make" >&5
if eval "test \"`echo '$''{'wx_cv_prog_makeisgnu'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
egrep -s GNU); then
wx_cv_prog_makeisgnu="yes"
else
wx_cv_prog_makeisgnu="no"
fi
fi
echo "$ac_t""$wx_cv_prog_makeisgnu" 1>&6
if test "x$wx_cv_prog_makeisgnu" = "xyes"; then
IF_GNU_MAKE=""
else
IF_GNU_MAKE="#"
fi
if test "x$wx_cv_prog_makeisgnu" != "xyes"; then
echo $ac_n "checking if make supports VPATH""... $ac_c" 1>&6
echo "configure:9300: checking if make supports VPATH" >&5
echo "configure:9326: checking if make supports VPATH" >&5
if eval "test \"`echo '$''{'wx_cv_prog_makevpath'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -9337,33 +9363,7 @@ setenv MAKE gmake; ./configure for csh-type shells
Also please do remember to use gmake in this case every time
you are trying to compile.
" 1>&2; exit 1; }
fi
echo $ac_n "checking if make is GNU make""... $ac_c" 1>&6
echo "configure:9344: checking if make is GNU make" >&5
if eval "test \"`echo '$''{'wx_cv_prog_makeisgnu'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
grep GNU 2>&1 > /dev/null); then
wx_cv_prog_makeisgnu="yes"
else
wx_cv_prog_makeisgnu="no"
fi
fi
echo "$ac_t""$wx_cv_prog_makeisgnu" 1>&6
if test "x$wx_cv_prog_makeisgnu" = "xyes"; then
IF_GNU_MAKE=""
else
IF_GNU_MAKE="#"
fi
fi fi
for ac_prog in 'bison -y' byacc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.

43
configure.in
View File

@@ -1215,6 +1215,27 @@ dnl strip command
dnl defines STRIP as strip or nothing if not found
AC_CHECK_PROG(STRIP, strip, strip, true)
dnl does make support "-include" (only GNU make does AFAIK)?
AC_CACHE_CHECK([if make is GNU make], wx_cv_prog_makeisgnu,
[
if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
egrep -s GNU); then
wx_cv_prog_makeisgnu="yes"
else
wx_cv_prog_makeisgnu="no"
fi
])
if test "x$wx_cv_prog_makeisgnu" = "xyes"; then
IF_GNU_MAKE=""
else
IF_GNU_MAKE="#"
fi
AC_SUBST(IF_GNU_MAKE)
dnl we don't need to check for VPATH support in GNU make - it does have it
if test "x$wx_cv_prog_makeisgnu" != "xyes"; then
dnl check if VPATH works
AC_CACHE_CHECK([if make supports VPATH], wx_cv_prog_makevpath, [
dnl create Makefile
@@ -1251,26 +1272,8 @@ setenv MAKE gmake; ./configure for csh-type shells
Also please do remember to use gmake in this case every time
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_cv_prog_makeisgnu,
[
if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
grep GNU 2>&1 > /dev/null); then
wx_cv_prog_makeisgnu="yes"
else
wx_cv_prog_makeisgnu="no"
fi
])
if test "x$wx_cv_prog_makeisgnu" = "xyes"; then
IF_GNU_MAKE=""
else
IF_GNU_MAKE="#"
fi
AC_SUBST(IF_GNU_MAKE)
fi dnl make without VPATH
fi dnl not GNU make
dnl YACC checks
dnl defines YACC with the appropriate command