mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-04 22:33:27 +00:00
100 lines
2.7 KiB
Plaintext
100 lines
2.7 KiB
Plaintext
--- configure.orig Wed Jan 12 04:32:17 2000
|
|
+++ configure Tue Jan 25 14:58:09 2000
|
|
@@ -2743,7 +2743,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
|
|
@@ -2871,30 +2871,7 @@
|
|
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
|
|
echo "configure:2873: 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
|
|
- { 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; }
|
|
-fi
|
|
-
|
|
+FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
|
|
echo "$ac_t"""$FIND_PROC"" 1>&6
|
|
|
|
# Check if a pid is valid
|
|
@@ -4614,8 +4591,6 @@
|
|
#define $ac_tr_lib 1
|
|
EOF
|
|
|
|
- LIBS="-lc_r $LIBS"
|
|
-
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
@@ -4849,28 +4824,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="-O6"
|
|
-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"
|
|
@@ -7973,7 +7926,7 @@
|
|
#include <pthread.h>
|
|
int main() {
|
|
pthread_attr_t thr_attr;
|
|
-pthread_attr_setscope(&thr_attr,0);
|
|
+XXXpthread_attr_setscope(&thr_attr,0);
|
|
; return 0; }
|
|
EOF
|
|
if { (eval echo configure:7980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
@@ -8178,7 +8131,7 @@
|
|
echo ""
|
|
echo "Configuring MIT Pthreads"
|
|
# We will never install so installation paths are not needed.
|
|
- (cd mit-pthreads; sh ./configure)
|
|
+ (cd mit-pthreads; sh ./configure ${CONFIGURE_ARGS})
|
|
echo "End of MIT Pthreads configuration"
|
|
echo ""
|
|
fi
|