diff options
| author | unknown <joreland@mysql.com> | 2004-11-15 10:50:58 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-11-15 10:50:58 +0100 |
| commit | 74735b3d86f6282bd0594d906666a531afe749bb (patch) | |
| tree | dfe96c812edcc7a5446f9b7043351e8f119bb717 /configure.in | |
| parent | 8f145e4cbd5151155132a127434390218c0cf2e8 (diff) | |
| parent | 20cfd8fd4e4167ddc5b0b7b1d447fa7f3ed0be6a (diff) | |
| download | mariadb-git-74735b3d86f6282bd0594d906666a531afe749bb.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl1744
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in index a4dfdfb9333..d771ebb0771 100644 --- a/configure.in +++ b/configure.in @@ -480,7 +480,7 @@ if $PS p $$ 2> /dev/null | grep $0 > /dev/null then FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" # Solaris -elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null +elif $PS -fp $$ 2> /dev/null | grep $0 > /dev/null then FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" # BSD style @@ -3150,7 +3150,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl sql-common/Makefile SSL/Makefile dnl dbug/Makefile scripts/Makefile dnl include/Makefile sql-bench/Makefile tools/Makefile dnl - tests/Makefile Docs/Makefile support-files/Makefile dnl + tests/Makefile Docs/Makefile Docs/Images/Makefile support-files/Makefile dnl support-files/MacOSX/Makefile mysql-test/Makefile dnl netware/Makefile dnl include/mysql_version.h dnl |