88d74bc517
mysql323-client installs libmysqlclient.so.10 (instead of
libmysqlclient.so.6).
mysql323-{client,server} are production quality, now (according to
MySQL AB at least).
129 lines
3.5 KiB
Text
129 lines
3.5 KiB
Text
--- configure.orig Sat Dec 16 22:49:12 2000
|
|
+++ configure Mon Dec 18 12:21:11 2000
|
|
@@ -2950,7 +2950,7 @@
|
|
;;
|
|
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
|
|
@@ -3078,35 +3078,7 @@
|
|
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
|
|
echo "configure:3080: 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"
|
|
- ;;
|
|
- *)
|
|
- { 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
|
|
|
|
@@ -5793,7 +5765,6 @@
|
|
#define $ac_tr_lib 1
|
|
EOF
|
|
|
|
- LIBS="-lc_r $LIBS"
|
|
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
@@ -6017,28 +5988,6 @@
|
|
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"
|
|
@@ -6719,10 +6668,6 @@
|
|
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
-if test "$ac_cv_prog_gxx" = "yes"
|
|
-then
|
|
- CXXFLAGS="$CXXFLAGS -Werror"
|
|
-fi
|
|
mysql_cv_btype_last_arg_accept=none
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 6729 "configure"
|
|
@@ -8736,10 +8681,6 @@
|
|
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
-if test "$ac_cv_prog_gxx" = "yes"
|
|
-then
|
|
- CXXFLAGS="$CXXFLAGS -Werror"
|
|
-fi
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 8745 "configure"
|
|
#include "confdefs.h"
|
|
@@ -8804,10 +8745,6 @@
|
|
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
-if test "$ac_cv_prog_gxx" = "yes"
|
|
-then
|
|
- CXXFLAGS="$CXXFLAGS -Werror"
|
|
-fi
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 8813 "configure"
|
|
#include "confdefs.h"
|
|
@@ -8871,10 +8808,6 @@
|
|
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
|
cross_compiling=$ac_cv_prog_cxx_cross
|
|
|
|
-if test "$ac_cv_prog_gxx" = "yes"
|
|
-then
|
|
- CXXFLAGS="$CXXFLAGS -Werror"
|
|
-fi
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 8880 "configure"
|
|
#include "confdefs.h"
|