gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extended checks for GNU make to search for gmake, gnumake and then make

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24530 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2007-02-14 00:34:44 +00:00
parent 30ba69e704
commit dfd13b9b01
3 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,8 +1,8 @@
2007-02-13 Adam Fedor <fedor@gnu.org>,
Nicola Pero <nicola.pero@meta-innovation.com>,
* configure.ac: Check for gmake, and use it instead of make if it
is found.
* configure.ac: Check for gmake and gnumake, and use it instead of
make if it is found.
* configure: Regenerated.
2007-02-13 Adam Fedor <fedor@gnu.org>

19
configure vendored
View file

@ -4445,8 +4445,13 @@ fi
# Check for $(info ...) function in GNU make
#--------------------------------------------------------------------
# Extract the first word of "gmake", so it can be a program name with args.
set dummy gmake; ac_word=$2
# Search for GNU make. We try 'gmake' then 'gnumake' then 'make'. If
# we can't find it, we set it to 'make', even if that will fail later
# on.
for ac_prog in gmake gnumake make
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_GNUMAKE+set}" = set; then
@ -4462,7 +4467,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_GNUMAKE="make"
ac_cv_prog_GNUMAKE="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@ -4480,6 +4485,10 @@ else
echo "${ECHO_T}no" >&6
fi
test -n "$GNUMAKE" && break
done
test -n "$GNUMAKE" || GNUMAKE="make"
# If GNU make supports $(info ...), gnustep-make can use it to print
# out a help message at the beginning of each compilation. This
@ -4502,6 +4511,10 @@ echo "${ECHO_T}version: ${gs_cv_make_major_version}.${gs_cv_make_minor_version}"
echo "$as_me:$LINENO: checking if GNU Make has the info function" >&5
echo $ECHO_N "checking if GNU Make has the info function... $ECHO_C" >&6
# Things may go wrong (eg, make couldn't be found), so by default we
# assume 'no' here. If things go wrong, you'll lost some
# non-essential features.
MAKE_WITH_INFO_FUNCTION=no
if test "${gs_cv_make_major_version}" -ge "4"; then
MAKE_WITH_INFO_FUNCTION=yes

10
configure.ac
View file

@ -1005,8 +1005,10 @@ AC_SUBST(OBJCFLAGS)
# Check for $(info ...) function in GNU make
#--------------------------------------------------------------------
# Use 'gmake' in preference to 'make' if it is found
AC_CHECK_PROG(GNUMAKE, gmake, gmake, make)
# Search for GNU make. We try 'gmake' then 'gnumake' then 'make'. If
# we can't find it, we set it to 'make', even if that will fail later
# on.
AC_CHECK_PROGS(GNUMAKE, [gmake gnumake make], make)
# If GNU make supports $(info ...), gnustep-make can use it to print
# out a help message at the beginning of each compilation. This
@ -1026,6 +1028,10 @@ gs_cv_make_minor_version=`echo ${gs_cv_make_version} | sed -e 's/\([[0-9]][[0-9]
AC_MSG_RESULT(version: ${gs_cv_make_major_version}.${gs_cv_make_minor_version})
AC_MSG_CHECKING(if GNU Make has the info function)
# Things may go wrong (eg, make couldn't be found), so by default we
# assume 'no' here. If things go wrong, you'll lost some
# non-essential features.
MAKE_WITH_INFO_FUNCTION=no
if test "${gs_cv_make_major_version}" -ge "4"; then
MAKE_WITH_INFO_FUNCTION=yes