74 lines
2.4 KiB
Text
74 lines
2.4 KiB
Text
--- configure.orig Tue Feb 25 21:30:07 2003
|
|
+++ configure Thu Feb 27 12:42:12 2003
|
|
@@ -8101,7 +8101,8 @@
|
|
|
|
|
|
# This can be used to rebuild libtool when needed
|
|
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
|
|
+LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool/ltmain.sh"
|
|
+/usr/local/share/libtool/ltconfig $LIBTOOL_DEPS
|
|
|
|
# Always use our own libtool.
|
|
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
|
@@ -9044,7 +9045,7 @@
|
|
;;
|
|
esac
|
|
fi
|
|
-HOSTNAME=$ac_cv_path_HOSTNAME
|
|
+HOSTNAME="$ac_cv_path_HOSTNAME -s"
|
|
|
|
if test -n "$HOSTNAME"; then
|
|
echo "$as_me:$LINENO: result: $HOSTNAME" >&5
|
|
@@ -9236,43 +9237,8 @@
|
|
echo "$as_me:$LINENO: 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"
|
|
- ;;
|
|
- *netware* | *modesto*)
|
|
- FIND_PROC=
|
|
- ;;
|
|
- *)
|
|
- { { echo "$as_me:$LINENO: 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
|
|
|
|
echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
|
|
echo "${ECHO_T}\"$FIND_PROC\"" >&6
|
|
@@ -22310,7 +22276,7 @@
|
|
/* ) rel_srcdir="$srcdir" ;;
|
|
* ) rel_srcdir="../$srcdir" ;;
|
|
esac
|
|
- if test "x$enable_dependency_tracking" == xno
|
|
+ if test "x$enable_dependency_tracking" = xno
|
|
then
|
|
innodb_conf_flags=--disable-dependency-tracking
|
|
fi
|