Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
postgres-lambda-diff
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jakob Huber
postgres-lambda-diff
Commits
e295c55f
Commit
e295c55f
authored
21 years ago
by
Bruce Momjian
Browse files
Options
Downloads
Patches
Plain Diff
Check for gmake, then make, when doing thread test.
parent
f5dd5bf2
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure
+43
-3
43 additions, 3 deletions
configure
configure.in
+5
-4
5 additions, 4 deletions
configure.in
with
48 additions
and
7 deletions
configure
+
43
−
3
View file @
e295c55f
...
...
@@ -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;}
...
...
This diff is collapsed.
Click to expand it.
configure.in
+
5
−
4
View file @
e295c55f
dnl Process this file with autoconf to produce a configure script.
dnl $PostgreSQL: pgsql/configure.in,v 1.32
5
2004/04/2
3 23:58:07
momjian Exp $
dnl $PostgreSQL: pgsql/configure.in,v 1.32
6
2004/04/2
4 03:09:35
momjian Exp $
dnl
dnl Developers, please strive to achieve this order:
dnl
...
...
@@ -1220,22 +1220,23 @@ AC_OUTPUT
#
if test "$enable_thread_safety" = yes; then
if test cross_compiling != yes; then
AC_CHECK_PROGS(MAKE, gmake make)
AC_MSG_CHECKING([thread safety of required library functions.])
#
# Clean, compile, run, and clean thread test directory.
# 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
AC_MSG_ERROR([Can not clean thread test directory.]))
gmake
-C $srcdir/src/tools/thread >&5 ||
$MAKE
-C $srcdir/src/tools/thread >&5 ||
( rm -f src/Makefile.global
AC_MSG_ERROR([Can not build thread test proram.]))
$srcdir/src/tools/thread/thread_test >&5 ||
( rm -f src/Makefile.global
AC_MSG_ERROR([Thread test program failed.]))
gmake
-C $srcdir/src/tools/thread clean >&5 ||
$MAKE
-C $srcdir/src/tools/thread clean >&5 ||
( rm -f src/Makefile.global
AC_MSG_ERROR([Can not clean thread test directory.]))
echo "yes"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment