mirror of
https://github.com/postgres/postgres.git
synced 2025-06-13 07:41:39 +03:00
Check for gmake, then make, when doing thread test.
This commit is contained in:
46
configure
vendored
46
configure
vendored
@ -19118,6 +19118,46 @@ fi
|
||||
#
|
||||
if test "$enable_thread_safety" = yes; then
|
||||
if test cross_compiling != yes; then
|
||||
for ac_prog in gmake 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_MAKE+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$MAKE"; then
|
||||
ac_cv_prog_MAKE="$MAKE" # 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_MAKE="$ac_prog"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
fi
|
||||
fi
|
||||
MAKE=$ac_cv_prog_MAKE
|
||||
if test -n "$MAKE"; then
|
||||
echo "$as_me:$LINENO: result: $MAKE" >&5
|
||||
echo "${ECHO_T}$MAKE" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
test -n "$MAKE" && break
|
||||
done
|
||||
|
||||
echo "$as_me:$LINENO: checking thread safety of required library functions." >&5
|
||||
echo $ECHO_N "checking thread safety of required library functions.... $ECHO_C" >&6
|
||||
#
|
||||
@ -19125,12 +19165,12 @@ echo $ECHO_N "checking thread safety of required library functions.... $ECHO_C"
|
||||
# If test fails for any reason, remove Makefile.global so the user can't
|
||||
# compile (to simulate a configure failure).
|
||||
#
|
||||
gmake -C $srcdir/src/tools/thread clean >&5 ||
|
||||
$MAKE -C $srcdir/src/tools/thread clean >&5 ||
|
||||
( rm -f src/Makefile.global
|
||||
{ { echo "$as_me:$LINENO: error: Can not clean thread test directory." >&5
|
||||
echo "$as_me: error: Can not clean thread test directory." >&2;}
|
||||
{ (exit 1); exit 1; }; })
|
||||
gmake -C $srcdir/src/tools/thread >&5 ||
|
||||
$MAKE -C $srcdir/src/tools/thread >&5 ||
|
||||
( rm -f src/Makefile.global
|
||||
{ { echo "$as_me:$LINENO: error: Can not build thread test proram." >&5
|
||||
echo "$as_me: error: Can not build thread test proram." >&2;}
|
||||
@ -19140,7 +19180,7 @@ $srcdir/src/tools/thread/thread_test >&5 ||
|
||||
{ { echo "$as_me:$LINENO: error: Thread test program failed." >&5
|
||||
echo "$as_me: error: Thread test program failed." >&2;}
|
||||
{ (exit 1); exit 1; }; })
|
||||
gmake -C $srcdir/src/tools/thread clean >&5 ||
|
||||
$MAKE -C $srcdir/src/tools/thread clean >&5 ||
|
||||
( rm -f src/Makefile.global
|
||||
{ { echo "$as_me:$LINENO: error: Can not clean thread test directory." >&5
|
||||
echo "$as_me: error: Can not clean thread test directory." >&2;}
|
||||
|
Reference in New Issue
Block a user