108 lines
2.9 KiB
Plaintext
108 lines
2.9 KiB
Plaintext
$OpenBSD: patch-configure,v 1.14 2002/02/18 03:25:33 brad Exp $
|
|
--- configure.orig Thu Feb 14 12:30:42 2002
|
|
+++ configure Sun Feb 17 19:59:06 2002
|
|
@@ -2861,7 +2861,7 @@ else
|
|
;;
|
|
esac
|
|
fi
|
|
-HOSTNAME="$ac_cv_path_HOSTNAME"
|
|
+HOSTNAME="$ac_cv_path_HOSTNAME -s"
|
|
if test -n "$HOSTNAME"; then
|
|
echo "$ac_t""$HOSTNAME" 1>&6
|
|
else
|
|
@@ -2995,38 +2995,7 @@ fi
|
|
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
|
|
echo "configure:2997: checking "how to check if pid exists"" >&5
|
|
PS=$ac_cv_path_PS
|
|
-# Linux style
|
|
-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
|
|
-then
|
|
- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null"
|
|
-# BSD style
|
|
-elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null
|
|
-then
|
|
- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
|
|
-# SysV style
|
|
-elif $PS -ef 2> /dev/null | grep $0 > /dev/null
|
|
-then
|
|
- FIND_PROC="$PS -ef | 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 mysqld > /dev/null"
|
|
-else
|
|
- case $SYSTEM_TYPE in
|
|
- *darwin*)
|
|
- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
|
|
- ;;
|
|
- *cygwin*)
|
|
- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
|
|
- ;;
|
|
- *)
|
|
- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; }
|
|
- esac
|
|
-fi
|
|
+FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
|
|
|
|
echo "$ac_t"""$FIND_PROC"" 1>&6
|
|
|
|
@@ -4905,6 +4874,7 @@ else
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 4907 "configure"
|
|
#include "confdefs.h"
|
|
+#include <stdio.h>
|
|
#include <tcpd.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
@@ -4930,6 +4900,7 @@ echo "configure:4930: checking for TCP w
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 4932 "configure"
|
|
#include "confdefs.h"
|
|
+#include <stdio.h>
|
|
#include <tcpd.h>
|
|
int allow_severity = 0;
|
|
int deny_severity = 0;
|
|
@@ -5871,8 +5842,6 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
|
|
#define $ac_tr_lib 1
|
|
EOF
|
|
|
|
- LIBS="-lc_r $LIBS"
|
|
-
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
@@ -6102,29 +6071,6 @@ EOF
|
|
|
|
fi
|
|
|
|
-
|
|
-# Build optimized or debug version ?
|
|
-# First check for gcc and g++
|
|
-if test "$ac_cv_prog_gcc" = "yes"
|
|
-then
|
|
- DEBUG_CFLAGS="-g"
|
|
- DEBUG_OPTIMIZE_CC="-O"
|
|
- OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE"
|
|
-else
|
|
- DEBUG_CFLAGS="-g"
|
|
- DEBUG_OPTIMIZE_CC=""
|
|
- OPTIMIZE_CFLAGS="-O"
|
|
-fi
|
|
-if test "$ac_cv_prog_cxx_g" = "yes"
|
|
-then
|
|
- DEBUG_CXXFLAGS="-g"
|
|
- DEBUG_OPTIMIZE_CXX="-O"
|
|
- OPTIMIZE_CXXFLAGS="-O3"
|
|
-else
|
|
- DEBUG_CXXFLAGS="-g"
|
|
- DEBUG_OPTIMIZE_CXX=""
|
|
- OPTIMIZE_CXXFLAGS="-O"
|
|
-fi
|
|
# Check whether --with-debug or --without-debug was given.
|
|
if test "${with_debug+set}" = set; then
|
|
withval="$with_debug"
|