mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Fixed make check; use gmake if found instead of make
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24529 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
02b1e5e2da
commit
30ba69e704
3 changed files with 50 additions and 3 deletions
|
|
@ -1,3 +1,10 @@
|
|||
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: Regenerated.
|
||||
|
||||
2007-02-13 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.ac: Disable SHARED_SOLARIS on solaris2.[67]. Use
|
||||
|
|
|
|||
41
configure
vendored
41
configure
vendored
|
|
@ -277,7 +277,7 @@ ac_default_prefix=`if test -d C: ; then
|
|||
else
|
||||
echo /usr/GNUstep ;
|
||||
fi`
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ac_cv_library_combo cc_cppprecomp cc_bundle CYGWIN RANLIB AR DLLTOOL ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S TAR CHOWN GNUSTEP_CONFIG_FILE GNUSTEP_SYSTEM_ROOT GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_USER_CONFIG_FILE GNUSTEP_USER_DIR GNUSTEP_USER_DEFAULTS_DIR GNUSTEP_MAKEFILES HOST_INSTALL GNUSTEP_FLATTENED GNUSTEP_IS_FLATTENED GNUSTEP_MULTI_PLATFORM BACKEND_BUNDLE objc_threaded ac_cv_objc_threaded USE_OBJC_EXCEPTIONS AUTO_DEPENDENCIES GCC_WITH_PRECOMPILED_HEADERS SOLARIS_SHARED INCLUDES LIB_DIR OBJCFLAGS MAKE_WITH_INFO_FUNCTION GNUSTEP_STRIP_MAKEFILES GNUSTEP_MAKE_VERSION GNUSTEP_MAKE_MAJOR_VERSION GNUSTEP_MAKE_MINOR_VERSION GNUSTEP_MAKE_SUBMINOR_VERSION clean_target_os clean_target_cpu clean_target_vendor LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ac_cv_library_combo cc_cppprecomp cc_bundle CYGWIN RANLIB AR DLLTOOL ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S TAR CHOWN GNUSTEP_CONFIG_FILE GNUSTEP_SYSTEM_ROOT GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_USER_CONFIG_FILE GNUSTEP_USER_DIR GNUSTEP_USER_DEFAULTS_DIR GNUSTEP_MAKEFILES HOST_INSTALL GNUSTEP_FLATTENED GNUSTEP_IS_FLATTENED GNUSTEP_MULTI_PLATFORM BACKEND_BUNDLE objc_threaded ac_cv_objc_threaded USE_OBJC_EXCEPTIONS AUTO_DEPENDENCIES GCC_WITH_PRECOMPILED_HEADERS SOLARIS_SHARED INCLUDES LIB_DIR OBJCFLAGS GNUMAKE MAKE_WITH_INFO_FUNCTION GNUSTEP_STRIP_MAKEFILES GNUSTEP_MAKE_VERSION GNUSTEP_MAKE_MAJOR_VERSION GNUSTEP_MAKE_MINOR_VERSION GNUSTEP_MAKE_SUBMINOR_VERSION clean_target_os clean_target_cpu clean_target_vendor LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -4445,6 +4445,42 @@ 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
|
||||
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
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$GNUMAKE"; then
|
||||
ac_cv_prog_GNUMAKE="$GNUMAKE" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
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"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
fi
|
||||
fi
|
||||
GNUMAKE=$ac_cv_prog_GNUMAKE
|
||||
if test -n "$GNUMAKE"; then
|
||||
echo "$as_me:$LINENO: result: $GNUMAKE" >&5
|
||||
echo "${ECHO_T}$GNUMAKE" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
|
||||
# If GNU make supports $(info ...), gnustep-make can use it to print
|
||||
# out a help message at the beginning of each compilation. This
|
||||
# feature was introduced in GNU make 3.81, so we check GNU make's
|
||||
|
|
@ -4456,7 +4492,7 @@ echo $ECHO_N "checking for the GNU Make version... $ECHO_C" >&6
|
|||
# To get the make version, take the output of 'make --version', read
|
||||
# only the first line (that we expect to be something like "GNU Make
|
||||
# 3.81"), and ignore everything up to the first numeric character.
|
||||
gs_cv_make_version=`make --version | head -1 | sed -e 's/^[^0-9]*//'`
|
||||
gs_cv_make_version=`$GNUMAKE --version | head -1 | sed -e 's/^[^0-9]*//'`
|
||||
|
||||
# Now check for the major/minor version numbers.
|
||||
gs_cv_make_major_version=`echo ${gs_cv_make_version} | sed -e 's/\([0-9][0-9]*\)[^0-9]\([0-9][0-9]*\).*/\1/'`
|
||||
|
|
@ -5260,6 +5296,7 @@ s,@SOLARIS_SHARED@,$SOLARIS_SHARED,;t t
|
|||
s,@INCLUDES@,$INCLUDES,;t t
|
||||
s,@LIB_DIR@,$LIB_DIR,;t t
|
||||
s,@OBJCFLAGS@,$OBJCFLAGS,;t t
|
||||
s,@GNUMAKE@,$GNUMAKE,;t t
|
||||
s,@MAKE_WITH_INFO_FUNCTION@,$MAKE_WITH_INFO_FUNCTION,;t t
|
||||
s,@GNUSTEP_STRIP_MAKEFILES@,$GNUSTEP_STRIP_MAKEFILES,;t t
|
||||
s,@GNUSTEP_MAKE_VERSION@,$GNUSTEP_MAKE_VERSION,;t t
|
||||
|
|
|
|||
|
|
@ -1005,6 +1005,9 @@ 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)
|
||||
|
||||
# If GNU make supports $(info ...), gnustep-make can use it to print
|
||||
# out a help message at the beginning of each compilation. This
|
||||
# feature was introduced in GNU make 3.81, so we check GNU make's
|
||||
|
|
@ -1015,7 +1018,7 @@ AC_MSG_CHECKING(for the GNU Make version)
|
|||
# To get the make version, take the output of 'make --version', read
|
||||
# only the first line (that we expect to be something like "GNU Make
|
||||
# 3.81"), and ignore everything up to the first numeric character.
|
||||
gs_cv_make_version=`make --version | head -1 | sed -e 's/^[[^0-9]]*//'`
|
||||
gs_cv_make_version=`$GNUMAKE --version | head -1 | sed -e 's/^[[^0-9]]*//'`
|
||||
|
||||
# Now check for the major/minor version numbers.
|
||||
gs_cv_make_major_version=`echo ${gs_cv_make_version} | sed -e 's/\([[0-9]][[0-9]]*\)[[^0-9]]\([[0-9]][[0-9]]*\).*/\1/'`
|
||||
|
|
|
|||
Loading…
Reference in a new issue