146 lines
4.2 KiB
Text
146 lines
4.2 KiB
Text
--- configure.orig Mon Jun 3 12:39:20 2002
|
|
+++ configure Mon Jun 17 19:16:58 2002
|
|
@@ -4188,7 +4188,7 @@
|
|
;;
|
|
esac
|
|
fi
|
|
-HOSTNAME=$ac_cv_path_HOSTNAME
|
|
+HOSTNAME="$ac_cv_path_HOSTNAME -s"
|
|
|
|
if test -n "$HOSTNAME"; then
|
|
echo "$as_me:4194: result: $HOSTNAME" >&5
|
|
@@ -4366,40 +4366,7 @@
|
|
echo "$as_me:4366: 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:4398: 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:4404: result: \"$FIND_PROC\"" >&5
|
|
echo "${ECHO_T}\"$FIND_PROC\"" >&6
|
|
@@ -7907,7 +7874,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 7912 "configure"
|
|
#include "confdefs.h"
|
|
@@ -7955,7 +7921,6 @@
|
|
#define HAVE_LIBC_R 1
|
|
EOF
|
|
|
|
- LIBS="-lc_r $LIBS"
|
|
|
|
fi
|
|
|
|
@@ -8312,29 +8277,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"
|
|
@@ -10066,10 +10008,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 10075 "configure"
|
|
@@ -12739,13 +12677,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 agaist 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 12750 "configure"
|
|
#include "confdefs.h"
|
|
@@ -12822,10 +12753,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 12830 "configure"
|
|
#include "confdefs.h"
|
|
@@ -12901,10 +12828,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 12909 "configure"
|
|
#include "confdefs.h"
|