Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
68fa4edc
Commit
68fa4edc
authored
Oct 06, 2008
by
Chad MILLER
Browse files
Options
Browse Files
Download
Plain Diff
Merge fix of autoconf substitution of string containing single quotes.
parents
a48d6717
41a1b7ce
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
9 deletions
+10
-9
configure.in
configure.in
+10
-9
No files found.
configure.in
View file @
68fa4edc
...
@@ -458,40 +458,41 @@ AC_SUBST(ABI_CHECK)
...
@@ -458,40 +458,41 @@ AC_SUBST(ABI_CHECK)
# Look for PS usage. We use double dollar-signs in FIND_PROC because this
# Look for PS usage. We use double dollar-signs in FIND_PROC because this
# value is written to a makefile, which interprets away one level of
# value is written to a makefile, which interprets away one level of
# dollar-signs. So, interpretation stages are m4 and then shell in autoconf,
# dollar-signs. So, interpretation stages are m4 and then shell in autoconf,
# then Make, then shell.
# then Make, then shell. The autoconf substitution uses single quotes, so
# no unprotected single quotes should appear in the expression.
AC_PATH_PROG
(
PS, ps, ps
)
AC_PATH_PROG
(
PS, ps, ps
)
AC_MSG_CHECKING
(
"how to check if pid exists"
)
AC_MSG_CHECKING
(
"how to check if pid exists"
)
PS
=
$ac_cv_path_PS
PS
=
$ac_cv_path_PS
# Linux style
# Linux style
if
$PS
wwwp
$$
2> /dev/null |
grep
--
"
$0
"
>
/dev/null
if
$PS
wwwp
$$
2> /dev/null |
grep
--
"
$0
"
>
/dev/null
then
then
FIND_PROC
=
"
$PS
wwwp
\$\$
PID | grep -v
' grep'
| grep -v mysqld_safe | grep --
\"\$\$
MYSQLD
\"
> /dev/null"
FIND_PROC
=
"
$PS
wwwp
\$\$
PID | grep -v
\"
grep
\"
| grep -v mysqld_safe | grep --
\"\$\$
MYSQLD
\"
> /dev/null"
# Solaris
# Solaris
elif
$PS
-fp
$$
2> /dev/null |
grep
--
$0
>
/dev/null
elif
$PS
-fp
$$
2> /dev/null |
grep
--
$0
>
/dev/null
then
then
FIND_PROC
=
"
$PS
-p
\$\$
PID | grep -v
' grep'
| grep -v mysqld_safe | grep --
\"\$\$
MYSQLD
\"
> /dev/null"
FIND_PROC
=
"
$PS
-p
\$\$
PID | grep -v
\"
grep
\"
| grep -v mysqld_safe | grep --
\"\$\$
MYSQLD
\"
> /dev/null"
# BSD style
# BSD style
elif
$PS
-uaxww
2> /dev/null |
grep
--
$0
>
/dev/null
elif
$PS
-uaxww
2> /dev/null |
grep
--
$0
>
/dev/null
then
then
FIND_PROC
=
"
$PS
-uaxww | grep -v
' grep'
| grep -v mysqld_safe | grep --
\"\$\$
MYSQLD
\"
| grep
\"
\$\$
PID
\"
> /dev/null"
FIND_PROC
=
"
$PS
-uaxww | grep -v
\"
grep
\"
| grep -v mysqld_safe | grep --
\"\$\$
MYSQLD
\"
| grep
\"
\$\$
PID
\"
> /dev/null"
# SysV style
# SysV style
elif
$PS
-ef
2> /dev/null |
grep
--
$0
>
/dev/null
elif
$PS
-ef
2> /dev/null |
grep
--
$0
>
/dev/null
then
then
FIND_PROC
=
"
$PS
-ef | grep -v
' grep'
| grep -v mysqld_safe | grep --
\"\$\$
MYSQLD
\"
| grep
\"
\$\$
PID
\"
> /dev/null"
FIND_PROC
=
"
$PS
-ef | grep -v
\"
grep
\"
| grep -v mysqld_safe | grep --
\"\$\$
MYSQLD
\"
| grep
\"
\$\$
PID
\"
> /dev/null"
# Do anybody use this?
# Do anybody use this?
elif
$PS
$$
2> /dev/null |
grep
--
$0
>
/dev/null
elif
$PS
$$
2> /dev/null |
grep
--
$0
>
/dev/null
then
then
FIND_PROC
=
"
$PS
\$\$
PID | grep -v
' grep'
| grep -v mysqld_safe | grep --
\"\$\$
MYSQLD
\"
> /dev/null"
FIND_PROC
=
"
$PS
\$\$
PID | grep -v
\"
grep
\"
| grep -v mysqld_safe | grep --
\"\$\$
MYSQLD
\"
> /dev/null"
else
else
case
$SYSTEM_TYPE
in
case
$SYSTEM_TYPE
in
*
freebsd
*
|
*
dragonfly
*
)
*
freebsd
*
|
*
dragonfly
*
)
FIND_PROC
=
"
$PS
p
\$\$
PID | grep -v
' grep'
| grep -v mysqld_safe | grep --
\"\$\$
MYSQLD
\"
> /dev/null"
FIND_PROC
=
"
$PS
p
\$\$
PID | grep -v
\"
grep
\"
| grep -v mysqld_safe | grep --
\"\$\$
MYSQLD
\"
> /dev/null"
;;
;;
*
darwin
*
)
*
darwin
*
)
FIND_PROC
=
"
$PS
-uaxww | grep -v
' grep'
| grep -v mysqld_safe | grep --
\"\$\$
MYSQLD
\"
| grep
\"
\$\$
PID
\"
> /dev/null"
FIND_PROC
=
"
$PS
-uaxww | grep -v
\"
grep
\"
| grep -v mysqld_safe | grep --
\"\$\$
MYSQLD
\"
| grep
\"
\$\$
PID
\"
> /dev/null"
;;
;;
*
cygwin
*
)
*
cygwin
*
)
FIND_PROC
=
"
$PS
-e | grep -v
' grep'
| grep -v mysqld_safe | grep --
\"\$\$
MYSQLD
\"
| grep
\"
\$\$
PID
\"
> /dev/null"
FIND_PROC
=
"
$PS
-e | grep -v
\"
grep
\"
| grep -v mysqld_safe | grep --
\"\$\$
MYSQLD
\"
| grep
\"
\$\$
PID
\"
> /dev/null"
;;
;;
*
netware
*
)
*
netware
*
)
FIND_PROC
=
FIND_PROC
=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment