72 lines
1.6 KiB
Plaintext
72 lines
1.6 KiB
Plaintext
$OpenBSD: patch-cfg_configure,v 1.2 2002/10/04 19:20:24 naddy Exp $
|
|
--- cfg/configure.orig Mon Feb 12 17:40:04 2001
|
|
+++ cfg/configure Wed Oct 2 00:42:49 2002
|
|
@@ -584,6 +584,7 @@ fi
|
|
|
|
OLD_CFLAGS="$CFLAGS"
|
|
|
|
+ac_cv_prog_CC=${CC-cc}
|
|
if test -n "$ac_cv_prog_CC"; then
|
|
echo "Using cached C compiler $ac_cv_prog_CC"
|
|
echo "To change compilers, use \"make distclean\" then rerun configure"
|
|
@@ -831,23 +832,12 @@ fi
|
|
|
|
|
|
|
|
-if test "$ac_cv_prog_gcc" = yes ; then
|
|
- CFLAGS="$OLD_CFLAGS -Wall -O2"
|
|
-else
|
|
- if test `uname -s` = "HP-UX"; then
|
|
- CFLAGS="$OLD_CFLAGS -Ae +O2"
|
|
- elif test `uname -s` = "SunOS"; then
|
|
- CFLAGS="$OLD_CFLAGS -xO2"
|
|
- else
|
|
- CFLAGS="$OLD_CFLAGS -O2"
|
|
- fi
|
|
-fi
|
|
-
|
|
|
|
|
|
|
|
OLD_CXXFLAGS="$CXXFLAGS"
|
|
|
|
+ac_cv_prog_CXX=${CXX-c++}
|
|
if test -n "$ac_cv_prog_CXX"; then
|
|
echo "Using cached C++ compiler $ac_cv_prog_CXX"
|
|
echo "To change compilers, use \"make distclean\" then rerun configure"
|
|
@@ -1016,18 +1006,6 @@ fi
|
|
|
|
|
|
|
|
-if test "$ac_cv_prog_gcc" = yes ; then
|
|
- CXXFLAGS="$OLD_CXXFLAGS -Wall -O2"
|
|
-else
|
|
- if test `uname -s` = "HP-UX"; then
|
|
- CXXFLAGS="$OLD_CXXFLAGS -Ae +O2"
|
|
- elif test `uname -s` = "SunOS"; then
|
|
- CXXFLAGS="$OLD_CXXFLAGS -xO2"
|
|
- else
|
|
- CXXFLAGS="$OLD_CXXFLAGS -O2"
|
|
- fi
|
|
-fi
|
|
-
|
|
|
|
# Extract the first word of "ranlib", so it can be a program name with args.
|
|
set dummy ranlib; ac_word=$2
|
|
@@ -1065,14 +1043,7 @@ fi
|
|
echo
|
|
|
|
|
|
-if test -z "$ac_cv_use_pthread"; then
|
|
- ac_cv_use_pthread="yes"
|
|
-fi
|
|
-echo "Make iperf multi-threaded (using pthreads)? [$ac_cv_use_pthread] "
|
|
-read tmp
|
|
-if test -n "$tmp"; then
|
|
- ac_cv_use_pthread="$tmp"
|
|
-fi
|
|
+ac_cv_use_pthread="no"
|
|
|
|
|
|
if test "$ac_cv_use_pthread" = yes ; then
|