Merged revisions 79351 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79351 | benjamin.peterson | 2010-03-23 15:58:37 -0500 (Tue, 23 Mar 2010) | 1 line

  the == test doesn't work on Solaris #8210
........
This commit is contained in:
Benjamin Peterson 2010-03-23 21:02:50 +00:00
parent 28d6398b32
commit 5d39ab05f0
2 changed files with 18 additions and 18 deletions

34
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Revision: 78813 .
# From configure.in Revision: 78820 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 2.6.
#
@ -3900,7 +3900,7 @@ else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
rm -f -r conftest*
rm -f conftest*
@ -4578,7 +4578,7 @@ fi
# tweak OPT based on compiler and platform, only if the user didn't set
# it on the command line
if test "${OPT-unset}" == "unset"
if test "${OPT-unset}" = "unset"
then
case $GCC in
yes)
@ -5450,7 +5450,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
else
ac_cv_header_stdc=no
fi
rm -f -r conftest*
rm -f conftest*
fi
@ -5471,7 +5471,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
else
ac_cv_header_stdc=no
fi
rm -f -r conftest*
rm -f conftest*
fi
@ -6569,7 +6569,7 @@ _ACEOF
fi
rm -f -r conftest*
rm -f conftest*
{ echo "$as_me:$LINENO: result: $was_it_defined" >&5
echo "${ECHO_T}$was_it_defined" >&6; }
@ -7099,7 +7099,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
else
ac_cv_type_uid_t=no
fi
rm -f -r conftest*
rm -f conftest*
fi
{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
@ -14224,7 +14224,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
else
unistd_defines_pthreads=no
fi
rm -f -r conftest*
rm -f conftest*
{ echo "$as_me:$LINENO: result: $unistd_defines_pthreads" >&5
echo "${ECHO_T}$unistd_defines_pthreads" >&6; }
@ -15838,7 +15838,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "yes" >/dev/null 2>&1; then
ipv6type=$i
fi
rm -f -r conftest*
rm -f conftest*
;;
kame)
@ -15861,7 +15861,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
ipv6libdir=/usr/local/v6/lib
ipv6trylibc=yes
fi
rm -f -r conftest*
rm -f conftest*
;;
linux-glibc)
@ -15882,7 +15882,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
ipv6type=$i;
ipv6trylibc=yes
fi
rm -f -r conftest*
rm -f conftest*
;;
linux-inet6)
@ -15920,7 +15920,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
ipv6lib=inet6;
ipv6libdir=/usr/local/v6/lib
fi
rm -f -r conftest*
rm -f conftest*
;;
v6d)
@ -15943,7 +15943,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
ipv6libdir=/usr/local/v6/lib;
BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS"
fi
rm -f -r conftest*
rm -f conftest*
;;
zeta)
@ -15965,7 +15965,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
ipv6lib=inet6;
ipv6libdir=/usr/local/v6/lib
fi
rm -f -r conftest*
rm -f conftest*
;;
esac
@ -23743,7 +23743,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
fi
rm -f -r conftest*
rm -f conftest*
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@ -23762,7 +23762,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
fi
rm -f -r conftest*
rm -f conftest*
fi
@ -24032,7 +24032,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
fi
rm -f -r conftest*
rm -f conftest*
fi

View File

@ -863,7 +863,7 @@ fi],
# tweak OPT based on compiler and platform, only if the user didn't set
# it on the command line
AC_SUBST(OPT)
if test "${OPT-unset}" == "unset"
if test "${OPT-unset}" = "unset"
then
case $GCC in
yes)