mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-14 23:46:10 +00:00
111 lines
3.2 KiB
Plaintext
111 lines
3.2 KiB
Plaintext
--- configure.orig Wed Oct 6 00:10:05 1999
|
|
+++ configure Thu Nov 25 21:00:43 1999
|
|
@@ -2070,8 +2070,8 @@
|
|
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
|
|
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
|
|
DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
|
|
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
|
|
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
|
|
+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
|
|
+$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \
|
|
|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
|
|
|
|
# Reload cache, that may have been modified by ltconfig
|
|
@@ -2085,7 +2085,7 @@
|
|
|
|
|
|
# This can be used to rebuild libtool when needed
|
|
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
|
|
+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
|
|
|
|
# Always use our own libtool.
|
|
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
|
@@ -2737,7 +2737,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
|
|
@@ -2865,30 +2865,7 @@
|
|
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
|
|
echo "configure:2867: 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
|
|
@@ -4569,8 +4546,6 @@
|
|
#define $ac_tr_lib 1
|
|
EOF
|
|
|
|
- LIBS="-lc_r $LIBS"
|
|
-
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
@@ -4804,28 +4779,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"
|
|
@@ -8064,7 +8017,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
|