60 lines
2.4 KiB
Plaintext
60 lines
2.4 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.30 2010/03/21 01:20:47 sthen Exp $
|
|
--- configure.in.orig Mon Mar 1 14:30:52 2010
|
|
+++ configure.in Sat Mar 20 20:21:12 2010
|
|
@@ -488,44 +488,7 @@ AC_SUBST(ABI_CHECK)
|
|
AC_PATH_PROG(PS, ps, ps)
|
|
AC_MSG_CHECKING("how to check if pid exists")
|
|
PS=$ac_cv_path_PS
|
|
-# Linux style
|
|
-if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null
|
|
-then
|
|
- FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
|
|
-# Solaris
|
|
-elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null
|
|
-then
|
|
- FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
|
|
-# BSD style
|
|
-elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null
|
|
-then
|
|
- FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
|
|
-# SysV style
|
|
-elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null
|
|
-then
|
|
- FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
|
|
-# Do anybody use this?
|
|
-elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null
|
|
-then
|
|
- FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
|
|
-else
|
|
- case $SYSTEM_TYPE in
|
|
- *freebsd*|*dragonfly*)
|
|
- FIND_PROC="$PS p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
|
|
- ;;
|
|
- *darwin*)
|
|
- FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
|
|
- ;;
|
|
- *cygwin*)
|
|
- FIND_PROC="$PS -e | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
|
|
- ;;
|
|
- *netware*)
|
|
- FIND_PROC=
|
|
- ;;
|
|
- *)
|
|
- AC_MSG_ERROR([Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual.])
|
|
- esac
|
|
-fi
|
|
+FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
|
|
AC_SUBST(FIND_PROC)
|
|
AC_MSG_RESULT("$FIND_PROC")
|
|
|
|
@@ -912,7 +875,8 @@ AC_ARG_WITH(libwrap,
|
|
AC_CHECK_HEADER(tcpd.h,
|
|
LIBS="-lwrap $LIBS"
|
|
AC_MSG_CHECKING(for TCP wrappers library -lwrap)
|
|
- AC_TRY_LINK([#include <tcpd.h>
|
|
+ AC_TRY_LINK([#include <stdio.h>
|
|
+#include <tcpd.h>
|
|
int allow_severity = 0;
|
|
int deny_severity = 0;
|
|
|