1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
|
--- configure.orig Thu Oct 10 12:17:48 2002
+++ configure Mon Oct 21 10:29:54 2002
@@ -4222,7 +4222,7 @@
;;
esac
fi
-HOSTNAME=$ac_cv_path_HOSTNAME
+HOSTNAME="$ac_cv_path_HOSTNAME -s"
if test -n "$HOSTNAME"; then
echo "$as_me:4228: result: $HOSTNAME" >&5
@@ -4397,43 +4397,7 @@
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:4400: checking \"how to check if pid exists\"" >&5
-echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6
-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 "$as_me:4432: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5
-echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;}
- { (exit 1); exit 1; }; }
- esac
-fi
+FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
echo "$as_me:4438: result: \"$FIND_PROC\"" >&5
echo "${ECHO_T}\"$FIND_PROC\"" >&6
@@ -8090,7 +8054,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc_r $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line 8095 "configure"
#include "confdefs.h"
@@ -8138,7 +8101,6 @@
#define HAVE_LIBC_R 1
EOF
- LIBS="-lc_r $LIBS"
fi
@@ -8495,29 +8457,6 @@
fi
-# Build optimized or debug version ?
-# First check for gcc and g++
-if test "$ac_cv_c_compiler_gnu" = "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"
@@ -10249,10 +10188,6 @@
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test "$ac_cv_cxx_compiler_gnu" = "yes"
-then
- CXXFLAGS="$CXXFLAGS -Werror"
-fi
mysql_cv_btype_last_arg_accept=none
cat >conftest.$ac_ext <<_ACEOF
#line 10258 "configure"
@@ -12922,14 +12857,6 @@
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-# Do not treat warnings as errors if we are linking against other libc
-# this is to work around gcc not being permissive on non-system includes
-# with respect to ANSI C++
-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no"
-then
- CXXFLAGS="$CXXFLAGS -Werror"
-fi
-
cat >conftest.$ac_ext <<_ACEOF
#line 12934 "configure"
#include "confdefs.h"
@@ -13006,10 +12933,6 @@
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no"
-then
- CXXFLAGS="$CXXFLAGS -Werror"
-fi
cat >conftest.$ac_ext <<_ACEOF
#line 13014 "configure"
#include "confdefs.h"
@@ -13085,10 +13008,6 @@
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no"
-then
- CXXFLAGS="$CXXFLAGS -Werror"
-fi
cat >conftest.$ac_ext <<_ACEOF
#line 13093 "configure"
#include "confdefs.h"
|
